gentoo/alpha-quadrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

orig webapp-config

Browse Source
This commit is contained in:
Micha Glave
2009-12-18 12:26:36 +01:00
parent dbb426d071
commit fa6706b4db
8 changed files with 872 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch Normal file
View File

@@ -0,0 +1,42 @@
Index: webapp-config-1.50.16/WebappConfig/config.py
===================================================================
--- webapp-config-1.50.16.orig/WebappConfig/config.py
+++ webapp-config-1.50.16/WebappConfig/config.py
@@ -204,6 +204,7 @@ class Config:
pass
self.__d = {
+ 'allow_absolute' : 'no',
'config_protect' : wrapper.config_protect,
# Necessary to load the config file
'my_etcconfig' : '/etc/vhosts/webapp-config',
@@ -870,8 +871,13 @@ class Config:
#
# this makes sure we don't write rubbish into the installs list
- installpath = self.config.get('USER', 'g_htdocsdir') + '/' + \
- self.config.get('USER', 'g_installdir')
+ g_installdir = self.config.get('USER', 'g_installdir')
+
+ if (os.path.isabs(g_installdir)
+ and self.config.get('USER', 'allow_absolute') == 'yes'):
+ installpath = g_installdir
+ else:
+ installpath = self.config.get('USER', 'g_htdocsdir') + '/' + g_installdir
installpath = re.compile('/+').sub('/', self.__root + installpath)
Index: webapp-config-1.50.16/config/webapp-config
===================================================================
--- webapp-config-1.50.16.orig/config/webapp-config
+++ webapp-config-1.50.16/config/webapp-config
@@ -183,6 +183,9 @@ vhost_perms_virtualowned_file="o-w"
vhost_perms_installdir="0755"
+# Allow specifying absolute path names using the -d option?
+allow_absolute="no"
+
# ========================================================================
# END OF USER-EDITABLE SETTINGS

13
app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: webapp-config-1.50.16/WebappConfig/server.py
===================================================================
--- webapp-config-1.50.16.orig/WebappConfig/server.py
+++ webapp-config-1.50.16/WebappConfig/server.py
@@ -300,7 +300,7 @@ class Apache(Basic):
name = 'Apache'
desc = 'supports installation on Apache 1 & 2'
- dep = '>=net-www/apache-1.3'
+ dep = '>=www-servers/apache-1.3'
def set_server_user(self):
self.vhost_server_uid = get_user('apache')

13
app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: webapp-config-1.50.16/sbin/webapp-cleaner
===================================================================
--- webapp-config-1.50.16.orig/sbin/webapp-cleaner
+++ webapp-config-1.50.16/sbin/webapp-cleaner
@@ -11,7 +11,7 @@ CMD="emerge -Cav"
WEBAPP_DIR="/usr/share/webapps"
WEBAPP_CONFIG=
-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /sbin/functions.sh
+[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
function help() {
echo "Remove obsolete and unused versions of web applications"

13
app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: webapp-config-1.50.16/WebappConfig/server.py
===================================================================
--- webapp-config-1.50.16.orig/WebappConfig/server.py
+++ webapp-config-1.50.16/WebappConfig/server.py
@@ -158,7 +158,7 @@ class Basic:
# is the installation directory empty?
- if not os.listdir(self.__destd):
+ if not os.listdir(self.__destd) and os.path.isdir(self.__destd):
if not self.__p:
os.rmdir(self.__destd)
else: