From: Amitay Isaacs <amitay@gmail.com>
Date: Tue, 28 Jun 2016 06:11:47 +0000 (+1000)
Subject: ctdb-packaging: Move ctdb configuration to ctdbd.conf
X-Git-Tag: tdb-1.3.10~16
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=3fafe48027d3df9ea1f431142a68936f757b41c4

ctdb-packaging: Move ctdb configuration to ctdbd.conf

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

diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdbd.conf
similarity index 86%
rename from ctdb/config/ctdb.sysconfig
rename to ctdb/config/ctdbd.conf
index 0a3a23eb284..e75c65c7fd7 100644
--- a/ctdb/config/ctdb.sysconfig
+++ b/ctdb/config/ctdbd.conf
@@ -6,13 +6,13 @@
 #
 # Do NOT run CTDB without a recovery lock file unless you know exactly
 # what you are doing.
-CTDB_RECOVERY_LOCK=/some/place/on/shared/storage
+# CTDB_RECOVERY_LOCK=/some/place/on/shared/storage
 
 # List of nodes in the cluster.  Default is below.
 # CTDB_NODES=/etc/ctdb/nodes
 
 # List of public addresses for providing NAS services.  No default.
-CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
+# CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
 
 # What services should CTDB manage?  Default is none.
 # CTDB_MANAGES_SAMBA=yes
@@ -29,4 +29,4 @@ CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
 # CTDB_DEBUGLEVEL=ERR
 
 # Set some CTDB tunable variables during CTDB startup?
-# CTDB_SET_TraverseTimeout=60
+# CTDB_SET_TDBMutexEnabled=1
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index c0051e96321..b439e27e5bf 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -109,12 +109,11 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \
 rm -rf $RPM_BUILD_ROOT
 
 # Create the target build directory hierarchy
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d
 
 DESTDIR=$RPM_BUILD_ROOT ./buildtools/bin/waf install
 
-install -m644 config/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
+install -m644 config/ctdbd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
 
 %if %{with_systemd}
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
@@ -145,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 
-%config(noreplace) %{_sysconfdir}/sysconfig/ctdb
+%config(noreplace) %{_sysconfdir}/ctdb/ctdbd.conf
 %config(noreplace) %{_sysconfdir}/ctdb/notify.sh
 %config(noreplace) %{_sysconfdir}/ctdb/debug-hung-script.sh
 %config(noreplace) %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh