Hi, While testing ctdb (1.0.112-12-2) with apache2 failover, I find that the proposed patch was not good (92-apache-service-enable.diff from http://release.debian.org/proposed-updates/stable_diffs/ctdb_1.0.112-12-2.debdiff).
So, I propose another upload with the following diff from -2: Index: debian/changelog =================================================================== --- debian/changelog (révision 3889) +++ debian/changelog (copie de travail) @@ -1,3 +1,11 @@ +ctdb (1.0.112-12-3) stable; urgency=low + + * Really fix httpd (i.e. apache2 service) activation + (the previous patch was depending on commit d98f175e which was not in ctdb + 1.0.112-12). + + -- Mathieu Parent <[email protected]> Tue, 20 Sep 2011 22:06:29 +0200 + ctdb (1.0.112-12-2) stable; urgency=low * Fix ethtool path in /etc/ctdb/events.d/10.interface (Closes: #635135) Index: debian/patches/92-apache-service-enable.diff =================================================================== --- debian/patches/92-apache-service-enable.diff (révision 3889) +++ debian/patches/92-apache-service-enable.diff (copie de travail) @@ -4,18 +4,17 @@ Author: Mathieu Parent <[email protected]> -Upstream status: to be sent +Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=8317 -Index: ctdb-1.0.112-12/config/events.d/41.httpd +Index: ctdb-1.0.112-12/config/functions =================================================================== ---- ctdb-1.0.112-12.orig/config/events.d/41.httpd 2011-07-22 23:59:47.000000000 +0200 -+++ ctdb-1.0.112-12/config/events.d/41.httpd 2011-07-23 00:00:09.000000000 +0200 -@@ -35,7 +35,7 @@ - - ctdb_start_stop_service - --is_ctdb_managed_service || exit 0 -+is_ctdb_managed_service httpd || exit 0 - - case "$1" in - startup) +--- ctdb-1.0.112-12.orig/config/functions 2011-09-20 20:28:12.000000000 +0200 ++++ ctdb-1.0.112-12/config/functions 2011-09-20 20:29:09.000000000 +0200 +@@ -546,6 +546,7 @@ + ctdb_compat_managed_service "$CTDB_MANAGES_SCP" "scp" + ctdb_compat_managed_service "$CTDB_MANAGES_WINDBIND" "windbind" + ctdb_compat_managed_service "$CTDB_MANAGES_HTTPD" "httpd" ++ ctdb_compat_managed_service "$CTDB_MANAGES_HTTPD" "apache2" + ctdb_compat_managed_service "$CTDB_MANAGES_ISCSI" "iscsi" + ctdb_compat_managed_service "$CTDB_MANAGES_CLAMD" "clamd" + ctdb_compat_managed_service "$CTDB_MANAGES_NFS" "nfs" This has been completely tested (aka, not only in sid) and fixes the problem. Can I upload it? -- Mathieu Parent ---------------------------- Thread provided below for reference ---------------------------- 2011/8/8 Mathieu Parent <[email protected]>: > Hi, > > 2011/8/6 Adam D. Barratt <[email protected]>: >> On Wed, 2011-08-03 at 20:30 +0100, Adam D. Barratt wrote: >>> On Tue, 2011-07-26 at 23:55 +0200, Mathieu Parent wrote: >>> > 2011/7/25 Adam D. Barratt <[email protected]>: >>> > > On Sat, 23 Jul 2011 00:45:50 +0200, Mathieu Parent wrote: >>> > >> The upload fix two small but annoying bugs: >>> > >> * Fix ethtool path in /etc/ctdb/events.d/10.interface (Closes: >>> > >> #635135) >>> > >> * Fix httpd (i.e. apache2 service) activation (Closes: #635136) >> [...] >>> > I have attached the diff. >>> >>> Thanks; please go ahead. >> >> For the record, I've just marked the upload for acceptance at the next >> dinstall; thanks. > > Thanks ! -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/cafx5sbwz+x71gw7k3okxwlyahb88ejr5om08w4tqxrfsq-e...@mail.gmail.com
