From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 17 Mar 2011 22:15:58 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f8cb197ae628ee39b3a82e433b396b40957fe8f9;hp=42f5f4297c9769c7c5caeef886f3d1f5700bee71;p=mirror%2Fdsa-wiki.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  spacing
  upgrade updates
  duplicate line
  further improvments to squeeze procedure
  further improvments to squeeze procedure
  reorder and fix

Conflicts:
	input/howto/upgrade-to-squeeze.mdwn
---

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index 26baa82..b14ea72 100644
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -3,12 +3,13 @@
 
 turn off samhain
 
-	/etc/init.d/samhain stop
+	/etc/init.d/samhain stop &&
+	mv /etc/rc2.d/S19samhain /etc/rc2.d/K19samhain # and stay down
 
 
 maybe turn off exim
 
-	/etc/init.d/exim4 stop
+	/etc/init.d/exim4 stop &&
 	mv /etc/rc2.d/S20exim4 /etc/rc2.d/K20exim4 # so it stays down
 
 
@@ -23,37 +24,22 @@ install deborphan, clean up
 
 purge removed packages
 
-	dpkg --get-selections | awk '$2!="install" {print $1}'
-	echo "really purge these [y/N]?"; read ans; [ "$ans" = "y" ] && dpkg --purge `dpkg --get-selections | awk '$2!="install" {print $1}'`
-
-update dsa-puppet.git (add to squeeze list in local.yaml)
-
-do a puppet run:
-
-	puppetd -t
-
+	dpkg --get-selections | awk '$2=="deinstall" {print $1}' &&
+	echo "really purge these [y/N]?" && read ans && [ "$ans" = "y" ] && dpkg --purge `dpkg --get-selections | awk '$2=="deinstall" {print $1}'` &&
+	echo "These are not at install:" && dpkg --get-selections | awk '$2!="install" {print $1}'
 
 change sources list entries to squeeze:
 
-	mirror=`cat /etc/apt/sources.list.d/debian.list | awk '/debian/ {print $2; exit}'`
-	echo "Mirror is $mirror"; echo "Fix stuff if this seems wrong"; echo "XXXXXXXXXXXXXXXXXXXXXXX"
-	echo "## VERIFY THE MIRROR IS CORRECT ##"; read
-
-
-write new sources.list.d/ entries:
-
-	cd /etc/apt/sources.list.d && sed -i "s#lenny#squeeze#g" > debian.list
+	cd /etc/apt/sources.list.d && sed -i "s#lenny#squeeze#g" debian.list
 
 update apt list
 
 	apt-get update
 
-
 upgrade
 
 	apt-get install locales-all
 
-
 rest follows
 
 	apt-get dist-upgrade
@@ -75,6 +61,16 @@ reject changes to /etc/munin/plugin-conf.d/munin-node (puppet will install a new
 
 update nagios.git (add host to squeeze hostgroup)
 
+update dsa-puppet.git (add to squeeze list in local.yaml)
+
+do a puppet run:
+
+	puppetd -t
+
+upgrade once more (security etc)
+
+	apt-get update && apt-get dist-upgrade
+
 check for obsolete packages
 
 	/usr/lib/nagios/plugins/dsa-check-packages
@@ -89,8 +85,11 @@ clean up old libs
 
 purge removed packages
 
-	dpkg --get-selections | awk '$2!="install" {print $1}'
-	echo "really purge these [y/N]?"; read ans; [ "$ans" = "y" ] && dpkg --purge `dpkg --get-selections | awk '$2!="install" {print $1}'`
+	dpkg --get-selections | awk '$2=="deinstall" {print $1}' &&
+	echo "really purge these [y/N]?" && read ans && [ "$ans" = "y" ] && dpkg --purge `dpkg --get-selections | awk '$2=="deinstall" {print $1}'` &&
+	echo "These are not at install:" && dpkg --get-selections | awk '$2!="install" {print $1}'
+
+re-init samhain
 
 possibly reboot
 
@@ -101,10 +100,16 @@ maybe do:
 	apt-get purge dhcp3-client
 	apt-get install isc-dhcp-client
 
-re-enable exim
+re-enable exim, samhain
 
-	mv /etc/rc2.d/K20exim4 /etc/rc2.d/S20exim4
+	mv /etc/rc2.d/K02exim4 /etc/rc2.d/S02exim4
+	mv /etc/rc2.d/K02samhain /etc/rc2.d/S02samhain
 	env -i /etc/init.d/exim4 start
+	env -i /etc/init.d/samhain
+
+	insserv
+
+re-init samhain
 
 
 ### Problems with CCISS