[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-11-g3770f98

Arno Töll arno at debian.org
Sun May 12 15:55:45 UTC 2013


The following commit has been merged in the next branch:
commit b982f68ad19d67c15cf6867f16ad8d631c841bbf
Author: Arno Töll <arno at debian.org>
Date:   Sun May 12 13:20:43 2013 +0200

    Only restart Apache from log rotate when it was previously running.
    Closes #707892

diff --git a/debian/apache2.logrotate b/debian/apache2.logrotate
index 73cc252..f3d8837 100644
--- a/debian/apache2.logrotate
+++ b/debian/apache2.logrotate
@@ -8,7 +8,9 @@
 	create 640 root adm
 	sharedscripts
 	postrotate
-		/etc/init.d/apache2 reload > /dev/null
+                if /etc/init.d/apache2 status > /dev/null ; then \
+                    /etc/init.d/apache2 reload > /dev/null; \
+                fi;
 	endscript
 	prerotate
 		if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
diff --git a/debian/changelog b/debian/changelog
index b3bcfd7..fd9e3e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,23 @@
 apache2 (2.4.4-3) UNRELEASED; urgency=low
 
   [ Arno Töll ]
+  * libapache2-mod-proxy-html is included in Apache 2.4 and not packaged
+    separately anymore. Thus, we are using the most recent version available
+    now (Closes: #695482).
   * Fix "typo in mpm_event.load" by applying the patch provided by Bastian
     Triller. Thanks (Closes: #704639)
   * Replace some occurrences of "Squeeze" in our scripts. It's Wheezy time.
   * Add -e|--noenable option to dh_apache2 (Closes: #681544)
+  * Fix "don't assume apache2 is running 24 hours a day when rotating
+    logs": Only restart the webserver when it was previously running
+    (Closes: #707892)
 
   [ Stefan Fritsch ]
   * Remove paragraph about MaxMemFree in README.Debian. The issue should be
     fixed in 2.4.
   * Enable mod_authn_core when upgrading from wheezy (Closes: #702866)
 
- -- Arno Töll <arno at debian.org>  Wed, 08 May 2013 17:28:22 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 12 May 2013 13:19:28 +0200
 
 apache2 (2.4.4-2) experimental; urgency=low
 

-- 
Debian packaging for apache2



More information about the Pkg-apache-commits mailing list