From 25d1ec73cde6321e90bb6088fd6409dd95b310fa 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 | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/conf/app.ini b/conf/app.ini
index 0c6512b17..42723cfd5 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -1,11 +1,18 @@
-# !!! NEVER EVER MODIFY THIS FILE !!!
-# !!! PLEASE MAKE CHANGES ON CORRESPONDING CUSTOM CONFIG FILE !!!
-# !!! IF YOU ARE PACKAGING PROVIDER, PLEASE MAKE OWN COPY OF IT !!!
+# Feel free to modify this file!
+# In case a new version of this file is availabe, pacman will notify automatically when
+# updating and creates the new version as app.ini.pacnew. You can use diff or a similar
+# tool to see the changes between your configuration and the new default configuration.
+
+# There is also a copy of this file under /usr/share/gogs/conf/app.ini in case
+# you need to go back.
+
+# It is also possible to remove all default values and just specify what you want
+# to change because /usr/share/gogs/conf/app.ini also serves as fallback.
 
 ; App name that shows on every page title
 APP_NAME = Gogs
 ; The name of the system user that runs Gogs
-RUN_USER = git
+RUN_USER = gogs
 ; Either "dev", "prod" or "test"
 RUN_MODE = dev
 
@@ -56,16 +63,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
-CERT_FILE = custom/https/cert.pem
-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 =
+STATIC_ROOT_PATH = /usr/share/gogs
 ; Default path for App data
-APP_DATA_PATH = data
+APP_DATA_PATH = /var/lib/gogs/data
 ; Application level GZIP support
 ENABLE_GZIP = false
 ; Landing page for non-logged users, can be "home" or "explore"
@@ -73,7 +80,7 @@ LANDING_PAGE = home
 
 [repository]
 ; Root path for storing repositories's data, default is "~/<username>/gogs-repositories"
-ROOT =
+ROOT = /var/lib/gogs/repos
 ; The script type server supports, sometimes could be "sh"
 SCRIPT_TYPE = bash
 ; Default ANSI charset for an unrecognized charset
@@ -113,7 +120,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)
-TEMP_PATH = data/tmp/uploads
+TEMP_PATH = /var/cache/gogs
 ; 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
@@ -172,7 +179,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
-PATH = data/gogs.db
+PATH = /var/lib/gogs/gogs.db
 
 [admin]
 ; Disable regular (non-admin) users to create organizations
@@ -319,7 +326,7 @@ FORMAT =
 
 ; General settings of loggers
 [log]
-ROOT_PATH =
+ROOT_PATH = /var/log/gogs
 ; Can be "console" and "file", default is "console"
 ; Use comma to separate multiple modes, e.g. "console, file"
 MODE = console
-- 
2.19.0