[evolvis-commits] r11828: Make use of patch_apache dsf_helper↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:26:08 CET 2011
Author: mirabilos
Date: 2011-02-24 18:26:08 +0100 (Thu, 24 Feb 2011)
New Revision: 11828
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.config.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.prerm.dsfh-in
Log:
Make use of patch_apache dsf_helper
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.config.dsfh-in 2011-02-24 17:26:06 UTC (rev 11827)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.config.dsfh-in 2011-02-24 17:26:08 UTC (rev 11828)
@@ -26,10 +26,6 @@
# [Disabled] DSFHELPER:dbpasswd-variables#
# [Disabled] DSFHELPER:ldap-variables#
# [Disabled] DSFHELPER:dbhost-variables#
+#DSFHELPER:patch-apache#
-for flavour in apache apache2 apache-perl apache-ssl ; do
- [ -e /etc/$flavour/httpd.conf ] && propose_update_install /etc/$flavour/httpd.conf
- [ -e /etc/php4/$flavour/php.ini ] && propose_update_install /etc/php4/$flavour/php.ini
-done
-
-propose_update_install /etc/php4/cgi/php.ini
+patch_apache_propose apache apache-perl apache-ssl
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in 2011-02-24 17:26:06 UTC (rev 11827)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in 2011-02-24 17:26:08 UTC (rev 11828)
@@ -27,6 +27,7 @@
#DSFHELPER:replace-files#
#DSFHELPER:handle-mainconffile#
+#DSFHELPER:patch-apache#
case "$1" in
configure)
@@ -50,18 +51,13 @@
echo "can't find cronolog in usual places" >&2
add_onevar_mainconfile cronolog_path /usr/bin/cronolog
fi
- db_stop
/usr/sbin/gforge-config
# Patch Apache configuration files
- /usr/lib/gforge/bin/install-apache.sh configure-files
- for flavour in apache apache2 apache-perl apache-ssl ; do
- [ -e /etc/$flavour/httpd.conf ] && replace_file /etc/$flavour/httpd.conf
- [ -e /etc/php4/$flavour/php.ini ] && replace_file /etc/php4/$flavour/php.ini
- done
+ patch_apache_replace apache apache-perl apache-ssl
- replace_file /etc/php4/cgi/php.ini
+ db_stop
# Setup our Apache
touch /var/lib/gforge/etc/httpd.vhosts && \
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.prerm.dsfh-in 2011-02-24 17:26:06 UTC (rev 11827)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.prerm.dsfh-in 2011-02-24 17:26:08 UTC (rev 11828)
@@ -18,13 +18,13 @@
. /usr/share/debconf/confmodule
#DSFHELPER:replace-files#
+#DSFHELPER:patch-apache#
case "$1" in
remove)
db_title "Unconfiguring Gforge"
# Unpatch Apache configuration files
- /usr/lib/gforge/bin/install-apache.sh purge-files
- propose_update_remove /etc/apache/httpd.conf
+ unpatch_apache
# Clean debconf after ourselves
db_stop
More information about the evolvis-commits
mailing list