add apache-restart script

diff --git a/debian/changelog b/debian/changelog
index 442108a1ef455c9eed2f017116f117a86a18c88c..6c5329d526a9f8151739daae879f40393bc6d921 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian.org (8) stable; urgency=low
+
+  * Install restart-apache script.
+
+ -- Martin Zobel-Helas <zobel@debian.org>  Sun, 07 Dec 2008 15:35:45 +0100
+
 debian.org (7) stable; urgency=low
 
   * Depend on libpam-pwdfile.

diff --git a/debian/control b/debian/control
index ec32a125c2231558f4edcaf58f4583aa108ac3f2..552091fd3299f08ca49ceb74e04cfd4686112e46 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debian.org
 Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
-Uploaders: Ryan Murray <rmurray@debian.org>, Peter Palfrader <weasel@debian.org>
+Uploaders: Ryan Murray <rmurray@debian.org>, Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
 Standards-Version: 3.7.2
 
 Package: debian.org

diff --git a/debian/copyright b/debian/copyright
index c396866786c6190a1a9f56417b8b164a00c68a97..284cb766f048f92e3984f7c58b99c8e73c008dda 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,7 @@
 This is a metapackage for DSA maintained debian.org hosts.
 
 Copyright (c) 2007, Ryan Murray
+          (c) 2008, Peter Palfrader
+          (c) 2008, Martin Zobel-Helas
 
 License: GPL; see /usr/share/common-licenses/GPL

diff --git a/debian/rules b/debian/rules
index 22264369f91178e48e0586c8c6a1b02baed06579..ca8b11f83b1fbcb1f168ddaa6716bf48f5e4574d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ binary-indep:
        chown -R root.root debian/tmp
        chmod -R g-ws debian/tmp
        install -m755 upgrade-porter-chroots debian/tmp/usr/sbin
+       install -m755 restart-apache debian/tmp/usr/sbin
        install -m644 debian/copyright debian/tmp/usr/share/doc/debian.org/
        install -m644 debian/changelog debian/tmp/usr/share/doc/debian.org/changelog
        gzip -9f debian/tmp/usr/share/doc/debian.org/changelog

diff --git a/restart-apache b/restart-apache
new file mode 100644 (file)
index 0000000..6b7c405
--- /dev/null
+++ b/restart-apache
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# needs:
+# %apachectrl  ALL=(root)      /usr/sbin/restart-apache
+
+case $1 in 
+       restart)
+               action="restart"
+       ;;
+       reload)
+               action="reload"
+       ;;
+       *)
+               echo "Usage: $0 [restart|reload]"
+       ;;
+esac
+
+if [ -x /usr/sbin/apache2ctl ]; then
+
+       /usr/sbin/apache2ctl configtest
+
+       if [ "$?" != "0" ]; then
+               env -i /etc/init.d/apache2 $action
+       else
+               echo "configtest returned errors, thus not restarting apache"
+               exit 1
+       fi
+else
+       echo "Ehhh, there is no Apache2 on this machine"
+       exit 2
+fi
+