summaryrefslogtreecommitdiff
path: root/ctdb/packaging
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2018-04-24 16:35:16 +1000
committerAmitay Isaacs <amitay@samba.org>2018-05-12 06:11:17 +0200
commit7e31a1382fd5eb45448042960e90885462b1452a (patch)
treee44803aa61dddb1d1728cbef70b6f531449579c5 /ctdb/packaging
parent74230c59b6a8add7310c4ec39ef315cc67156b5a (diff)
downloadsamba-7e31a1382fd5eb45448042960e90885462b1452a.tar.gz
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>
Diffstat (limited to 'ctdb/packaging')
-rw-r--r--ctdb/packaging/RPM/ctdb.spec.in8
1 files changed, 1 insertions, 7 deletions
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}