From ca24a6982aa10b4aeeea0c12598e891804e7cf1f Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Tue, 20 Mar 2018 01:40:33 +0100
Subject: [PATCH] Gitea secure cookie, increase limits, timezone

---
 roles/common                        |  2 +-
 roles/gitea/templates/gitea.conf.j2 | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/common b/roles/common
index e8cc0a6..e0d7335 160000
--- a/roles/common
+++ b/roles/common
@@ -1 +1 @@
-Subproject commit e8cc0a65f3981b5203b730a81eadbdffee71de36
+Subproject commit e0d73350bf27b74432610ef0ab7a4afee193a125
diff --git a/roles/gitea/templates/gitea.conf.j2 b/roles/gitea/templates/gitea.conf.j2
index 00c806d..e209bb0 100644
--- a/roles/gitea/templates/gitea.conf.j2
+++ b/roles/gitea/templates/gitea.conf.j2
@@ -45,7 +45,7 @@ ENABLED       = true
 TEMP_PATH     = /var/lib/gitea/data/tmp/uploads
 ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
 ALLOWED_TYPES = 
-; Max size of each file in MB. Defaults to 3MB
+; Max size of each file in MB. Defaults to 10MB
 FILE_MAX_SIZE = 10
 ; Max number of files per upload. Defaults to 5
 MAX_FILES     = 5
@@ -144,7 +144,7 @@ SSH_BACKUP_AUTHORIZED_KEYS = true
 ; Enable exposure of SSH clone URL to anonymous visitors, default is false
 SSH_EXPOSE_ANONYMOUS       = false
 ; Indicate whether to check minimum key size with corresponding type
-MINIMUM_KEY_SIZE_CHECK     = false
+MINIMUM_KEY_SIZE_CHECK     = true
 ; Disable CDN even in "prod" mode
 OFFLINE_MODE               = true
 DISABLE_ROUTER_LOG         = false
@@ -176,9 +176,9 @@ LFS_JWT_SECRET             = fmdsyalJh8IKUpu5ZtUjLTfRiIhHYkRvWLVvT19CPiI
 ; Define allowed algorithms and their minimum key length (use -1 to disable a type)
 [ssh.minimum_key_sizes]
 ED25519 = 256
-ECDSA   = 256
+ECDSA   = -1
 RSA     = 2048
-DSA     = 1024
+DSA     = -1
 
 [database]
 ; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice
@@ -367,7 +367,7 @@ PROVIDER_CONFIG   = /var/lib/gitea/data/sessions
 ; Session cookie name
 COOKIE_NAME       = i_like_gitea
 ; If you use session in https only, default is false
-COOKIE_SECURE     = false
+COOKIE_SECURE     = true
 ; Enable set cookie, default is true
 ENABLE_SET_COOKIE = true
 ; Session GC time interval in seconds, default is 86400 (1 day)
@@ -403,7 +403,7 @@ MAX_FILES     = 5
 ; Specifies the format for fully outputted dates. Defaults to RFC1123
 ; Special supported values are ANSIC, UnixDate, RubyDate, RFC822, RFC822Z, RFC850, RFC1123, RFC1123Z, RFC3339, RFC3339Nano, Kitchen, Stamp, StampMilli, StampMicro and StampNano
 ; For more information about the format see http://golang.org/pkg/time/#pkg-constants
-FORMAT = 
+FORMAT = RFC1123Z
 
 [log]
 ROOT_PATH  = /var/log/gitea
@@ -510,9 +510,9 @@ UPDATE_EXISTING = true
 ; Disables highlight of added and removed changes
 DISABLE_DIFF_HIGHLIGHT       = false
 ; Max number of lines allowed of a single file in diff view
-MAX_GIT_DIFF_LINES           = 1000
+MAX_GIT_DIFF_LINES           = 10000
 ; Max number of characters of a line allowed in diff view
-MAX_GIT_DIFF_LINE_CHARACTERS = 5000
+MAX_GIT_DIFF_LINE_CHARACTERS = 50000
 ; Max number of files shown in diff view
 MAX_GIT_DIFF_FILES           = 100
 ; Arguments for command 'git gc', e.g. "--aggressive --auto"