diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd index e6d58c8ec57..ab23a802309 100755 --- a/ctdb/config/events.d/40.vsftpd +++ b/ctdb/config/events.d/40.vsftpd @@ -15,6 +15,11 @@ service_stop () service $service_name stop } +service_reconfigure () +{ + service $service_name restart +} + service_fail_limit=2 service_tcp_ports=21 diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events.d/41.httpd index 6ae5d61b30d..4fb6aa06101 100755 --- a/ctdb/config/events.d/41.httpd +++ b/ctdb/config/events.d/41.httpd @@ -38,6 +38,11 @@ service_stop () killall -q -9 $service_name || true } +service_reconfigure () +{ + service $service_name restart +} + loadconfig ctdb_start_stop_service diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind index b67951ba152..cd360a9c101 100755 --- a/ctdb/config/events.d/49.winbind +++ b/ctdb/config/events.d/49.winbind @@ -31,12 +31,6 @@ service_stop () service "$CTDB_SERVICE_WINBIND" stop } -service_reconfigure () -{ - # winbind automatically reloads config - no restart needed. - : -} - ########################### ctdb_start_stop_service diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba index a4d50fe35eb..3a43bbe471e 100755 --- a/ctdb/config/events.d/50.samba +++ b/ctdb/config/events.d/50.samba @@ -65,12 +65,6 @@ service_stop () fi } -service_reconfigure () -{ - # Samba automatically reloads config - no restart needed. - : -} - # set default samba cleanup period - in minutes [ -z "$SAMBA_CLEANUP_PERIOD" ] && { SAMBA_CLEANUP_PERIOD=10 diff --git a/ctdb/config/functions b/ctdb/config/functions index 078b50bb8b4..330d0579854 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -1125,10 +1125,10 @@ ctdb_service_reconfigure () ctdb_counter_init "$@" } -# Default service_reconfigure() function. +# Default service_reconfigure() function does nothing. service_reconfigure () { - service "${1:-$service_name}" restart + : } ctdb_reconfigure_try_lock ()