diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-03-22 15:33:58 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-03-28 02:57:15 +0200 |
| commit | 2f33b18d844802e228843af3f225dbbe13af333e (patch) | |
| tree | 57980fa84f6b5d8e0792234e447c5642e0a7f8b6 /ctdb/config | |
| parent | d955ab2239dbeab649e69520e36109ca2c49ab89 (diff) | |
| download | samba-2f33b18d844802e228843af3f225dbbe13af333e.tar.gz | |
ctdb-script: Drop CTDB_MANAGED_SERVICES configuration option
This seems never to have caught on so reduce complexity.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/config')
| -rwxr-xr-x | ctdb/config/events.d/06.nfs | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/31.clamd | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/40.vsftpd | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/41.httpd | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/49.winbind | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/50.samba | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/60.nfs | 2 | ||||
| -rwxr-xr-x | ctdb/config/events.d/70.iscsi | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/ctdb/config/events.d/06.nfs b/ctdb/config/events.d/06.nfs index 833ae39a094..81915aba940 100755 --- a/ctdb/config/events.d/06.nfs +++ b/ctdb/config/events.d/06.nfs @@ -28,7 +28,7 @@ nfs_callout_pre () # shellcheck disable=SC2154 nfs_callout_init "$script_state_dir" -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0 case "$1" in takeip) diff --git a/ctdb/config/events.d/31.clamd b/ctdb/config/events.d/31.clamd index 1b7636541ae..86d12a70134 100755 --- a/ctdb/config/events.d/31.clamd +++ b/ctdb/config/events.d/31.clamd @@ -25,7 +25,7 @@ esac loadconfig -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_CLAMD" = "yes" ] || exit 0 case "$1" in startup) diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd index 95de406e003..977bbc754ee 100755 --- a/ctdb/config/events.d/40.vsftpd +++ b/ctdb/config/events.d/40.vsftpd @@ -17,7 +17,7 @@ loadconfig ctdb_setup_state_dir "service" "$service_name" -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_VSFTPD" = "yes" ] || exit 0 case "$1" in startup) diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events.d/41.httpd index adba3972134..66f3ec53f74 100755 --- a/ctdb/config/events.d/41.httpd +++ b/ctdb/config/events.d/41.httpd @@ -49,7 +49,7 @@ service_stop () loadconfig -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_HTTPD" = "yes" ] || exit 0 case "$1" in startup) diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind index 5e937378295..d5f036da9ee 100755 --- a/ctdb/config/events.d/49.winbind +++ b/ctdb/config/events.d/49.winbind @@ -34,7 +34,7 @@ service_stop () ########################### -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_WINBIND" = "yes" ] || exit 0 ########################### diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba index ca987be3393..286354fa7b8 100755 --- a/ctdb/config/events.d/50.samba +++ b/ctdb/config/events.d/50.samba @@ -149,7 +149,7 @@ list_samba_ports () ########################### -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_SAMBA" = "yes" ] || exit 0 ########################### diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs index f630a3d861e..ee048e21975 100755 --- a/ctdb/config/events.d/60.nfs +++ b/ctdb/config/events.d/60.nfs @@ -251,7 +251,7 @@ nfs_update_lock_info () # shellcheck disable=SC2154 nfs_callout_init "$script_state_dir" -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0 case "$1" in startup) diff --git a/ctdb/config/events.d/70.iscsi b/ctdb/config/events.d/70.iscsi index 8851c594467..8048be0d1ba 100755 --- a/ctdb/config/events.d/70.iscsi +++ b/ctdb/config/events.d/70.iscsi @@ -13,7 +13,7 @@ service_name="iscsi" loadconfig -is_ctdb_managed_service || exit 0 +[ "$CTDB_MANAGES_ISCSI" = "yes" ] || exit 0 [ -z "$CTDB_START_ISCSI_SCRIPTS" ] && { echo "No iscsi start script directory found" |