running outside of apache

4 files changed, 62 insertions, 15 deletions

diff --git a/net-www/twiki/ChangeLog b/net-www/twiki/ChangeLog
index 2391db522901..acd5b387aaa0 100644
--- a/net-www/twiki/ChangeLog
+++ b/net-www/twiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/twiki
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/twiki/ChangeLog,v 1.1 2003/12/30 17:11:48 mholzer Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/twiki/ChangeLog,v 1.2 2004/01/22 23:53:14 mholzer Exp $
+
+  23 Jan 2004; Martin Holzer <mholzer@gentoo.org> twiki-20030201.ebuild,
+  files/twiki.conf:
+  running outside of apache
 
 *twiki-20030201 (30 Dec 2003)
 
diff --git a/net-www/twiki/Manifest b/net-www/twiki/Manifest
index 1fb9348026ca..f594bedab121 100644
--- a/net-www/twiki/Manifest
+++ b/net-www/twiki/Manifest
@@ -1,4 +1,5 @@
+MD5 e9a6c06d044508e3f409f9c821516a16 twiki-20030201.ebuild 1695
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 ea2a214c39a6f6114ae45318b832252c ChangeLog 371
-MD5 a3799bc2baeab6925960138a5cdb246d twiki-20030201.ebuild 1122
+MD5 cc2037c5908e58093cfc222ecbf64b94 ChangeLog 493
 MD5 03289224ed6b4fd47078e353bc05c650 files/digest-twiki-20030201 65
+MD5 6c6c056f184e8d333ae577837290e282 files/twiki.conf 538
diff --git a/net-www/twiki/files/twiki.conf b/net-www/twiki/files/twiki.conf
new file mode 100644
index 000000000000..c93d241d6b36
--- /dev/null
+++ b/net-www/twiki/files/twiki.conf
@@ -0,0 +1,26 @@
+ScriptAlias /twiki/bin/ "/var/www/twiki/bin/"
+Alias /twiki/ "/var/www/twiki/"
+
+<Directory "/var/www/twiki">
+	Options None
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+</Directory>
+<Directory "/var/www/twiki/bin">
+	Options +ExecCGI
+	SetHandler cgi-script
+	Allow from all
+</Directory>
+
+<Directory "/var/www/twiki/pub">
+	Options FollowSymLinks +Includes
+	AllowOverride None
+	Allow from all
+</Directory>
+<Directory "/var/www/twiki/data">
+	deny from all
+</Directory>
+<Directory "/var/www/twiki/templates">
+	deny from all
+</Directory>
diff --git a/net-www/twiki/twiki-20030201.ebuild b/net-www/twiki/twiki-20030201.ebuild
index ca03210359b3..113b216933c0 100644
--- a/net-www/twiki/twiki-20030201.ebuild
+++ b/net-www/twiki/twiki-20030201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /home/cvsroot/gentoo-x86/net-www/tiki/tiki-1.6.ebuild
 
@@ -16,6 +16,8 @@ RDEPEND="virtual/php
 	media-gfx/graphviz
 	dev-db/mysql"
 
+IUSE="apache2"
+
 webapp-detect || NO_WEBSERVER=1
 
 pkg_setup() {
@@ -27,27 +29,41 @@ src_unpack() {
 	mkdir ${P}
 	cd ${S}
 	unpack ${A}
-	sed -i -e 's:\/home\/httpd:\/var\/www\/localhost\/htdocs:g' lib/TWiki.cfg
-	echo "Options ExecCGI" >> bin/.htaccess.txt
+
+	sed -i -e 's:\/home\/httpd:\/var\/www:g' lib/TWiki.cfg
+#	sed -i -e 's:urlpath\/to:var\/www\/localhost\/htdocs:g' \
+#		bin/.htaccess.txt
+#	echo "Options ExecCGI" >> bin/.htaccess.txt
 }
 
 
 src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/${PN}
+	local destdir=/var/www/twiki
 
 	dodir ${destdir}
 	cp -r . ${D}${destdir}
 
-	cd ${D}/${HTTPD_ROOT}
+	if [ "`use apache2`" ]; then
+		dodir /etc/apache2/conf/modules.d
+		insinto /etc/apache2/conf/modules.d
+		newins ${FILESDIR}/twiki.conf 97_twiki.conf
+	else
+		dodir /etc/apache/conf/addon-modules
+		insinto /etc/apache/conf/addon-modules
+		doins ${FILESDIR}/twiki.conf
+	fi
+
 	dodoc readme.txt license.txt
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${PN}
+	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${destdir}
+	chmod 0775 -R ${destdir}/pub ${destdir}/data
+	chown nobody -R ${destdir}/pub ${destdir}/data
+	#find ${D}/${HTTPD_ROOT}/${PN}/templates -type d -exec chmod 0440 {} \;
+#	chmod 0444 -R ${PN}/templates
 }
 
 pkg_postinst() {
-	einfo "now go to your ${HTTPD_ROOT},"
+	einfo "now go to your ${HTTPD_ROOT}/{PN},"
 	einfo "copy bin/.htaccess.txt to bin/.htaccess"
-	einfo "and edit the paths"
+	einfo "and be sure to read"
+	einfo "http://localhost/twiki/bin/view/TWiki/TWikiDocumentation#TWiki_Installation_Guide"
 }