Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #23146: Actually allow uninstalling the agent #2790

Merged
merged 1 commit into from
Jul 27, 2023
Merged

Fixes #23146: Actually allow uninstalling the agent #2790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions rudder-agent/SPECS/rudder-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

#=================================================
Expand Down
22 changes: 14 additions & 8 deletions rudder-agent/debian/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down