[QUEUED scylla next] dist/debian: keep sysconfdir.conf for scylla-housekeeping on 'remove'

0 views
Skip to first unread message

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 29, 2021, 5:32:40 AM7/29/21
to scylladb-dev@googlegroups.com, Takuya ASADA
From: Takuya ASADA <sy...@scylladb.com>
Committer: Pekka Enberg <pen...@scylladb.com>
Branch: next

dist/debian: keep sysconfdir.conf for scylla-housekeeping on 'remove'

Same as 4309785, dpkg does not re-install confffiles when it removed by
user, we are missing sysconfdir.conf for scylla-housekeeping on rollback.
To prevent this, we need to stop removing drop-in file directory on
'remove'.

Fixes #9109

Closes #9110

---
diff --git a/dist/debian/debian/scylla-server.postrm b/dist/debian/debian/scylla-server.postrm
--- a/dist/debian/debian/scylla-server.postrm
+++ b/dist/debian/debian/scylla-server.postrm
@@ -4,13 +4,13 @@ set -e

case "$1" in
purge|remove)
- rm -rf /etc/systemd/system/scylla-housekeeping-daily.service.d/
- rm -rf /etc/systemd/system/scylla-housekeeping-restart.service.d/
rm -rf /etc/systemd/system/scylla-helper.slice.d/
# We need to keep dependencies.conf and sysconfdir.conf on 'remove',
# otherwise it will be missing after rollback.
if [ "$1" = "purge" ]; then
rm -rf /etc/systemd/system/scylla-server.service.d/
+ rm -rf /etc/systemd/system/scylla-housekeeping-daily.service.d/
+ rm -rf /etc/systemd/system/scylla-housekeeping-restart.service.d/
fi
;;
esac

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 29, 2021, 1:20:03 PM7/29/21
to scylladb-dev@googlegroups.com, Takuya ASADA
From: Takuya ASADA <sy...@scylladb.com>
Committer: Pekka Enberg <pen...@scylladb.com>
Branch: master
Reply all
Reply to author
Forward
0 new messages