[aur-dev] [PATCH 2/3] Move configuration to /etc/aurweb/config

[Lukas Fleischer]

Since d4fe77a (Reorganize Git interface scripts, 2016-10-08), the key
components of the aurweb SSH interface are installed system-wide. Update
the default configuration path to point to a central location.

Signed-off-by: Lukas Fleischer <lfleischer at archlinux.org>
---
 .gitignore                 | 1 -
 INSTALL                    | 4 ++--
 aurweb/config.py           | 3 +--
 upgrading/4.4.1.txt        | 3 +++
 web/lib/confparser.inc.php | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 upgrading/4.4.1.txt

diff --git a/.gitignore b/.gitignore
index 2cb5bdc..f0e462d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-conf/config
 dummy-data.sql*
 po/*.mo
 po/*.po~
diff --git a/INSTALL b/INSTALL
index 395915a..95cac4c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -30,8 +30,8 @@ Setup on Arch Linux
         }
     }
 
-3) Copy conf/config.proto to conf/config and adjust the configuration (pay
-   attention to disable_http_login, enable_maintenance and aur_location).
+3) Copy conf/config.proto to /etc/aurweb/config and adjust the configuration
+   (pay attention to disable_http_login, enable_maintenance and aur_location).
 
 4) Create a new MySQL database and a user and import the AUR SQL schema:
 
diff --git a/aurweb/config.py b/aurweb/config.py
index aac188b..a52d942 100644
--- a/aurweb/config.py
+++ b/aurweb/config.py
@@ -12,8 +12,7 @@ def _get_parser():
         if 'AUR_CONFIG' in os.environ:
             path = os.environ.get('AUR_CONFIG')
         else:
-            relpath = "/../conf/config"
-            path = os.path.dirname(os.path.realpath(__file__)) + relpath
+            path = "/etc/aurweb/config"
         _parser.read(path)
 
     return _parser
diff --git a/upgrading/4.4.1.txt b/upgrading/4.4.1.txt
new file mode 100644
index 0000000..b06696e
--- /dev/null
+++ b/upgrading/4.4.1.txt
@@ -0,0 +1,3 @@
+1. The default configuration file search path now points to /etc/aurweb/config.
+   Make sure you copy your aurweb configuration to the new location before
+   upgrading.
diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php
index 6368b86..789300e 100644
--- a/web/lib/confparser.inc.php
+++ b/web/lib/confparser.inc.php
@@ -4,7 +4,7 @@ function config_load() {
 	global $AUR_CONFIG;
 
 	if (!isset($AUR_CONFIG)) {
-		$AUR_CONFIG = parse_ini_file("../../conf/config", true, INI_SCANNER_RAW);
+		$AUR_CONFIG = parse_ini_file("/etc/aurweb/config", true, INI_SCANNER_RAW);
 	}
 }
 
-- 
2.10.0