From 3a9a92a112dfaae43435ddc4d2cd0cab40b8a458 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Wed, 28 May 2025 18:04:21 +0100 Subject: [PATCH 1/2] Fix purging of dirs and files --- scripts/packages/postremove.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/packages/postremove.sh b/scripts/packages/postremove.sh index 39409e45f..812844f92 100755 --- a/scripts/packages/postremove.sh +++ b/scripts/packages/postremove.sh @@ -22,6 +22,15 @@ systemd_daemon_reload() { cleanup() { echo "Removing /var/run/nginx-agent directory" rm -rf "/var/run/nginx-agent" + + echo "Removing /etc/nginx-agent directory" + rm -rf "/etc/nginx-agent" + + echo "Removing /var/log/nginx-agent directory" + rm -rf "/var/log/nginx-agent" + + echo "Removing /var/lib/nginx-agent directory" + rm -rf "/var/lib/nginx-agent" } case "$ID" in From 5ff4d64c8a98d5205db2e27dd23e26b0ff1a07af Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Thu, 29 May 2025 09:20:40 +0100 Subject: [PATCH 2/2] address feedback on postremove.sh --- scripts/packages/postremove.sh | 35 ++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/scripts/packages/postremove.sh b/scripts/packages/postremove.sh index 812844f92..14f93b8d2 100755 --- a/scripts/packages/postremove.sh +++ b/scripts/packages/postremove.sh @@ -22,41 +22,48 @@ systemd_daemon_reload() { cleanup() { echo "Removing /var/run/nginx-agent directory" rm -rf "/var/run/nginx-agent" +} - echo "Removing /etc/nginx-agent directory" +full_cleanup() { + echo "Purging all nginx-agent data" + cleanup rm -rf "/etc/nginx-agent" - - echo "Removing /var/log/nginx-agent directory" rm -rf "/var/log/nginx-agent" - - echo "Removing /var/lib/nginx-agent directory" rm -rf "/var/lib/nginx-agent" } case "$ID" in debian|ubuntu) - if [ "$1" = "remove" ]; then - stop_agent_systemd - disable_agent_systemd - systemd_daemon_reload - cleanup - fi + case "$1" in + remove) + stop_agent_systemd + disable_agent_systemd + systemd_daemon_reload + cleanup + ;; + purge) + stop_agent_systemd + disable_agent_systemd + systemd_daemon_reload + full_cleanup + ;; + esac ;; rhel|fedora|centos|amzn|almalinux|rocky) if [ "$1" = "0" ]; then stop_agent_systemd disable_agent_systemd systemd_daemon_reload - cleanup + full_cleanup fi ;; alpine) - cleanup + full_cleanup ;; *) stop_agent_systemd disable_agent_systemd systemd_daemon_reload - cleanup + full_cleanup ;; esac