From 034b0f50dbcd2eff147269eaef6a4964dc9e5dad Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 21 Sep 2018 12:16:05 +0900 Subject: [PATCH] dist/redhat: specify correct repo file path on scylla-housekeeping services Currently, both scylla-housekeeping-daily/-restart services mistakenly specify repo file path as "@@REPOFILES@@", witch is copied from .in template, need to be replace with actual path. Fixes #3776 Signed-off-by: Takuya ASADA Message-Id: <20180921031605.9330-1-syuu@scylladb.com> (cherry picked from commit 21a12aa458db82a20857ae1273017b4df65a524d) --- dist/common/systemd/scylla-housekeeping-daily.service.mustache | 2 +- .../common/systemd/scylla-housekeeping-restart.service.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/common/systemd/scylla-housekeeping-daily.service.mustache b/dist/common/systemd/scylla-housekeeping-daily.service.mustache index a7e82b923e..6f07255b8a 100644 --- a/dist/common/systemd/scylla-housekeeping-daily.service.mustache +++ b/dist/common/systemd/scylla-housekeeping-daily.service.mustache @@ -10,7 +10,7 @@ Group=scylla ExecStart=/usr/lib/scylla/scylla-housekeeping --uuid-file /var/lib/scylla-housekeeping/housekeeping.uuid -q -c /etc/scylla.d/housekeeping.cfg --repo-files '/etc/apt/sources.list.d/scylla*.list' version --mode d {{/debian}} {{#redhat}} -ExecStart=/usr/lib/scylla/scylla-housekeeping --uuid-file /var/lib/scylla-housekeeping/housekeeping.uuid -q -c /etc/scylla.d/housekeeping.cfg --repo-files @@REPOFILES@@ version --mode d +ExecStart=/usr/lib/scylla/scylla-housekeeping --uuid-file /var/lib/scylla-housekeeping/housekeeping.uuid -q -c /etc/scylla.d/housekeeping.cfg --repo-files '/etc/yum.repos.d/scylla*.repo' version --mode d {{/redhat}} [Install] diff --git a/dist/common/systemd/scylla-housekeeping-restart.service.mustache b/dist/common/systemd/scylla-housekeeping-restart.service.mustache index 155b58b7e9..ff5054951d 100644 --- a/dist/common/systemd/scylla-housekeeping-restart.service.mustache +++ b/dist/common/systemd/scylla-housekeeping-restart.service.mustache @@ -6,7 +6,7 @@ After=network.target Type=simple User=scylla Group=scylla -ExecStart=/usr/lib/scylla/scylla-housekeeping --uuid-file /var/lib/scylla-housekeeping/housekeeping.uuid -q -c /etc/scylla.d/housekeeping.cfg --repo-files @@REPOFILES@@ version --mode r +ExecStart=/usr/lib/scylla/scylla-housekeeping --uuid-file /var/lib/scylla-housekeeping/housekeeping.uuid -q -c /etc/scylla.d/housekeeping.cfg --repo-files '/etc/yum.repos.d/scylla*.repo' version --mode r [Install] WantedBy=multi-user.target