X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-squeeze.mdwn;h=7573b37862672fa055af3e64d2da9e0e06e71d73;hb=4748598a49ca95a8569fb7638db087e00821ddeb;hp=c01c59d6d17fa5124b0e0154db1071d5f01aa075;hpb=7eb95959d65a6952cc73618684540bf0ae544242;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index c01c59d..7573b37 100644
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -33,11 +33,6 @@ install deborphan, clean up
 	orphaner -a
 	orphaner -a -n
 
-unhold puppet
-
-	echo puppet install | dpkg --set-selections &&
-	echo puppet-common install | dpkg --set-selections
-
 purge removed packages
 
 	dpkg --get-selections | awk '$2=="deinstall" {print $1}' &&
@@ -76,7 +71,7 @@ reject changes to /etc/munin/plugin-conf.d/munin-node (puppet will install a new
   * /etc/apache2/apache2.conf
   * /etc/apache2/ports.conf
 
-update nagios.git (add host to squeeze hostgroup)
+update dsa-nagios.git (add host to squeeze hostgroup)
 
 update dsa-puppet.git (add to squeeze list in local.yaml)
 
@@ -140,7 +135,7 @@ purge removed packages
 
 purge cruft that upgrade doesn't remove
 
-	apt-get remove --purge emacs22-common libxmlrpc-ruby libcap1 emacs22-nox emacs22-bin-common libvolume-id0 gcc-4.2-base ifenslave libopenssl-ruby1.8
+	apt-get remove --purge emacs22-common libxmlrpc-ruby libcap1 emacs22-nox emacs22-bin-common libvolume-id0 gcc-4.2-base ifenslave libopenssl-ruby1.8 mailx
 
 re-init samhain
 
@@ -148,8 +143,8 @@ possibly reboot
 
 re-enable exim, samhain
 
-	mv /etc/rc2.d/K02exim4 /etc/rc2.d/S02exim4
-	mv /etc/rc2.d/K02samhain /etc/rc2.d/S02samhain
+	mv /etc/rc2.d/K??exim4 /etc/rc2.d/S02exim4
+	mv /etc/rc2.d/K??samhain /etc/rc2.d/S02samhain
 	env -i /etc/init.d/exim4 start
 	env -i /etc/init.d/samhain start