From: Martin Schwenke Date: Tue, 24 Apr 2018 06:33:20 +0000 (+1000) Subject: ctdb-config: Add a default script.options file X-Git-Tag: ldb-1.4.0~281 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f63f9053efb73375247de49bd396792936cbf1a2;p=thirdparty%2Fsamba.git ctdb-config: Add a default script.options file Include it in the RPM. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/config/script.options b/ctdb/config/script.options new file mode 100644 index 00000000000..0c280c5b926 --- /dev/null +++ b/ctdb/config/script.options @@ -0,0 +1,22 @@ +# For now, use script.options to demonstrate these options. The +# CTDB_MANAGES_* variables will go away soon. See other *.options +# examples for more specific examples. + +# +# Samba configuration +# + +# 50.samba.options +CTDB_MANAGES_SAMBA=yes +# CTDB_SAMBA_SKIP_SHARE_CHECK=yes + +# 49.winbind.options +CTDB_MANAGES_WINBIND=yes + +# +# NFS configuration +# + +# 60.nfs.options +CTDB_MANAGES_NFS=yes +CTDB_RPCINFO_LOCALHOST="127.0.0.1" diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 95850517579..f2d71333b77 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -115,6 +115,7 @@ DESTDIR=$RPM_BUILD_ROOT ./buildtools/bin/waf install install -m644 config/ctdbd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb install -m644 config/ctdb.tunables $RPM_BUILD_ROOT%{_sysconfdir}/ctdb +install -m644 config/script.options $RPM_BUILD_ROOT%{_sysconfdir}/ctdb # Add a pointer to modern location for configuration file. Allow with # "noreplace" in the files section, this stops RPM moving aside a @@ -158,6 +159,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/ctdb/ctdbd.conf %config(noreplace) %{_sysconfdir}/ctdb/ctdb.tunables +%config(noreplace) %{_sysconfdir}/ctdb/script.options %{_sysconfdir}/ctdb/notify.sh %dir %{_sysconfdir}/ctdb/notify.d %config(noreplace) %{_sysconfdir}/ctdb/debug-hung-script.sh