diff options
| author | Stefan Fritsch <sf@debian.org> | 2010-03-02 20:15:10 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:37:07 +0100 |
| commit | e6c5cfea734532007edb0f19c3438f84c0e571b7 (patch) | |
| tree | 4b6eb391946828e28f7fc97e7f562bd804bdb24f | |
| parent | a085e90d673c6444e69e5563a644b7ac1b472ca0 (diff) | |
| download | apache2-e6c5cfea734532007edb0f19c3438f84c0e571b7.tar.gz | |
Do a configcheck in the init script before doing a non-graceful restart
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1156 01b336ce-410b-0410-9a02-a0e7f243c266
| -rw-r--r-- | debian/apache2.2-common.apache2.init | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/apache2.2-common.apache2.init b/debian/apache2.2-common.apache2.init index 86bab64f..0535d940 100644 --- a/debian/apache2.2-common.apache2.init +++ b/debian/apache2.2-common.apache2.init @@ -224,6 +224,11 @@ case $1 in fi ;; restart) + if ! $APACHE2CTL configtest > /dev/null 2>&1; then + $APACHE2CTL configtest || true + log_end_msg 1 + exit 1 + fi if check_htcacheclean ; then log_daemon_msg "Restarting web server" "htcacheclean" stop_htcacheclean diff --git a/debian/changelog b/debian/changelog index 656fa793..2d2cf281 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apache2 (2.2.14-8) UNRELEASED; urgency=low * Fix bash completion for a2ensite if the site name contains 'conf' or 'load'. Closes: #572232 + * Do a configcheck in the init script before doing a non-graceful restart. + Closes: #571461 -- Stefan Fritsch <sf@debian.org> Tue, 02 Mar 2010 20:56:18 +0100 |