From: Martin Schwenke <martin@meltin.net>
Date: Thu, 29 Mar 2018 04:11:04 +0000 (+1100)
Subject: ctdb-scripts: Drop CTDB_NOTIFY_SCRIPT configuration option
X-Git-Tag: ldb-1.4.0~490
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5af067866d503e1ea53472507290c905e71791f;p=thirdparty%2Fsamba.git

ctdb-scripts: Drop CTDB_NOTIFY_SCRIPT configuration option

Notification scripts are installed into $CTDB_BASE/notify.d/ and are
always run by notify.sh.  Leave notify.sh where it is for now but no
longer consider it a configuration file.  This is an interim measure
and will be changed again soon.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index 8f3c6cb4d2e..dca90172d26 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -100,7 +100,6 @@ build_ctdb_options ()
     maybe_set "--dbdir-state"            "$CTDB_DBDIR_STATE"
     maybe_set "--transport"              "$CTDB_TRANSPORT"
     maybe_set "-d"                       "$CTDB_DEBUGLEVEL"
-    maybe_set "--notification-script"    "$CTDB_NOTIFY_SCRIPT"
     maybe_set "--start-as-disabled"      "$CTDB_START_AS_DISABLED"    "yes"
     maybe_set "--start-as-stopped "      "$CTDB_START_AS_STOPPED"     "yes"
     maybe_set "--no-recmaster"           "$CTDB_CAPABILITY_RECMASTER" "no"
diff --git a/ctdb/doc/ctdb.7.xml b/ctdb/doc/ctdb.7.xml
index 876d8df3be7..a419438f5ee 100644
--- a/ctdb/doc/ctdb.7.xml
+++ b/ctdb/doc/ctdb.7.xml
@@ -968,16 +968,9 @@ CTDB_NATGW_DEFAULT_GATEWAY=10.0.0.1
     </para>
 
     <para>
-      The default notification script is
-      <filename>/usr/local/etc/ctdb/notify.sh</filename>.  It executes
-      files in <filename>/usr/local/etc/ctdb/notify.d/</filename>,
-      which must be executable.
-    </para>
-
-    <para>
-      This notification script can be changed via the
-      <varname>CTDB_NOTIFY_SCRIPT</varname> configuration variable.
-      The specified script must be executable.
+      The notification mechanism runs all executable files in
+      <filename>/usr/local/etc/ctdb/notify.d/</filename>, ignoring any
+      failures and continuing to run all files.
     </para>
 
     <para>
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index f36495e34c2..c66d1aec542 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -345,17 +345,6 @@
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>CTDB_NOTIFY_SCRIPT=<parameter>FILENAME</parameter></term>
-	<listitem>
-	  <para>
-	    Default is
-	    <filename>/usr/local/etc/ctdb/notify.sh</filename>.  Corresponds to
-	    <option>--notification-script</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>CTDB_MAX_PERSISTENT_CHECK_ERRORS=<parameter>NUM</parameter></term>
 	<listitem>
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 80247fc2315..74119d5e5b3 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -133,6 +133,8 @@ mkdir -p $RPM_BUILD_ROOT%{initdir}
 install -m755 config/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
 %endif
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/notify.d
+
 # This is a hack. All documents should be installed in /usr/share/doc.
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/README
 cp config/events.d/README README.eventscripts
@@ -156,7 +158,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %config(noreplace) %{_sysconfdir}/ctdb/ctdbd.conf
 %config(noreplace) %{_sysconfdir}/ctdb/ctdb.tunables
-%config(noreplace) %{_sysconfdir}/ctdb/notify.sh
+%{_sysconfdir}/ctdb/notify.sh
+%dir %{_sysconfdir}/ctdb/notify.d
 %config(noreplace) %{_sysconfdir}/ctdb/debug-hung-script.sh
 %config(noreplace) %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
 %config(noreplace) %{_sysconfdir}/ctdb/debug_locks.sh