[pve-devel] r5943 - dab-pve-appliances/trunk/debian-6.0-request-tracker

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-09 12:05:57 +0200 (Mon, 09 May 2011)
New Revision: 5943

Modified:
   dab-pve-appliances/trunk/debian-6.0-request-tracker/Makefile
   dab-pve-appliances/trunk/debian-6.0-request-tracker/dab.conf
   dab-pve-appliances/trunk/debian-6.0-request-tracker/setup-rt
Log:


Modified: dab-pve-appliances/trunk/debian-6.0-request-tracker/Makefile
===================================================================
--- dab-pve-appliances/trunk/debian-6.0-request-tracker/Makefile	2011-05-09 10:01:26 UTC (rev 5942)
+++ dab-pve-appliances/trunk/debian-6.0-request-tracker/Makefile	2011-05-09 10:05:57 UTC (rev 5943)
@@ -5,11 +5,12 @@
 all: info/init_ok
 	dab bootstrap
 	dab task postgres --start
+	dab install apache2-mpm-prefork
 	dab install rt3.8-db-postgresql
 	dab install libio-socket-ssl-perl libtext-quoted-perl request-tracker3.8
-	# fixme: rtfm install fails - so we disable it
-	# dab install rt3.8-rtfm
-	install setup-rt -m 0755 ${BASEDIR}/etc/rc2.d/S21setup-rt
+	dab install rt3.8-rtfm
+	install -m 0755 setup-rt ${BASEDIR}/etc/init.d/
+	dab exec insserv setup-rt
 	cat rt.aliases >> ${BASEDIR}/etc/aliases
 	dab exec newaliases	
 	install -m 0644 rt.conf ${BASEDIR}/etc/apache2/sites-available/rt
@@ -31,4 +32,4 @@
 .PHONY: dist-clean
 dist-clean:
 	dab dist-clean
-	rm -f *~
\ No newline at end of file
+	rm -f *~

Modified: dab-pve-appliances/trunk/debian-6.0-request-tracker/dab.conf
===================================================================
--- dab-pve-appliances/trunk/debian-6.0-request-tracker/dab.conf	2011-05-09 10:01:26 UTC (rev 5942)
+++ dab-pve-appliances/trunk/debian-6.0-request-tracker/dab.conf	2011-05-09 10:05:57 UTC (rev 5943)
@@ -1,12 +1,12 @@
 Suite: squeeze
 CacheDir: ../cache
 #Source: http://ftp.debian.org/debian SUITE main contrib
-#Source: http://security.debian.org SUITE/updates main contrib 
-#Mirror: http://ftp.debian.org/debian => ftp://mirror/debian
+#Source: http://ftp.debian.org/debian SUITE-updates main contrib
+#Source: http://security.debian.org SUITE/updates main contrib
 Architecture: i386
-Depends: request-tracker3.8 (= 3.8.7-1)
+Depends: request-tracker3.8 (= 3.8.8-7+squeeze1)
 Name: request-tracker
-Version: 3.8.7-1
+Version: 3.8.8-2
 Section: admin
 Maintainer: Proxmox Support Team <support at proxmox.com>
 Infopage: http://pve.proxmox.com/wiki/Request_Tracker

Modified: dab-pve-appliances/trunk/debian-6.0-request-tracker/setup-rt
===================================================================
--- dab-pve-appliances/trunk/debian-6.0-request-tracker/setup-rt	2011-05-09 10:01:26 UTC (rev 5942)
+++ dab-pve-appliances/trunk/debian-6.0-request-tracker/setup-rt	2011-05-09 10:05:57 UTC (rev 5943)
@@ -1,15 +1,25 @@
 #!/bin/sh
+### BEGIN INIT INFO
+# Provides:          rt_siteconfig
+# Required-Start:    $remote_fs
+# Required-Stop:
+# X-Start-Before:    apache2
+# Default-Start:     2
+# Default-Stop:
+# Short-Description: Generate RT Siteconfig
+# Description:       Generate RT Siteconfig and gpg keys
+### END INIT INFO
 
 set -e
 
 DOMAIN=`grep '^search' /etc/resolv.conf|awk '{ print $2; }'`
-HOSTNAME=`head -n 1 /etc/hostname|awk '{ print $1; }'`
+HNAME=`head -n 1 /etc/hostname|awk '{ print $1; }'`
 
-if [ "X${HOSTNAME}" = "Xlocalhost" ] ; then
+if [ "X${HNAME}" = "Xlocalhost" ] ; then
     exit 0;
 fi
 
-FQDN=${HOSTNAME}.${DOMAIN}
+FQDN=${HNAME}.${DOMAIN}
 
 cat  >/etc/request-tracker3.8/RT_SiteConfig.d/50-debconf <<EOF
 # THE BASICS:
@@ -36,4 +46,5 @@
 
 update-rt-siteconfig-3.8
 
-rm -f $0
+insserv -r setup-rt
+rm -f /etc/init.d/setup-rt
\ No newline at end of file