[evolvis-commits] r12267: Cleaning up maintainer scripts for gforge-web-apache2

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:32:16 CET 2011


Author: mirabilos
Date: 2011-02-28 01:32:16 +0100 (Mon, 28 Feb 2011)
New Revision: 12267

Added:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm
Removed:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm.dsfh-in
Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in
Log:
Cleaning up maintainer scripts for gforge-web-apache2

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.config.dsfh-in	2011-02-28 00:32:14 UTC (rev 12266)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.config.dsfh-in	2011-02-28 00:32:16 UTC (rev 12267)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -26,6 +25,3 @@
 # [Disabled] DSFHELPER:dbpasswd-variables#
 # [Disabled] DSFHELPER:ldap-variables#
 # [Disabled] DSFHELPER:dbhost-variables#
-#DSFHELPER:patch-apache#
-
-# patch_apache_propose apache2

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in	2011-02-28 00:32:14 UTC (rev 12266)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in	2011-02-28 00:32:16 UTC (rev 12267)
@@ -26,7 +26,6 @@
 . /usr/share/debconf/confmodule
 
 #DSFHELPER:handle-mainconffile#
-#DSFHELPER:patch-apache#
 
 case "$1" in
     configure)
@@ -35,8 +34,7 @@
 	else			# ...or something else if need be.
 	    # Last I was told, the Hurd had no /dev/urandom
 	    # (Correct me if it has changed)
-	    # Suggestions form something more random than $(date) are welcome
-	    tmp=$(date | md5sum | cut -b1-8)
+	    sys_session_key=$(dd if=/dev/random count=256 bs=1 2> /dev/null | md5sum | cut -b1-32)
 	fi
 	add_onevar_mainconfile sys_session_key $sys_session_key
 	add_onevar_mainconfile sys_show_source 0
@@ -73,21 +71,32 @@
 	
         /usr/sbin/gforge-config
 
-        # Patch Apache configuration files
-	# patch_apache_replace apache2
-
 	db_stop
         # Setup our Apache
-	touch /var/lib/gforge/etc/httpd.vhosts  && \
-		chown gforge:gforge /var/lib/gforge/etc/httpd.vhosts && \
+	touch /var/lib/gforge/etc/templates/httpd.vhosts  && \
+		chown gforge:gforge /var/lib/gforge/etc/templates/httpd.vhosts && \
 		/usr/lib/gforge/bin/create-vhosts.sh --norestart
-	/usr/lib/gforge/bin/install-apache.sh configure
 
-	# Set up upload directory
-	#chown www-data:www-data /var/lib/gforge/uploads
-	# Next line done in 20050127-frs-reorg.php
-	#chown www-data:www-data /var/lib/gforge/download
+	# Enable required modules
+	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod php5 || true
+	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod ssl || true
+	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod env || true
+	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod vhost_alias || true
 	
+	# Enable the Gforge configuration
+	if [ -e /etc/apache2/conf.d/gforge.httpd.conf ] ; then
+	    LINK=`ls -l /etc/apache2/conf.d/gforge.httpd.conf | sed 's/.*-> \(.*\)$/\1/'`
+	    if [ "$LINK" != "/etc/gforge/httpd.conf" ] ; then 
+		# echo Removing symlink
+		rm -f /etc/apache2/conf.d/gforge.httpd.conf
+	    fi
+	fi
+	if [ -d /etc/apache2/conf.d ] && [ ! -e /etc/apache2/conf.d/gforge.httpd.conf ] ; then
+	    ln -s /etc/gforge/httpd.conf /etc/apache2/conf.d/gforge.httpd.conf
+	fi
+	
+	# Make Apache see these new changes
+	invoke-rc.d apache2 restart || true
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Added: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm	2011-02-28 00:32:16 UTC (rev 12267)
@@ -0,0 +1,49 @@
+#! /bin/sh
+# prerm script for gforge
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    remove)
+	db_title "Unconfiguring Gforge"
+
+	/usr/lib/gforge/bin/install-apache.sh purge-files
+	ucf /etc/apache/httpd.conf.gforge-new /etc/apache/httpd.conf
+	rm /etc/apache/httpd.conf.gforge-new
+	ucf --purge /etc/apache/httpd.conf
+
+	# Clean debconf after ourselves
+	db_stop
+
+        # Apache config removal
+	/usr/lib/gforge/bin/install-apache.sh purge
+
+	;;
+    upgrade|deconfigure|failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm.dsfh-in	2011-02-28 00:32:14 UTC (rev 12266)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm.dsfh-in	2011-02-28 00:32:16 UTC (rev 12267)
@@ -1,49 +0,0 @@
-#! /bin/sh
-# prerm script for gforge
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:replace-files#
-#DSFHELPER:patch-apache#
-case "$1" in
-    remove)
-	db_title "Unconfiguring Gforge"
-
-        # Unpatch Apache configuration files
-	unpatch_apache
-
-	# Clean debconf after ourselves
-	db_stop
-
-        # Apache config removal
-	/usr/lib/gforge/bin/install-apache.sh purge
-
-	;;
-    upgrade|deconfigure|failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0



More information about the evolvis-commits mailing list