[debian-edu-commits] debian-edu/pkg-team/ 02/02: debian/gosa.postinst: Deactivate deprecated gosa.conf, if found in /etc/apache2/conf.d/.

[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 ea1b4872e1a412c9ff6654302e5774b2ebe94dde
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 10:27:51 2018 +0100

    debian/gosa.postinst: Deactivate deprecated gosa.conf, if found in /etc/apache2/conf.d/.
---
 debian/gosa.postinst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index 85746f8..e030fd5 100755
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -38,6 +38,19 @@ if [ ! -f /etc/gosa/gosa.secrets ]; then
 	chmod 600 /etc/gosa/gosa.secrets
 fi
 
+
+# Apache2.2 / drop gosa.conf from deprecated conf.d
+if [ -d /etc/apache2/conf.d ]; then
+
+	# Remove GOsa configuration from conf.d directories, if that still exists...
+	if   [ -L /etc/apache2/conf.d/gosa.conf ]; then
+		rm /etc/apache2/conf.d/gosa.conf
+	elif [ -f /etc/apache2/conf.d/gosa.conf ]; then
+		mv /etc/apache2/conf.d/gosa.conf /etc/apache2/conf.d/gosa.conf.obsolete
+	fi
+
+fi
+
 # Apache2.4 / conf-available
 if [ -d /etc/apache2/conf-available ] ; then
 

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