From 75c53e4f24d7f4f9210babd1bb868b825252c14c Mon Sep 17 00:00:00 2001 From: Amnon Heiman Date: Thu, 11 Aug 2016 09:25:59 +0300 Subject: [PATCH] scylla-housekeeping: rename configuration file from conf to cfg Files with a conf extension are run by the scylla_prepare on the AMI. The scylla-housekeeping configuration file is not a bash script and should not be run. This patch changes its extension to cfg which is more python like. Signed-off-by: Amnon Heiman Message-Id: <1470896759-22651-2-git-send-email-amnon@scylladb.com> (cherry picked from commit 5a4fc9c503b63266d1c0ce930fe22d149b39441a) --- conf/{housekeeping.conf => housekeeping.cfg} | 0 dist/common/scripts/scylla_setup | 10 +++++----- dist/common/systemd/scylla-housekeeping.service.in | 2 +- dist/redhat/scylla.spec.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename conf/{housekeeping.conf => housekeeping.cfg} (100%) diff --git a/conf/housekeeping.conf b/conf/housekeeping.cfg similarity index 100% rename from conf/housekeeping.conf rename to conf/housekeeping.cfg diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup index 972c210930..e044a94ea7 100755 --- a/dist/common/scripts/scylla_setup +++ b/dist/common/scripts/scylla_setup @@ -205,7 +205,7 @@ fi if [ $INTERACTIVE -eq 1 ]; then interactive_ask_service "Do you want to enable ScyllaDB services?" "Answer yes to automatically start Scylla when the node boots; answer no to skip this step." "yes" &&: ENABLE_SERVICE=$? - if [ $ENABLE_SERVICE -eq 1 ] && [ ! -f /etc/scylla.d/housekeeping.conf ]; then + if [ $ENABLE_SERVICE -eq 1 ] && [ ! -f /etc/scylla.d/housekeeping.cfg ]; then interactive_ask_service "Do you want to enable ScyllaDB version check?" "Answer yes to automatically start Scylla-housekeeping that check for newer version, when the node boots; answer no to skip this step." "yes" &&: ENABLE_CHECK_VERSION=$? fi @@ -223,12 +223,12 @@ if [ $ENABLE_SERVICE -eq 1 ]; then fi fi if [ $ENABLE_CHECK_VERSION -eq 1 ]; then - if [ ! -f /etc/scylla.d/housekeeping.conf ]; then - printf "[housekeeping]\ncheck-version: True\n" > /etc/scylla.d/housekeeping.conf + if [ ! -f /etc/scylla.d/housekeeping.cfg ]; then + printf "[housekeeping]\ncheck-version: True\n" > /etc/scylla.d/housekeeping.cfg fi else - if [ ! -f /etc/scylla.d/housekeeping.conf ]; then - printf "[housekeeping]\ncheck-version: False\n" > /etc/scylla.d/housekeeping.conf + if [ ! -f /etc/scylla.d/housekeeping.cfg ]; then + printf "[housekeeping]\ncheck-version: False\n" > /etc/scylla.d/housekeeping.cfg fi fi fi diff --git a/dist/common/systemd/scylla-housekeeping.service.in b/dist/common/systemd/scylla-housekeeping.service.in index bc24c053a2..eb552d125a 100644 --- a/dist/common/systemd/scylla-housekeeping.service.in +++ b/dist/common/systemd/scylla-housekeeping.service.in @@ -5,7 +5,7 @@ Description=Scylla Housekeeping Type=simple User=scylla Group=scylla -ExecStart=/usr/lib/scylla/scylla-housekeeping -q -c /etc/scylla.d/housekeeping.conf version +ExecStart=/usr/lib/scylla/scylla-housekeeping -q -c /etc/scylla.d/housekeeping.cfg version [Install] WantedBy=multi-user.target diff --git a/dist/redhat/scylla.spec.in b/dist/redhat/scylla.spec.in index 69d69d5100..96d5135b16 100644 --- a/dist/redhat/scylla.spec.in +++ b/dist/redhat/scylla.spec.in @@ -86,7 +86,7 @@ install -m755 build/release/iotune $RPM_BUILD_ROOT%{_bindir} install -m755 dist/common/bin/scyllatop $RPM_BUILD_ROOT%{_bindir} install -m755 scylla-housekeeping $RPM_BUILD_ROOT%{_prefix}/lib/scylla/ if @@HOUSEKEEPING_CONF@@; then - install -m644 conf/housekeeping.conf $RPM_BUILD_ROOT%{_sysconfdir}/scylla/ + install -m644 conf/housekeeping.cfg $RPM_BUILD_ROOT%{_sysconfdir}/scylla/ fi install -d -m755 $RPM_BUILD_ROOT%{_docdir}/scylla install -m644 README.md $RPM_BUILD_ROOT%{_docdir}/scylla/