[Pkg-samba-maint] r3891 - in branches/ctdb/squeeze/debian: . patches
sathieu at alioth.debian.org
sathieu at alioth.debian.org
Wed Sep 21 07:06:30 UTC 2011
Author: sathieu
Date: 2011-09-21 07:06:29 +0000 (Wed, 21 Sep 2011)
New Revision: 3891
Modified:
branches/ctdb/squeeze/debian/changelog
branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff
Log:
Another way to fix httpd
Same as in sid
Modified: branches/ctdb/squeeze/debian/changelog
===================================================================
--- branches/ctdb/squeeze/debian/changelog 2011-09-20 20:08:48 UTC (rev 3890)
+++ branches/ctdb/squeeze/debian/changelog 2011-09-21 07:06:29 UTC (rev 3891)
@@ -4,7 +4,7 @@
(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
+ -- Mathieu Parent <sathieu at debian.org> Wed, 21 Sep 2011 09:02:21 +0200
ctdb (1.0.112-12-2) stable; urgency=low
Modified: branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff
===================================================================
--- branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff 2011-09-20 20:08:48 UTC (rev 3890)
+++ branches/ctdb/squeeze/debian/patches/92-apache-service-enable.diff 2011-09-21 07:06:29 UTC (rev 3891)
@@ -8,13 +8,38 @@
Index: ctdb-1.0.112-12/config/functions
===================================================================
---- 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-1.0.112-12.orig/config/functions 2011-09-21 08:56:39.000000000 +0200
++++ ctdb-1.0.112-12/config/functions 2011-09-21 09:00:04.000000000 +0200
+@@ -539,6 +539,8 @@
+
+ is_ctdb_managed_service ()
+ {
++ _service_name="${1:-${service_name}}"
++
+ t=" $CTDB_MANAGED_SERVICES "
+
+ ctdb_compat_managed_service "$CTDB_MANAGES_VSFTPD" "vsftpd"
+@@ -550,8 +552,8 @@
ctdb_compat_managed_service "$CTDB_MANAGES_CLAMD" "clamd"
ctdb_compat_managed_service "$CTDB_MANAGES_NFS" "nfs"
+
+- # Returns 0 if "<space>$service_name<space>" appears in $t
+- [ "${t#* ${service_name} }" != "${t}" ]
++ # Returns 0 if "<space>$_service_name<space>" appears in $t
++ [ "${t#* ${_service_name} }" != "${t}" ]
+ }
+
+ ctdb_start_stop_service ()
+Index: ctdb-1.0.112-12/config/events.d/41.httpd
+===================================================================
+--- ctdb-1.0.112-12.orig/config/events.d/41.httpd 2011-09-21 08:56:54.000000000 +0200
++++ ctdb-1.0.112-12/config/events.d/41.httpd 2011-09-21 08:57:24.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)
More information about the Pkg-samba-maint
mailing list