aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-05 22:49:44 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-05 22:49:44 -0300
commit8da3abd3a203aad48b63908fed4fad08fd32b6ca (patch)
treeed29798c5510d4677ff18f0b0f323e728cce4c4c
parentdd7c7af03377098faeec1cce1d4c712ec9112fc2 (diff)
downloadhydra-8da3abd3a203aad48b63908fed4fad08fd32b6ca.tar.gz
hydra-8da3abd3a203aad48b63908fed4fad08fd32b6ca.tar.bz2
Upgrade: change order and purge more stuff
-rwxr-xr-xshare/hydractl/system-upgrade18
1 files 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
}