[debian-edu-commits] debian-edu/pkg-team/ 01/02: debian/gosa.postinst: Drop support for handling apache2.2's /etc/apache2/conf.d/ directory. (Closes: #858312).

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository gosa.

commit 6b9060cac2af7a5f891cff7e200103f6105e8d05
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 10:21:11 2018 +0100

    debian/gosa.postinst: Drop support for handling apache2.2's /etc/apache2/conf.d/ directory. (Closes: #858312).
---
 debian/gosa.postinst | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index 35c970b..85746f8 100755
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -71,41 +71,6 @@ if [ -d /etc/apache2/conf-available ] ; then
 		fi
 	fi
 
-# Apache2.2 / deprecated conf.d (for wheezy-backports)
-elif [ -d /etc/apache2/conf.d ]; then
-
-	# Copy GOsa configuration to conf.d directories
-	if [ ! -L /etc/apache2/conf.d/gosa.conf ]; then
-
-		# Remove old instances of this file
-		if [ -f /etc/apache2/conf.d/gosa.conf ]; then
-			echo "Found old gosa apache configuration in /etc/apache2/conf.d - moving it to gosa.conf.orig..."
-			echo "Please check for changes in /etc/gosa/gosa-apache.conf if you modified this file!"
-			mv /etc/apache2/conf.d/gosa.conf /etc/apache2/conf.d/gosa.conf.orig
-		fi
-
-		echo "Making /gosa available in /etc/apache2/conf.d"
-
-		# Add GOsa include file
-		ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf.d/gosa.conf
-	fi
-
-	# Add support for RequestHeader
-	if [ -x "$(which a2enmod)" ]; then
-		a2enmod headers
-	fi
-
-	# Finally restart servers
-	if [ -x "$(which apache2ctl)" ]; then
-		if [ -x "$(which invoke-rc.d)" ]; then
-			invoke-rc.d apache2 reload
-		else
-			/etc/init.d/apache2 reload
-		fi
-	fi
-fi
-
-
 # for lighttpd...
 if [ -d /etc/lighttpd/conf-available ]; then
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git