sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

ctdb-scripts: Drop event script CTDB_MANAGED_<service> variables

Browse Source 
Enable required event scripts to manage services.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-07-07 20:06:47 +10:00 committed by Amitay Isaacs
parent c08c95c9e5
commit e081cafc9c
11 changed files with 4 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/config/events/README
View File

@ -68,8 +68,7 @@ startup
If the "startup" event fails then CTDB will retry it until it If the "startup" event fails then CTDB will retry it until it
succeeds. There is no limit on the number of retries. succeeds. There is no limit on the number of retries.
Example: 50.samba uses this event to start the Samba daemon if Example: 50.samba uses this event to start the Samba daemon.
CTDB_MANAGES_SAMBA=yes.
shutdown shutdown
@ -80,7 +79,7 @@ shutdown
event and use it to stop the service. event and use it to stop the service.
Example: 50.samba uses this event to shut down the Samba Example: 50.samba uses this event to shut down the Samba
daemon if CTDB_MANAGES_SAMBA=yes. daemon.
monitor monitor

2
ctdb/config/events/legacy/06.nfs.script
View File

@ -28,8 +28,6 @@ nfs_callout_pre ()
# shellcheck disable=SC2154 # shellcheck disable=SC2154
nfs_callout_init "$script_state_dir" nfs_callout_init "$script_state_dir"
[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
case "$1" in case "$1" in
takeip) takeip)
nfs_callout_pre "$@" nfs_callout_pre "$@"

2
ctdb/config/events/legacy/31.clamd.script
View File

@ -19,8 +19,6 @@ esac
load_script_options load_script_options
[ "$CTDB_MANAGES_CLAMD" = "yes" ] || exit 0
case "$1" in case "$1" in
startup) startup)
service "$service_name" stop > /dev/null 2>&1 service "$service_name" stop > /dev/null 2>&1

2
ctdb/config/events/legacy/40.vsftpd.script
View File

@ -17,8 +17,6 @@ load_script_options
ctdb_setup_state_dir "service" "$service_name" ctdb_setup_state_dir "service" "$service_name"
[ "$CTDB_MANAGES_VSFTPD" = "yes" ] || exit 0
case "$1" in case "$1" in
startup) startup)
service "$service_name" stop > /dev/null 2>&1 service "$service_name" stop > /dev/null 2>&1

2
ctdb/config/events/legacy/41.httpd.script
View File

@ -43,8 +43,6 @@ service_stop ()
killall -q -9 $service_name || true killall -q -9 $service_name || true
} }
[ "$CTDB_MANAGES_HTTPD" = "yes" ] || exit 0
case "$1" in case "$1" in
startup) startup)
service_start service_start

4
ctdb/config/events/legacy/49.winbind.script
View File

@ -34,10 +34,6 @@ service_stop ()
########################### ###########################
[ "$CTDB_MANAGES_WINBIND" = "yes" ] || exit 0
###########################
case "$1" in case "$1" in
startup) startup)
service_start service_start

4
ctdb/config/events/legacy/50.samba.script
View File

@ -147,10 +147,6 @@ list_samba_ports ()
########################### ###########################
[ "$CTDB_MANAGES_SAMBA" = "yes" ] || exit 0
###########################
case "$1" in case "$1" in
startup) startup)
service_start service_start

2
ctdb/config/events/legacy/60.nfs.script
View File

@ -253,8 +253,6 @@ nfs_update_lock_info ()
# shellcheck disable=SC2154 # shellcheck disable=SC2154
nfs_callout_init "$script_state_dir" nfs_callout_init "$script_state_dir"
[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
case "$1" in case "$1" in
startup) startup)
nfs_callout "$@" || exit $? nfs_callout "$@" || exit $?

2
ctdb/config/events/legacy/70.iscsi.script
View File

