summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2010-11-18 11:04:52 +1100
committerMartin Schwenke <martin@meltin.net>2011-08-11 10:46:20 +1000
commit45bcf843ecf56269d3cc97b8f876c5fc09d4a87c (patch)
tree7e52bb93dcbbf0277a12360cb48cc9bc9794a20a
parent21226ee73808e7fe0d8253a9d906e44e2f47caf9 (diff)
downloadsamba-45bcf843ecf56269d3cc97b8f876c5fc09d4a87c.tar.gz
samba-45bcf843ecf56269d3cc97b8f876c5fc09d4a87c.tar.xz
samba-45bcf843ecf56269d3cc97b8f876c5fc09d4a87c.zip
50.samba eventscript should stop/start services when they become (un)managed.
When the value of $CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND (or corresponding changes are made to $CTDB_MANAGED_VERSIONS), the associated service should be started or stopped as necessary. This add calls to ctdb_start_stop_service() to manage starting/stopping samba and winbind. An associated cleanup is made to the initial checks that one of $CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND is set, replacing them with calls to is_ctdb_managed_service(). To handle the winbind cases ctdb_start_stop_service() and is_ctdb_managed_service() are updated to take an optional service name parameter. Signed-off-by: Martin Schwenke <martin@meltin.net> Conflicts: config/events.d/50.samba Most of this merged elsewhere. This just removes a check that this is the monitor event. Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit 257a2e350280c0b76ed2fac588cad167381fda52)
-rwxr-xr-xctdb/config/events.d/50.samba2
1 files changed, 0 insertions, 2 deletions
diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index 3e90742724..76bb443bda 100755
--- a/ctdb/config/events.d/50.samba
+++ b/ctdb/config/events.d/50.samba
@@ -217,10 +217,8 @@ periodic_cleanup() {
###########################
-[ "$1" = "monitor" ] && {
ctdb_start_stop_service
ctdb_start_stop_service "winbind"
-}
is_ctdb_managed_service || is_ctdb_managed_service "winbind" || exit 0