mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scylla-housekeeping: rename configuration file from conf to cfg

Browse Source 
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 <amnon@scylladb.com>
Message-Id: <1470896759-22651-2-git-send-email-amnon@scylladb.com>
(cherry picked from commit 5a4fc9c503)
This commit is contained in:
Amnon Heiman
2016-08-11 09:25:59 +03:00
committed by Avi Kivity
parent 66292c0ef0
commit 75c53e4f24
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
conf/housekeeping.conf → conf/housekeeping.cfg
View File

10
dist/common/scripts/scylla_setup vendored
View File

@@ -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

2
dist/common/systemd/scylla-housekeeping.service.in vendored
View File

@@ -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

2
dist/redhat/scylla.spec.in vendored
View File

@@ -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/