@ -13,8 +13,6 @@ service_name="iscsi"
load_script_options load_script_options
[ "$CTDB_MANAGES_ISCSI" = "yes" ] || exit 0
[ -z "$CTDB_START_ISCSI_SCRIPTS" ] && { [ -z "$CTDB_START_ISCSI_SCRIPTS" ] && {
echo "No iscsi start script directory found" echo "No iscsi start script directory found"
exit 0 exit 0

10
ctdb/config/script.options
View File

@ -1,22 +1,16 @@
# For now, use script.options to demonstrate these options. The # For now, use script.options to demonstrate these options. See
# CTDB_MANAGES_* variables will go away soon. See other *.options # *.options examples for more specific examples.
# examples for more specific examples.
# #
# Samba configuration # Samba configuration
# #
# 50.samba.options # 50.samba.options
CTDB_MANAGES_SAMBA=yes
# CTDB_SAMBA_SKIP_SHARE_CHECK=yes # CTDB_SAMBA_SKIP_SHARE_CHECK=yes
# 49.winbind.options
CTDB_MANAGES_WINBIND=yes
# #
# NFS configuration # NFS configuration
# #
# 60.nfs.options # 60.nfs.options
CTDB_MANAGES_NFS=yes
CTDB_RPCINFO_LOCALHOST="127.0.0.1" CTDB_RPCINFO_LOCALHOST="127.0.0.1"

116
ctdb/doc/ctdb-script.options.5.xml
View File

@ -563,20 +563,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
<variablelist> <variablelist>
<varlistentry>
<term>
CTDB_MANAGES_CLAMD=yes|no
</term>
<listitem>
<para>
Should CTDB manage ClamAV?
</para>
<para>
Default is no.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
CTDB_CLAMD_SOCKET=<parameter>FILENAME</parameter> CTDB_CLAMD_SOCKET=<parameter>FILENAME</parameter>
@ -595,52 +581,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
</refsect2> </refsect2>
<refsect2>
<title>40.vsftpd</title>
<para>
Provides CTDB's vsftpd FTP service management.
</para>
<variablelist>
<varlistentry>
<term>CTDB_MANAGES_VSFTPD=yes|no</term>
<listitem>
<para>
Should CTDB manage the vsftpd FTP server?
</para>
<para>
Default is no.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect2>
<refsect2>
<title>41.httpd</title>
<para>
Provides CTDB's Apache web service management.
</para>
<variablelist>
<varlistentry>
<term>
CTDB_MANAGES_HTTPD=yes|no
</term>
<listitem>
<para>
Should CTDB manage the Apache web server?
</para>
<para>
Default is no.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect2>
<refsect2> <refsect2>
<title>49.winbind</title> <title>49.winbind</title>
@ -650,20 +590,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
<variablelist> <variablelist>
<varlistentry>
<term>
CTDB_MANAGES_WINBIND=yes|no
</term>
<listitem>
<para>
Should CTDB manage Winbind?
</para>
<para>
Default is no.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
CTDB_SERVICE_WINBIND=<parameter>SERVICE</parameter> CTDB_SERVICE_WINBIND=<parameter>SERVICE</parameter>
@ -691,20 +617,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
<variablelist> <variablelist>
<varlistentry>
<term>
CTDB_MANAGES_SAMBA=yes|no
</term>
<listitem>
<para>
Should CTDB manage Samba?
</para>
<para>
Default is no.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
CTDB_SAMBA_CHECK_PORTS=<parameter>PORT-LIST</parameter> CTDB_SAMBA_CHECK_PORTS=<parameter>PORT-LIST</parameter>
@ -785,20 +697,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
<variablelist> <variablelist>
<varlistentry>
<term>
CTDB_MANAGES_NFS=yes|no
</term>
<listitem>
<para>
Should CTDB manage NFS?
</para>
<para>
Default is no.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
CTDB_NFS_CALLOUT=<parameter>COMMAND</parameter> CTDB_NFS_CALLOUT=<parameter>COMMAND</parameter>
@ -936,20 +834,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
<variablelist> <variablelist>
<varlistentry>
<term>
CTDB_MANAGES_ISCSI=yes|no
</term>
<listitem>
<para>
Should CTDB manage iSCSI tgtd?
</para>
<para>
Default is no.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
CTDB_START_ISCSI_SCRIPTS=<parameter>DIRECTORY</parameter> CTDB_START_ISCSI_SCRIPTS=<parameter>DIRECTORY</parameter>