[debian-edu-commits] debian-edu/pkg-team/ 30/32: debian/gosa.postinst: Enable gosa-apache.conf appropriately with Apache2.4. Thanks to Andreas B. Mundt for providing the necessary patch. (Closes: #717743).

[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 91e0ea0794185cb6079e56709943e4e4dc3692f2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 1 18:43:31 2014 +0200

    debian/gosa.postinst: Enable gosa-apache.conf appropriately with Apache2.4. Thanks to Andreas B. Mundt for providing the necessary patch. (Closes: #717743).
---
 debian/changelog     |  3 +++
 debian/gosa.postinst | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0655cee..9f4ed22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ gosa (2.7.4+reloaded1-1) UNRELEASED; urgency=low
   * debian/gosa.prerm:
     + Add file. Handle removal of symlinks created during postinst.
       (Closes: #715441).
+  * debian/gosa.postinst:
+    + Enable gosa-apache.conf appropriately with Apache2.4. Thanks to
+      Andreas B. Mundt for providing the necessary patch. (Closes: #717743).
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 01 Apr 2014 16:36:31 +0200
 
diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index e360a27..ce3d9c8 100755
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -68,6 +68,40 @@ if [ -d /etc/apache2/conf.d ]; then
   fi
 fi
 
+# conf-available
+if [ -d /etc/apache2/conf-available ] ; then
+
+  # Copy GOsa configuration to conf-available directory /etc/apache2/conf-available
+  if [ ! -L /etc/apache2/conf-available/gosa.conf ]; then
+
+    # Remove old instances of this file
+    if [ -f /etc/apache2/conf-available/gosa.conf ]; then
+      echo "Found old gosa apache configuration in /etc/apache2/conf-available/gosa.conf - moving it to /etc/apache2/conf-available/gosa.conf.orig ..."
+      echo "Please check for changes in /etc/apache2/conf-available/gosa.conf.orig if you modified this file!"
+      mv /etc/apache2/conf-available/gosa.conf /etc/apache2/conf-available/gosa.conf.orig
+    fi
+
+    echo "Making /gosa available in /etc/apache2/conf-available"
+
+    # Add GOsa include file
+    ln -s /etc/gosa/gosa-apache.conf /etc/apache2/conf-available/gosa.conf
+  fi
+
+  if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+      . /usr/share/apache2/apache2-maintscript-helper
+      apache2_invoke enconf gosa
+      apache2_invoke enmod headers
+  fi
+  # Finally restart servers
+  if [ -x /usr/sbin/apache2 ]; then
+      if [ -x /usr/sbin/invoke-rc.d ]; then
+          invoke-rc.d apache2 reload
+      else
+          /etc/init.d/apache2 reload
+      fi
+  fi
+fi
+
 if [ -d /etc/lighttpd/conf-available ]; then
 
   # Copy GOsa configuration to conf-available directories /etc/lighttpd/conf-available

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