From 7e31a1382fd5eb45448042960e90885462b1452a Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Tue, 24 Apr 2018 16:35:16 +1000
Subject: [PATCH] ctdb-config: Add default ctdb.sysconfig file, update
 ctdb.service

Install ctdb.sysconfig in RPM.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/config/ctdb.service        |  1 +
 ctdb/config/ctdb.sysconfig      | 14 ++++++++++++++
 ctdb/packaging/RPM/ctdb.spec.in |  8 +-------
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 ctdb/config/ctdb.sysconfig

diff --git a/ctdb/config/ctdb.service b/ctdb/config/ctdb.service
index 627803c51ac..675b3147417 100644
--- a/ctdb/config/ctdb.service
+++ b/ctdb/config/ctdb.service
@@ -6,6 +6,7 @@ After=network-online.target time-sync.target
 [Service]
 Type=forking
 LimitCORE=infinity
+LimitNOFILE=1048576
 PIDFile=/run/ctdb/ctdbd.pid
 ExecStart=/usr/sbin/ctdbd_wrapper start
 ExecStop=/usr/sbin/ctdbd_wrapper stop
diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
new file mode 100644
index 00000000000..2ec0e9d373e
--- /dev/null
+++ b/ctdb/config/ctdb.sysconfig
@@ -0,0 +1,14 @@
+# If using SYSV init, install this as /etc/sysconfig/ctdb,
+# /etc/default/ctdb or similar
+
+# Allow 1M open files
+ulimit -n 1048576
+
+# Allow core files to be created
+ulimit -c unlimited
+
+# Useful if default detection doesn't work
+# CTDB_INIT_STYLE=debian
+
+# If ctdbd takes a long time to start
+# CTDB_STARTUP_TIMEOUT=20
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index c277c4a597b..4a129ce1d48 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -117,14 +117,8 @@ 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
-# working configuration.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-cat >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb <<EOF
-# CTDB configuration is now in %{_sysconfdir}/ctdb/ctdbd.conf
-EOF
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
+install -m644 config/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
 
 %if %{with_systemd}
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-- 
2.34.1