Commit 85866796 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Move configuration to /etc/aurweb/config

Since d4fe77ac

 (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's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 9581069f
conf/config
dummy-data.sql* dummy-data.sql*
po/*.mo po/*.mo
po/*.po~ po/*.po~
......
...@@ -30,8 +30,8 @@ Setup on Arch Linux ...@@ -30,8 +30,8 @@ Setup on Arch Linux
} }
} }
3) Copy conf/config.proto to conf/config and adjust the configuration (pay 3) Copy conf/config.proto to /etc/aurweb/config and adjust the configuration
attention to disable_http_login, enable_maintenance and aur_location). (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: 4) Create a new MySQL database and a user and import the AUR SQL schema:
......
...@@ -12,8 +12,7 @@ def _get_parser(): ...@@ -12,8 +12,7 @@ def _get_parser():
if 'AUR_CONFIG' in os.environ: if 'AUR_CONFIG' in os.environ:
path = os.environ.get('AUR_CONFIG') path = os.environ.get('AUR_CONFIG')
else: else:
relpath = "/../conf/config" path = "/etc/aurweb/config"
path = os.path.dirname(os.path.realpath(__file__)) + relpath
_parser.read(path) _parser.read(path)
return _parser return _parser
......
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.
...@@ -4,7 +4,7 @@ function config_load() { ...@@ -4,7 +4,7 @@ function config_load() {
global $AUR_CONFIG; global $AUR_CONFIG;
if (!isset($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);
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment