summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenat Lumpau <rl03@gentoo.org>2005-08-22 22:50:36 +0000
committerRenat Lumpau <rl03@gentoo.org>2005-08-22 22:50:36 +0000
commita2d103d624673be51d7239306f339a0b1f5ad9a0 (patch)
tree51b73f9ee8f7f75ddb401ad100b4f038d6515141 /www-apps/twiki/files
parentstable on ia64 (diff)
downloadgentoo-2-a2d103d624673be51d7239306f339a0b1f5ad9a0.tar.gz
gentoo-2-a2d103d624673be51d7239306f339a0b1f5ad9a0.tar.bz2
gentoo-2-a2d103d624673be51d7239306f339a0b1f5ad9a0.zip
Housekeeping
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'www-apps/twiki/files')
-rw-r--r--www-apps/twiki/files/postinstall-en.txt8
-rw-r--r--www-apps/twiki/files/reconfig18
2 files changed, 18 insertions, 8 deletions
diff --git a/www-apps/twiki/files/postinstall-en.txt b/www-apps/twiki/files/postinstall-en.txt
index 15a4fa50eaf9..f0187ae2a511 100644
--- a/www-apps/twiki/files/postinstall-en.txt
+++ b/www-apps/twiki/files/postinstall-en.txt
@@ -1,15 +1,15 @@
You are almost done!
-1. Apache configs have been installed for you. You will need to restart
+1. Apache configs have been installed for you. You will need to restart
Apache for them to take effect.
2. You may want to edit TWiki's config to suit your needs:
${MY_INSTALLDIR}/lib/TWiki.cfg
3. Run the testenv script from your browser:
- http://${VHOST_HOSTNAME}/twiki/bin/testenv.
- It will show you the user name of the CGI scripts, a table listing all CGI
+ http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/bin/testenv
+ It will show you the user name of the CGI scripts, a table listing all CGI
environment variables, and a test of your configuration file.
4. Read the install guide
@@ -17,4 +17,4 @@ You are almost done!
particularly if you wish to set up email preferences or I18N.
5. Visit http://${VHOST_HOSTNAME}/twiki, or
- http://${VHOST_HOSTNAME}/twiki/bin/view
+ http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/bin/view
diff --git a/www-apps/twiki/files/reconfig b/www-apps/twiki/files/reconfig
index f8933d7b77fa..80d6883fb2a8 100644
--- a/www-apps/twiki/files/reconfig
+++ b/www-apps/twiki/files/reconfig
@@ -1,15 +1,25 @@
#!/bin/bash
+
+die() {
+ echo "#####"
+ echo $1
+ echo "#####"
+ exit 1
+}
+
if [ $1 = "install" ]; then
- [[ -a /etc/apache/vhosts.d/twiki.conf ]] && sed -e "s|HOST|${VHOST_HOSTNAME}|
+ 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
+ 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
+ sed -e "s|../lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/setlib.cfg || die
# fix TWiki.cfg
sed -e "s|http://your.domain.com|http://${VHOST_HOSTNAME}|
- s|/home/httpd/twiki|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/lib/TWiki.cfg
+ s|/home/httpd/twiki|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/lib/TWiki.cfg || die
else
echo $1
fi