Added proper FastCGI support for Apache1 and Apache2. Added lighttpd support.

Package-Manager: portage-2.0.51.22-r1

11 files changed, 152 insertions, 12 deletions

diff --git a/www-apps/rt/files/postinstall-en.txt b/www-apps/rt/files/3.2.1/postinstall-en.txt
index e2f9ad510ff6..e2f9ad510ff6 100644
--- a/www-apps/rt/files/postinstall-en.txt
+++ b/www-apps/rt/files/3.2.1/postinstall-en.txt
diff --git a/www-apps/rt/files/reconfig b/www-apps/rt/files/3.2.1/reconfig
index 7f831600df69..7f831600df69 100644
--- a/www-apps/rt/files/reconfig
+++ b/www-apps/rt/files/3.2.1/reconfig
diff --git a/www-apps/rt/files/config.layout-gentoo b/www-apps/rt/files/3.4.2/config.layout-gentoo
index d612b24d1cc7..d612b24d1cc7 100644
--- a/www-apps/rt/files/config.layout-gentoo
+++ b/www-apps/rt/files/3.4.2/config.layout-gentoo
diff --git a/www-apps/rt/files/postinstall-en-3.4.2.txt b/www-apps/rt/files/3.4.2/postinstall-en.txt
index a9b11f7fca0a..821fbb28b410 100644
--- a/www-apps/rt/files/postinstall-en-3.4.2.txt
+++ b/www-apps/rt/files/3.4.2/postinstall-en.txt
@@ -15,5 +15,5 @@ If you need more help, consider searching the mailing list (Google site:lists.fs
 NOTE:
 
 Some file locations have changed. Everything is now installed into
-${VHOST_ROOT}. RT executables are no longer in /usr/bin. 
+${VHOST_ROOT}. RT executables are no longer in /usr/bin
 You may need to modify your existing configuration files accordingly.
diff --git a/www-apps/rt/files/reconfig-3.4.2 b/www-apps/rt/files/3.4.2/reconfig
index 8e7f12449da3..f2fdfe0451dc 100644
--- a/www-apps/rt/files/reconfig-3.4.2
+++ b/www-apps/rt/files/3.4.2/reconfig
@@ -3,13 +3,11 @@ if [ $1 = "install" ]; then
 	# fix location
 	cd ${VHOST_ROOT}/${P}
 	sed -e "s|${MY_HOSTROOTDIR}/${P}|${VHOST_ROOT}/${P}|g
-		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/*
+		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/* etc/RT_Config.pm
 
-	# fix Apache config
-	sed -e "s|WEBMUX|${VHOST_ROOT}/${P}/bin/webmux.pl|" -i ${MY_SERVERCONFIGDIR}/apache1-rt_apache.conf
-
-	# fix permissions
-	chown -R  ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${VHOST_ROOT}/${P}/var
+	# fix Apache configs
+	sed -e "s|RT_DIR|${VHOST_ROOT}/${P}|g
+		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache*
 
 	# check for upgrades
 	cd ${VHOST_ROOT}/${P}/upgrade
@@ -28,8 +26,8 @@ elif [ $1 = "clean" ]; then
 	MY_PN=$(basename $(dirname $(dirname ${MY_HOSTROOTDIR})))
 	MY_P="${MY_PN}-${MY_PV}"
 
-	if [ ! "${VHOST_ROOT}${MY_P}a" = "a" ]; then 
-		rm -rf ${VHOST_ROOT}/${MY_P}/bin ${VHOST_ROOT}/${MY_P}/lib/RT.pm ${VHOST_ROOT}/${MY_P}/sbin
+	if [[ "${VHOST_ROOT}${MY_P}" ]]; then 
+		rm -rf ${VHOST_ROOT}/${MY_P}/bin ${VHOST_ROOT}/${MY_P}/lib/RT.pm ${VHOST_ROOT}/${MY_P}/sbin ${VHOST_ROOT}/${MY_P}/etc/RT_Config.pm
 	else
 		echo "Variables not set!"
 	fi
diff --git a/www-apps/rt/files/3.4.2/rt.conf.d b/www-apps/rt/files/3.4.2/rt.conf.d
new file mode 100644
index 000000000000..e43336fa8ecf
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt.conf.d
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/3.4.2/rt.conf.d,v 1.1 2005/06/21 02:12:38 rl03 Exp $
+
+# Config file for /etc/init.d/rt
+
+RTUSER=rt
+RTGROUP=lighttpd
+
+# set RTPATH to rt's root
+RTPATH=/var/www/localhost/rt-3.4.2
+
+FCGI_SOCKET_PATH=${RTPATH}/var/appSocket
+PIDFILE=${RTPATH}/var/pid
diff --git a/www-apps/rt/files/3.4.2/rt.init.d b/www-apps/rt/files/3.4.2/rt.init.d
new file mode 100755
index 000000000000..a19aa0ffa51a
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt.init.d
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/files/3.4.2/rt.init.d,v 1.1 2005/06/21 02:12:38 rl03 Exp $
+
+depend() {
+	use mysql postgresql lighttpd
+}
+
+start() {
+	ebegin "Starting RT"
+	rm -f ${FCGI_SOCKET_PATH}
+	env -i PATH=$PATH FCGI_SOCKET_PATH=${FCGI_SOCKET_PATH}\
+		/sbin/start-stop-daemon -o --quiet --start \
+		--startas ${RTPATH}/bin/mason_handler.fcgi \
+		--pidfile ${PIDFILE} -c ${RTUSER} -g ${RTGROUP} -b -d ${RTPATH}
+	# if you experience problems, comment out the line above
+	# and uncomment the line below
+	# --pidfile ${PIDFILE} -c ${RTUSER} -g ${RTGROUP}  -d ${RTPATH}
+
+	eend $?
+	while true; do
+		[[ -a ${FCGI_SOCKET_PATH} ]] && break
+		sleep 1
+	done
+	chmod g+rwx ${FCGI_SOCKET_PATH}
+}
+
+stop() {
+	ebegin "Stopping RT"
+	/sbin/start-stop-daemon -o --quiet --stop --pidfile ${PIDFILE}
+	eend $?
+}
+
+restart() {
+	svc_stop
+	svc_start
+}
diff --git a/www-apps/rt/files/rt_apache.conf b/www-apps/rt/files/3.4.2/rt_apache.conf
index bea5ffc493c0..896f642c55af 100644
--- a/www-apps/rt/files/rt_apache.conf
+++ b/www-apps/rt/files/3.4.2/rt_apache.conf
@@ -2,14 +2,16 @@
     <VirtualHost MY_RT_DOMAIN:80>
         ServerName MY_RT_DOMAIN
 
-        DocumentRoot DOCUMENT_ROOT
+        DocumentRoot HTDOCS
 	ServerAdmin YOUR_EMAIL_HERE
 
         AddDefaultCharset UTF-8
-        UserDir disabled
+	<IfDefine USERDIR>
+	        UserDir disabled
+	</IfDefine>
  
         PerlModule Apache::DBI
-        PerlRequire WEBMUX
+        PerlRequire RT_DIR/bin/webmux.pl
  
 	<Location />
 		SetHandler perl-script
@@ -17,5 +19,12 @@
 		PerlSetEnv PERL5LIB /usr/lib
 	</Location>
 
+	<Directory "HTDOCS">
+		Options Indexes FollowSymLinks
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+
     </VirtualHost>
 </IfDefine>
diff --git a/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf b/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf
new file mode 100644
index 000000000000..0bff8a0556f9
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt_apache1_fcgi.conf
@@ -0,0 +1,41 @@
+<IfDefine FASTCGI>
+
+	# Tell FastCGI to put its temporary files somewhere sane.
+	FastCgiIpcDir /tmp
+
+	# Tell FastCGI that it should use apache's "suexec" binary to call any FastCGI script.
+	# This is a GLOBAL setting
+	FastCgiWrapper /usr/sbin/suexec
+
+	# Apache 1.3 discards the user and group parameters on the FastCgiServer line.
+	# Apache 2.0 requires them.
+	FastCgiServer RT_DIR/bin/mason_handler.fcgi -idle-timeout 120 -user rt -group rt -processes 4
+
+
+	<VirtualHost MY_RT_DOMAIN:80>
+		ServerName MY_RT_DOMAIN
+		
+		DocumentRoot HTDOCS
+		ServerAdmin YOUR_EMAIL_HERE
+
+		AddDefaultCharset UTF-8
+		<IfDefine USERDIR>
+			UserDir disabled
+		</IfDefine>
+
+		# Set the rt user and group as the executing user for this virtual host
+		User rt
+		Group rt
+
+		AddHandler fastcgi-script fcgi
+		ScriptAlias / RT_DIR/bin/mason_handler.fcgi/
+
+		 <Directory "HTDOCS">
+			Options Indexes FollowSymLinks
+			AllowOverride None
+			Order allow,deny
+			Allow from all
+		</Directory>
+
+	</VirtualHost>
+</IfDefine>
diff --git a/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf b/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf
new file mode 100644
index 000000000000..aa6ccdc9a04e
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt_apache2_fcgi.conf
@@ -0,0 +1,39 @@
+<IfDefine FASTCGI>
+
+	# Tell FastCGI to put its temporary files somewhere sane.
+	FastCgiIpcDir /tmp
+
+	# Tell FastCGI that it should use apache's "suexec" binary to call any FastCGI script.
+	# This is a GLOBAL setting
+	FastCgiWrapper /usr/sbin/suexec2
+
+	# Apache 1.3 discards the user and group parameters on the FastCgiServer line.
+	# Apache 2.0 requires them.
+	FastCgiServer RT_DIR/bin/mason_handler.fcgi -idle-timeout 120 -user rt -group rt -processes 4
+
+
+	<VirtualHost MY_RT_DOMAIN:80>
+		ServerName MY_RT_DOMAIN
+		
+		DocumentRoot HTDOCS
+		ServerAdmin YOUR_EMAIL_HERE
+
+		AddDefaultCharset UTF-8
+		<IfDefine USERDIR>
+			UserDir disabled
+		</IfDefine>
+
+		# Set the rt user and group as the executing user for this virtual host
+		SuexecUserGroup rt rt
+		AddHandler fastcgi-script fcgi
+		ScriptAlias / RT_DIR/bin/mason_handler.fcgi/
+
+		 <Directory "HTDOCS">
+			Options Indexes FollowSymLinks
+			AllowOverride None
+			Order allow,deny
+			Allow from all
+		</Directory>
+
+	</VirtualHost>
+</IfDefine>
diff --git a/www-apps/rt/files/digest-rt-3.4.2-r1 b/www-apps/rt/files/digest-rt-3.4.2-r1
new file mode 100644
index 000000000000..550fde369b98
--- /dev/null
+++ b/www-apps/rt/files/digest-rt-3.4.2-r1
@@ -0,0 +1 @@
+MD5 a50158055fff423a557d43335ae1dc81 rt-3.4.2.tar.gz 1359775