| 1 |
commit: 192ab96f59acd4f7ddc634a49e9077f8c8aeda94 |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 16 02:48:03 2017 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 16 03:03:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=192ab96f |
| 7 |
|
| 8 |
config.py: Uses EPREFIX variable |
| 9 |
|
| 10 |
X-Gentoo-Bug: 608018 |
| 11 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018 |
| 12 |
|
| 13 |
WebappConfig/config.py | 14 ++++++++------ |
| 14 |
1 file changed, 8 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/WebappConfig/config.py b/WebappConfig/config.py |
| 17 |
index 3a176a0..2c11d39 100644 |
| 18 |
--- a/WebappConfig/config.py |
| 19 |
+++ b/WebappConfig/config.py |
| 20 |
@@ -37,10 +37,12 @@ import WebappConfig.wrapper as wrapper |
| 21 |
|
| 22 |
from argparse import ArgumentParser |
| 23 |
from WebappConfig.debug import OUT |
| 24 |
+from WebappConfig.eprefix import EPREFIX |
| 25 |
from WebappConfig.version import WCVERSION |
| 26 |
|
| 27 |
from WebappConfig.permissions import PermissionMap |
| 28 |
|
| 29 |
+ |
| 30 |
# ======================================================================== |
| 31 |
# BashParser class |
| 32 |
# ------------------------------------------------------------------------ |
| 33 |
@@ -223,14 +225,14 @@ class Config: |
| 34 |
self.__d = { |
| 35 |
'config_protect' : '', |
| 36 |
# Necessary to load the config file |
| 37 |
- 'my_etcconfig' : '/etc/vhosts/webapp-config', |
| 38 |
+ 'my_etcconfig' : EPREFIX + '/etc/vhosts/webapp-config', |
| 39 |
'my_dotconfig' : '.webapp', |
| 40 |
'my_version' : WCVERSION, |
| 41 |
'my_conf_version' : '7', |
| 42 |
'my_bugsurl' : wrapper.bugs_link, |
| 43 |
'g_myname' : sys.argv[0], |
| 44 |
- 'g_orig_installdir' : '/', |
| 45 |
- 'g_installdir' : '/', |
| 46 |
+ 'g_orig_installdir' : EPREFIX + '/', |
| 47 |
+ 'g_installdir' : EPREFIX + '/', |
| 48 |
'g_link_options' : '', |
| 49 |
'g_link_type' : 'hard', |
| 50 |
'g_configprefix' : '._cfg', |
| 51 |
@@ -265,9 +267,9 @@ class Config: |
| 52 |
# -- wrobel |
| 53 |
'vhost_server_uid' : 'root', |
| 54 |
'vhost_server_gid' : 'root', |
| 55 |
- 'my_persistroot' : '/var/db/webapps', |
| 56 |
+ 'my_persistroot' : EPREFIX + '/var/db/webapps', |
| 57 |
'wa_installsbase' : 'installs', |
| 58 |
- 'vhost_root' : '/var/www/${vhost_hostname}', |
| 59 |
+ 'vhost_root' : EPREFIX + '/var/www/${vhost_hostname}', |
| 60 |
'g_htdocsdir' : '${vhost_root}/${my_htdocsbase}', |
| 61 |
'my_appdir' : '${my_approot}/${my_appsuffix}', |
| 62 |
'my_htdocsdir' : '${my_appdir}/htdocs', |
| 63 |
@@ -277,7 +279,7 @@ class Config: |
| 64 |
'my_iconsdir' : '${my_hostrootdir}/${my_iconsbase}', |
| 65 |
'my_errorsdir' : '${my_hostrootdir}/${my_errorsbase}', |
| 66 |
'g_cgibindir' : '${vhost_root}/${my_cgibinbase}', |
| 67 |
- 'my_approot' : '/usr/share/webapps', |
| 68 |
+ 'my_approot' : EPREFIX + '/usr/share/webapps', |
| 69 |
'package_manager' : 'portage', |
| 70 |
'allow_absolute' : 'no', |
| 71 |
'my_hostrootbase' : 'hostroot', |
Archives