[Pkg-sympa-commits] [sympa] 14/28: Remove workaround for apache2_invoke and call it directly from postinst (related to #717693)

[Emmanuel Bouthenot]

This is an automated email from the git hooks/post-receive script.

kolter pushed a commit to branch master
in repository sympa.

commit e50e5694475272b6cc9f04cc686c7f27fcc82b06
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Tue May 20 07:37:22 2014 +0200

    Remove workaround for apache2_invoke and call it directly from postinst (related to #717693)
---
 debian/sympa.postinst | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/debian/sympa.postinst b/debian/sympa.postinst
index 852cd45..8b50a4f 100644
--- a/debian/sympa.postinst
+++ b/debian/sympa.postinst
@@ -390,28 +390,15 @@ if [ "$webserver" = "Apache 2" ]; then
 		if [ "$use_soap" = "true" ]; then
 			apache2_invoke enconf sympa-soap.conf
 		else
-			#apache2_invoke disconf sympa-soap.conf
-			#
-			# FIXME: Workaround disconf no (yet?) supported in postinst
-			#
-			rm -f /etc/apache2/conf-enabled/sympa-soap.conf
-			export APACHE2_NEED_ACTION=1
-			apache2_reload reload
+			apache2_invoke disconf sympa-soap.conf
 		fi
 	fi
 else
 	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
 		# Apache2 >= 2.4
 		. /usr/share/apache2/apache2-maintscript-helper
-		#apache2_invoke disconf sympa.conf
-		#apache2_invoke disconf sympa-soap.conf
-		#
-		# FIXME: Workaround disconf no (yet?) supported in postinst
-		#
-		rm -f /etc/apache2/conf-enabled/sympa.conf
-		rm -f /etc/apache2/conf-enabled/sympa-soap.conf
-		export APACHE2_NEED_ACTION=1
-		apache2_reload reload
+		apache2_invoke disconf sympa.conf
+		apache2_invoke disconf sympa-soap.conf
 	fi
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git