summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Franchini <twitch153@gentoo.org>2017-02-15 21:48:03 -0500
committerDevan Franchini <twitch153@gentoo.org>2017-02-15 22:03:14 -0500
commit192ab96f59acd4f7ddc634a49e9077f8c8aeda94 (patch)
treea8020a6353cf636a390b531c6b8599b6db5c41f2
parenteprefix.py: Adds EPREFIX variable to import in other places (diff)
downloadwebapp-config-192ab96f59acd4f7ddc634a49e9077f8c8aeda94.tar.gz
webapp-config-192ab96f59acd4f7ddc634a49e9077f8c8aeda94.tar.bz2
webapp-config-192ab96f59acd4f7ddc634a49e9077f8c8aeda94.zip
config.py: Uses EPREFIX variable
X-Gentoo-Bug: 608018 X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018
-rw-r--r--WebappConfig/config.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 3a176a0..2c11d39 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -37,10 +37,12 @@ import WebappConfig.wrapper as wrapper
from argparse import ArgumentParser
from WebappConfig.debug import OUT
+from WebappConfig.eprefix import EPREFIX
from WebappConfig.version import WCVERSION
from WebappConfig.permissions import PermissionMap
+
# ========================================================================
# BashParser class
# ------------------------------------------------------------------------
@@ -223,14 +225,14 @@ class Config:
self.__d = {
'config_protect' : '',
# Necessary to load the config file
- 'my_etcconfig' : '/etc/vhosts/webapp-config',
+ 'my_etcconfig' : EPREFIX + '/etc/vhosts/webapp-config',
'my_dotconfig' : '.webapp',
'my_version' : WCVERSION,
'my_conf_version' : '7',
'my_bugsurl' : wrapper.bugs_link,
'g_myname' : sys.argv[0],
- 'g_orig_installdir' : '/',
- 'g_installdir' : '/',
+ 'g_orig_installdir' : EPREFIX + '/',
+ 'g_installdir' : EPREFIX + '/',
'g_link_options' : '',
'g_link_type' : 'hard',
'g_configprefix' : '._cfg',
@@ -265,9 +267,9 @@ class Config:
# -- wrobel
'vhost_server_uid' : 'root',
'vhost_server_gid' : 'root',
- 'my_persistroot' : '/var/db/webapps',
+ 'my_persistroot' : EPREFIX + '/var/db/webapps',
'wa_installsbase' : 'installs',
- 'vhost_root' : '/var/www/${vhost_hostname}',
+ 'vhost_root' : EPREFIX + '/var/www/${vhost_hostname}',
'g_htdocsdir' : '${vhost_root}/${my_htdocsbase}',
'my_appdir' : '${my_approot}/${my_appsuffix}',
'my_htdocsdir' : '${my_appdir}/htdocs',
@@ -277,7 +279,7 @@ class Config:
'my_iconsdir' : '${my_hostrootdir}/${my_iconsbase}',
'my_errorsdir' : '${my_hostrootdir}/${my_errorsbase}',
'g_cgibindir' : '${vhost_root}/${my_cgibinbase}',
- 'my_approot' : '/usr/share/webapps',
+ 'my_approot' : EPREFIX + '/usr/share/webapps',
'package_manager' : 'portage',
'allow_absolute' : 'no',
'my_hostrootbase' : 'hostroot',