events.d/50.samba: allow CTDB_SERVICE_{SMB,NMB,WINBIND} to be overriden from sysconfig

Michael

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index c9431fffda6fa9d3457b6fbf55cfc967b44e1ff0..80c868dbee73f3f774309972006c0008025f61e3 100644 (file)
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -74,6 +74,13 @@
 # There is no default.
 # CTDB_INIT_STYLE=redhat
 
+# The following are specific Samba init scripts / services that you
+# can override from auto-detection.
+# There are no defaults.
+# CTDB_SERVICE_SMB=smb
+# CTDB_SERVICE_NMB=nmb
+# CTDB_SERVICE_WINBIND=winbind
+
 # you may wish to raise the file descriptor limit for ctdb
 # use a ulimit command here. ctdb needs one file descriptor per
 # connected client (ie. one per connected client in Samba)

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 3e7164abaf3186220a695543792706fef291baf0..e0e2ad7bb5b307d68844d43228b9798980a7b42c 100755 (executable)
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -11,25 +11,25 @@ detect_init_style
 
 case $CTDB_INIT_STYLE in
        suse)
-               CTDB_SERVICE_SMB="smb"
-               CTDB_SERVICE_NMB="nmb"
-               CTDB_SERVICE_WINBIND="winbind"
+               CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
+               CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmb}
+               CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
                ;;
        ubuntu)
-               CTDB_SERVICE_SMB="samba"
-               CTDB_SERVICE_NMB=""
-               CTDB_SERVICE_WINBIND="winbind"
+               CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
+               CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+               CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
                ;;
        redhat)
-               CTDB_SERVICE_SMB="smb"
-               CTDB_SERVICE_NMB=""
-               CTDB_SERVICE_WINBIND="winbind"
+               CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
+               CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+               CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
                ;;
        *)
                # should not happen, but for now use redhat style as default:
-               CTDB_SERVICE_SMB="smb"
-               CTDB_SERVICE_NMB=""
-               CTDB_SERVICE_WINBIND="winbind"
+               CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
+               CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+               CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
                ;;
 esac