From 8da3abd3a203aad48b63908fed4fad08fd32b6ca Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 5 Mar 2016 22:49:44 -0300 Subject: Upgrade: change order and purge more stuff --- share/hydractl/system-upgrade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade index c94216a..516063d 100755 --- a/share/hydractl/system-upgrade +++ b/share/hydractl/system-upgrade @@ -124,13 +124,6 @@ function hydra_system_upgrade_upgrade { exit 1 fi - hydra_system_upgrade_stage cleanup -} - -# Cleanup procedures -function hydra_system_upgrade_cleanup { - apt-get autoremove -y --purge - apt-get clean hydra_system_upgrade_stage custom } @@ -138,11 +131,18 @@ function hydra_system_upgrade_cleanup { function hydra_system_upgrade_custom { # Custom jessie stuff if [ "$nextrelease" == "jessie" ]; then - # We're going masterless, so no puppet service - apt-get remove puppet + # We're going masterless, so no puppet and old services + apt-get purge puppet 'munin*' 'nagios*' fi hydractl trac-upgrade + hydra_system_upgrade_stage cleanup +} + +# Cleanup procedures +function hydra_system_upgrade_cleanup { + apt-get autoremove -y --purge + apt-get clean #hydra_system_upgrade_stage puppet } -- cgit v1.2.3