aboutsummaryrefslogtreecommitdiff
path: root/share/hydractl
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-20 14:57:28 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-20 14:57:28 -0300
commitc86bf5cae3dc05c3b607e02532b1137ce17803d3 (patch)
tree32dbc49f2b300463c90178825a3d43f10ade0a64 /share/hydractl
parent41edaeba8733cd1b777bb5c4ccd5c81ef2a53a2e (diff)
downloadhydra-c86bf5cae3dc05c3b607e02532b1137ce17803d3.tar.gz
hydra-c86bf5cae3dc05c3b607e02532b1137ce17803d3.tar.bz2
Jessie customizations and script reordering
Diffstat (limited to 'share/hydractl')
-rwxr-xr-xshare/hydractl/system-upgrade28
1 files changed, 21 insertions, 7 deletions
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index b9a6b96..f0c42b1 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -130,13 +130,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
- apt-get clean
hydra_system_upgrade_stage custom
}
@@ -153,7 +146,28 @@ function hydra_system_upgrade_custom {
fi
fi
+ if [ "$nextrelease" == "jessie" ]; then
+ # We're using a masterless puppet setup, so no agent
+ apt-get install puppet-common
+ apt-get purge puppet
+
+ # Purge old monitoring infrastructure
+ apt-get purge 'munin*' 'nagios*'
+ rm -rf /etc/nagios* /etc/munin* /etc/munin* /usr/share/munin*
+
+ # Cleanup old scripts
+ rm -f /usr/local/sbin/check-puppetd.sh
+ rm -f remove /etc/cron.d/puppetd
+ fi
+
hydractl trac-upgrade
+ hydra_system_upgrade_stage cleanup
+}
+
+# Cleanup procedures
+function hydra_system_upgrade_cleanup {
+ apt-get autoremove --purge -y
+ apt-get clean
}
# Initialize