diff options
Diffstat (limited to '0001-Adjust-config-for-Arch-Linux-package.patch')
-rw-r--r-- | 0001-Adjust-config-for-Arch-Linux-package.patch | 50 |
1 files changed, 13 insertions, 37 deletions
diff --git a/0001-Adjust-config-for-Arch-Linux-package.patch b/0001-Adjust-config-for-Arch-Linux-package.patch index b0f8a5220668..83ffcff7bd6f 100644 --- a/0001-Adjust-config-for-Arch-Linux-package.patch +++ b/0001-Adjust-config-for-Arch-Linux-package.patch @@ -1,14 +1,14 @@ -From 866c5d2cafa1d2a0914532e1d738678f7061952a Mon Sep 17 00:00:00 2001 +From 4c68726e20939338d196bdd6b0cc4e6cf69ce642 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 19 Mar 2017 18:03:36 +0100 Subject: [PATCH 1/2] Adjust config for Arch Linux package --- - conf/app.ini | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + conf/app.ini | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/app.ini b/conf/app.ini -index 2927c2aa..899856b1 100644 +index fc43868e..b170dd5f 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -5,7 +5,7 @@ @@ -20,7 +20,7 @@ index 2927c2aa..899856b1 100644 ; Either "dev", "prod" or "test" RUN_MODE = dev -@@ -54,13 +54,13 @@ DISABLE_ROUTER_LOG = false +@@ -54,16 +54,16 @@ DISABLE_ROUTER_LOG = false ; not forget to export the private key): ; $ openssl pkcs12 -in cert.pfx -out cert.pem -nokeys ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes @@ -28,6 +28,9 @@ index 2927c2aa..899856b1 100644 -KEY_FILE = custom/https/key.pem +CERT_FILE = /var/lib/gogs/cert/cert.pem +KEY_FILE = /var/lib/gogs/cert/key.pem + ; Allowed TLS version values: SSL30, TLS10, TLS11, TLS12 + TLS_MIN_VERSION = TLS10 + ; Upper level of template and static file path ; default is the path where Gogs is executed -STATIC_ROOT_PATH = @@ -38,7 +41,7 @@ index 2927c2aa..899856b1 100644 ; Application level GZIP support ENABLE_GZIP = false ; Landing page for non-logged users, can be "home" or "explore" -@@ -68,7 +68,7 @@ LANDING_PAGE = home +@@ -71,7 +71,7 @@ LANDING_PAGE = home [repository] ; Root path for storing repositories's data, default is "~/<username>/gogs-repositories" @@ -47,7 +50,7 @@ index 2927c2aa..899856b1 100644 ; The script type server supports, sometimes could be "sh" SCRIPT_TYPE = bash ; Default ANSI charset for an unrecognized charset -@@ -108,7 +108,7 @@ PREVIEWABLE_FILE_MODES = markdown +@@ -111,7 +111,7 @@ PREVIEWABLE_FILE_MODES = markdown ; Enable repository file uploads. ENABLED = true ; Path to temporarily store uploads (default path gets cleaned by Gogs in every start) @@ -56,16 +59,7 @@ index 2927c2aa..899856b1 100644 ; File types that are allowed to be uploaded, e.g. image/jpeg|image/png. Leave empty means allow any file type ALLOWED_TYPES = ; Maximum size of each file in MB -@@ -121,7 +121,7 @@ MAX_FILES = 5 - ; Whether attachments are enabled. Defaults to `true` - ENABLED = true - ; Path for attachments. Defaults to `data/attachments` --PATH = data/attachments -+PATH = /var/lib/gogs/attachments - ; One or more allowed types, e.g. image/jpeg|image/png - ALLOWED_TYPES = */* - ; Max size of each file. Defaults to 32MB -@@ -167,7 +167,7 @@ PASSWD = +@@ -170,7 +170,7 @@ PASSWD = ; For "postgres" only, either "disable", "require" or "verify-full" SSL_MODE = disable ; For "sqlite3" and "tidb", use absolute path when you start as service @@ -74,25 +68,7 @@ index 2927c2aa..899856b1 100644 [admin] ; Disable regular (non-admin) users to create organizations -@@ -280,7 +280,7 @@ CSRF_COOKIE_NAME = _csrf - - [picture] - ; Path to store user uploaded avatars --AVATAR_UPLOAD_PATH = data/avatars -+AVATAR_UPLOAD_PATH = /var/lib/gogs/avatars - ; Chinese users can choose "duoshuo" - ; or a custom avatar source, like: http://cn.gravatar.com/avatar/ - GRAVATAR_SOURCE = gravatar -@@ -296,7 +296,7 @@ ENABLE_FEDERATED_AVATAR = true - ; Whether attachments are enabled. Defaults to `true` - ENABLE = true - ; Path for attachments. Defaults to `data/attachments` --PATH = data/attachments -+PATH = /var/lib/gogs/attachments - ; One or more allowed types, e.g. image/jpeg|image/png - ALLOWED_TYPES = image/jpeg|image/png - ; Max size of each file. Defaults to 4MB -@@ -312,7 +312,7 @@ FORMAT = +@@ -315,7 +315,7 @@ FORMAT = ; General settings of loggers [log] @@ -102,5 +78,5 @@ index 2927c2aa..899856b1 100644 ; Use comma to separate multiple modes, e.g. "console, file" MODE = console -- -2.12.2 +2.13.1 |