diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 105249dba6..eecbfafa66 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -79,7 +79,7 @@ Added to pants' use of PEX lockfiles. This is not a user-facing addition. #6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253 #6254 #6258 #6259 #6260 #6269 #6275 #6279 #6278 #6282 #6283 #6273 #6287 #6306 #6307 - #6311 + #6311 #6314 Contributed by @cognifloyd * Build of ST2 EL9 packages #6153 Contributed by @amanda11 diff --git a/packaging/deb/scripts/post-install.sh b/packaging/deb/scripts/post-install.sh index 510b49fbfe..fd9007cd8a 100644 --- a/packaging/deb/scripts/post-install.sh +++ b/packaging/deb/scripts/post-install.sh @@ -17,43 +17,8 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -ST2_USER=st2 -PACKS_GROUP=st2packs -ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package" -upgrading=0 - -## Permissions of files which should be set on install -SET_PERMS=$(cat </dev/null 2>&1 || true ;; diff --git a/packaging/deb/scripts/post-remove.sh b/packaging/deb/scripts/post-remove.sh index d966dc55cf..9cfe930fb7 100644 --- a/packaging/deb/scripts/post-remove.sh +++ b/packaging/deb/scripts/post-remove.sh @@ -18,11 +18,8 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -## Save st2 logrotate config on remove, but wipe it out on purge. -preserve_logrotate() { - if [ "$1" = remove ]; then - [ -f /etc/logrotate.d/st2 ] && mv /etc/logrotate.d/st2-pkgsaved.disabled 1>/dev/null 2>&1 || : - elif [ "$1" = purge ]; then +purge_files() { + # This -pkgsaved.disabled file might be left over from old (buggy) deb packages rm -f /etc/logrotate.d/st2-pkgsaved.disabled 1>/dev/null 2>&1 || : # Clean up other StackStorm related configs and directories rm -rf /etc/st2 1>/dev/null 2>&1 || : @@ -30,14 +27,13 @@ preserve_logrotate() { rm -rf /root/.st2 1>/dev/null 2>&1 || : rm -rf /var/log/st2 1>/dev/null 2>&1 || : rm -f /etc/sudoers.d/st2 1>/dev/null 2>&1 || : - fi } case "$1" in - remove|purge) - preserve_logrotate "$1" + purge) + purge_files ;; - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 diff --git a/packaging/deb/scripts/pre-install.sh b/packaging/deb/scripts/pre-install.sh index daf0adc88d..5d327b21ae 100644 --- a/packaging/deb/scripts/pre-install.sh +++ b/packaging/deb/scripts/pre-install.sh @@ -16,19 +16,6 @@ set -e PACKS_GROUP=st2packs SYS_USER=stanley ST2_USER=st2 -ST2_CONFPATH="/etc/st2/st2.conf" -ST2_UPGRADESTAMP="/tmp/.stamp-stackstorm-st2-deb-package" - -## Permissions of directories which has to be reset on upgrade -RESET_PERMS=$(cat < 1) -if [ "$1" -gt 1 ]; then - set_permissions "$RESET_PERMS" -fi