[evolvis-commits] r12528: Cleaned up the Apache configuration script
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 01:42:29 CET 2011
Author: mirabilos
Date: 2011-02-28 01:42:29 +0100 (Mon, 28 Feb 2011)
New Revision: 12528
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
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.prerm
Log:
Cleaned up the Apache configuration script
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 00:42:27 UTC (rev 12527)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 00:42:29 UTC (rev 12528)
@@ -22,8 +22,10 @@
should be under /cgi/bin/mailman/ or directly under /mailman/, at
least ensure that both work. This should put an end to the related
troubles (closes: #399671, #486845).
+ * Cleaned up the Apache configuration script to use the
+ sites-available/sites-enabled system (closes: #398885).
- -- Roland Mas <lolando at debian.org> Sun, 20 Jul 2008 17:10:19 +0200
+ -- Roland Mas <lolando at debian.org> Sun, 20 Jul 2008 17:18:32 +0200
gforge (4.6.99+svn6496-1) unstable; urgency=low
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:42:27 UTC (rev 12527)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in 2011-02-28 00:42:29 UTC (rev 12528)
@@ -86,15 +86,12 @@
# 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
+ rm -f /etc/apache2/conf.d/gforge.httpd.conf
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
+ if [ -d /etc/apache2/sites-available ] && [ ! -e /etc/apache2/sites-available/gforge ] ; then
+ ln -s /etc/gforge/httpd.conf /etc/apache2/sites-available/gforge
fi
+ /usr/sbin/a2ensite gforge
# Make Apache see these new changes
invoke-rc.d apache2 restart || true
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm 2011-02-28 00:42:27 UTC (rev 12527)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.prerm 2011-02-28 00:42:29 UTC (rev 12528)
@@ -19,7 +19,8 @@
case "$1" in
remove)
- rm -f /etc/apache2/conf.d/gforge.httpd.conf
+ a2dissite gforge
+ rm -f /etc/apache2/sites-available/gforge
invoke-rc.d apache2 reload || true
;;
upgrade|deconfigure|failed-upgrade)
More information about the evolvis-commits
mailing list