[Pkg-samba-maint] r3890 - in branches/ctdb/squeeze/debian: . patches

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-09-20 20:08:48 +0000 (Tue, 20 Sep 2011)
New Revision: 3890

Modified:
   branches/ctdb/squeeze/debian/changelog
   branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff
Log:
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).

Modified: branches/ctdb/squeeze/debian/changelog
===================================================================
--- branches/ctdb/squeeze/debian/changelog	2011-08-18 04:34:17 UTC (rev 3889)
+++ branches/ctdb/squeeze/debian/changelog	2011-09-20 20:08:48 UTC (rev 3890)
@@ -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 <sathieu at debian.org>  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)

Modified: branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff
===================================================================
--- branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff	2011-08-18 04:34:17 UTC (rev 3889)
+++ branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff	2011-09-20 20:08:48 UTC (rev 3890)
@@ -4,18 +4,17 @@
 
 Author: Mathieu Parent <math.parent at gmail.com>
 
-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"