[debian-edu-commits] debian-edu/pkg-team/ 19/32: Imported Debian patch 2.7.4-4.2

[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 0834aaad7799def5cdefdda217d1545578870e3b
Author: Jonathan Wiltshire <jmw at debian.org>
Date:   Thu Feb 7 20:28:29 2013 +0000

    Imported Debian patch 2.7.4-4.2
---
 debian/changelog     | 11 +++++++++++
 debian/gosa.postinst |  4 ++++
 debian/gosa.postrm   |  4 ++++
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cbb158f..70f25a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gosa (2.7.4-4.2) unstable; urgency=low
+
+  [ Jonathan Wiltshire ]
+  * Non-maintainer upload.
+
+  [ Vagrant Cascadian ]
+  * debian/gosa.postinst, debian/gosa.postrm: Only restart apache2 or lighttpd
+    when binary is present. (Closes: #699616)
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Thu, 07 Feb 2013 20:28:29 +0000
+
 gosa (2.7.4-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index a9e2288..e360a27 100644
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -59,11 +59,13 @@ if [ -d /etc/apache2/conf.d ]; then
   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
@@ -85,11 +87,13 @@ if [ -d /etc/lighttpd/conf-available ]; then
   fi
 
   # Finally restart servers
+  if [ -x /usr/sbin/lighttpd ]; then
   if [ -x /usr/sbin/invoke-rc.d ]; then
     invoke-rc.d lighttpd reload
   else
     /etc/init.d/lighttpd reload
   fi
+  fi
 
 fi
 
diff --git a/debian/gosa.postrm b/debian/gosa.postrm
index dce38ee..1c3cc93 100644
--- a/debian/gosa.postrm
+++ b/debian/gosa.postrm
@@ -27,11 +27,13 @@ case "$1" in
           [ -L /etc/apache2/conf.d/gosa.conf ] && rm -f /etc/apache2/conf.d/gosa.conf
 
           # Restart servers
+          if [ -x /usr/sbin/apache2 ]; then
           if [ -x /usr/sbin/invoke-rc.d ]; then
             invoke-rc.d apache2 restart
           else
             /etc/init.d/apache2 restart
           fi
+          fi
         fi
 
         if [ -d /etc/lighttpd/conf-available ]; then
@@ -39,11 +41,13 @@ case "$1" in
           [ -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ] && rm -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
 
           # Restart servers
+          if [ -x /usr/sbin/lighttpd ]; then
           if [ -x /usr/sbin/invoke-rc.d ]; then
             invoke-rc.d lighttpd restart
           else
             /etc/init.d/lighttpd restart
           fi
+          fi
         fi
         
         ;;

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