diff options
author | Martin Schwenke <martin@meltin.net> | 2018-03-29 15:11:04 +1100 |
---|---|---|
committer | Martin Schwenke <martins@samba.org> | 2018-05-01 13:31:18 +0200 |
commit | e5af067866d503e1ea53472507290c905e71791f (patch) | |
tree | 534c5c5ab0757a808ce06726d4655ea1c48fbd2e /ctdb/doc | |
parent | 7e9dd3fd3c30962c1e47fc5514cdd88c8cbc96b7 (diff) | |
download | samba-e5af067866d503e1ea53472507290c905e71791f.tar.gz |
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>
Diffstat (limited to 'ctdb/doc')
-rw-r--r-- | ctdb/doc/ctdb.7.xml | 13 | ||||
-rw-r--r-- | ctdb/doc/ctdbd.conf.5.xml | 11 |
2 files changed, 3 insertions, 21 deletions
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 @@ -346,17 +346,6 @@ </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> <para> |