summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenat Lumpau <rl03@gentoo.org>2005-12-04 22:43:35 +0000
committerRenat Lumpau <rl03@gentoo.org>2005-12-04 22:43:35 +0000
commit72676e507e2b52b822e997bed4fb716c6dfdb353 (patch)
tree17894b335c3baa050db1e8cdec6c00a3763c0961 /www-apps/twiki/files
parentChanged CDEPEND to COMMON_DEP. (diff)
downloadhistorical-72676e507e2b52b822e997bed4fb716c6dfdb353.tar.gz
historical-72676e507e2b52b822e997bed4fb716c6dfdb353.tar.bz2
historical-72676e507e2b52b822e997bed4fb716c6dfdb353.zip
Fixes for w-c-1.50
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'www-apps/twiki/files')
-rw-r--r--www-apps/twiki/files/postinstall-en.txt6
-rw-r--r--www-apps/twiki/files/reconfig11
2 files changed, 9 insertions, 8 deletions
diff --git a/www-apps/twiki/files/postinstall-en.txt b/www-apps/twiki/files/postinstall-en.txt
index c70a30ed65d3..9f2f04a354b1 100644
--- a/www-apps/twiki/files/postinstall-en.txt
+++ b/www-apps/twiki/files/postinstall-en.txt
@@ -1,8 +1,8 @@
-You are almost done!
+You are almost done!
-1. Apache configs have been installed for you. You will need to restart
- Apache for them to take effect.
+1. Apache configs have been installed for you. You will need to edit them
+ to set the correct paths!
2. You may want to edit TWiki's config to suit your needs:
${MY_INSTALLDIR}/lib/TWiki.cfg
diff --git a/www-apps/twiki/files/reconfig b/www-apps/twiki/files/reconfig
index 80d6883fb2a8..59e8525acee1 100644
--- a/www-apps/twiki/files/reconfig
+++ b/www-apps/twiki/files/reconfig
@@ -8,11 +8,12 @@ die() {
}
if [ $1 = "install" ]; then
- if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
- sed -e "s|HOST|${VHOST_HOSTNAME}|
- s|DOCROOT|${VHOST_HTDOCSDIR}|
- s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
- fi
+ # don't change Apache files - breaks sandbox
+ #if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
+ # sed -e "s|HOST|${VHOST_HOSTNAME}|
+ # s|DOCROOT|${VHOST_HTDOCSDIR}|
+ # s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
+ #fi
# fix lib locations
sed -e "s|../lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/setlib.cfg || die