Fixes #23146: Actually allow uninstalling the agent

Normation · Jul 27, 2023 · e210eab · e210eab
1 parent b27e26e
commit e210eab
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -541,9 +541,9 @@ if [ $1 -eq 0 ]; then
   rm -f /etc/cron.d/rudder-agent
 
   # Make sure that Rudder agent specific files have been removed
-  rm -f /etc/init.d/rudder
   rm -f /etc/init.d/rudder-agent
   rm -f /etc/default/rudder-agent
+
 %else
   # Remove the cron entry we created
   sed '/# RUDDER CRON$/d' /var/spool/cron/crontabs/root > /tmp/rudder-installer-cron
@@ -558,9 +558,14 @@ if [ $1 -eq 0 ]; then
   rmitab rudder-agent
 %endif
 
-  # Remove UUID in any case
+  rm -fr /opt/rudder/var/fusioninventory
   rm -f /opt/rudder/etc/uuid.hive
-  rm -f %{ruddervardir}/cfengine-community/policy_server.dat
+  rm -f /opt/rudder/etc/ssl/agent.cert
+  rm -f /opt/rudder/etc/policy_server.dat
+  rm -f /var/rudder/lib/ssl/policy_server_hash
+  rm -fr /var/rudder/ncf
+  rm -fr /var/rudder/tmp
+  rm -fr /var/rudder/cfengine-community
 fi
 
 #=================================================

diff --git a/rudder-agent/debian/postrm b/rudder-agent/debian/postrm
@@ -21,13 +21,6 @@ set -e
 
 case "$1" in
   purge|remove)
-    # Make sure that CFEngine is not running anymore
-    for component in cf-agent cf-serverd cf-execd cf-monitord; do
-      if pid=`pidof ${component}`; then
-        kill -9 ${pid}
-      fi
-    done
-
     CFRUDDER_USE_SYSTEMD="false"
 
     if readlink -f $(cut -f 1 -d "" /proc/1/cmdline | cut -f 1 -d " ") | grep -qE "/systemd$" ; then CFRUDDER_USE_SYSTEMD="true"; fi
@@ -41,11 +34,24 @@ case "$1" in
       systemctl daemon-reload
     fi
 
+    # Make sure that CFEngine is not running anymore
+    for component in cf-agent cf-serverd cf-execd cf-monitord; do
+      if pid=`pidof ${component}`; then
+        kill -9 ${pid}
+      fi
+    done
+
     # Make sure that Rudder agent specific files have been removed
     rm -f /etc/init.d/rudder-agent
     rm -f /etc/default/rudder-agent
+    rm -fr /opt/rudder/var/fusioninventory
     rm -f /opt/rudder/etc/uuid.hive
-    rm -f /var/rudder/cfengine-community/policy_server.dat
+    rm -f /opt/rudder/etc/ssl/agent.cert
+    rm -f /opt/rudder/etc/policy_server.dat
+    rm -f /var/rudder/lib/ssl/policy_server_hash
+    rm -fr /var/rudder/ncf
+    rm -fr /var/rudder/tmp
+    rm -fr /var/rudder/cfengine-community
   ;;
 
   upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)