X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-jessie.mdwn;h=22540924ab97bc2746caf7b021b98547e30dd19f;hb=cedbb3a4ed4200187bd597a5efee478d5d24d884;hp=2978f7a247800dafe36cce4d13611036db8097c3;hpb=321a1a7dede545b4523bf022b924e9b8da0055c5;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index 2978f7a..2254092 100644
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -27,7 +27,9 @@ commands:
 	rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
 	samhain --foreground -t init -p none -s none -l none -m none &&
 	(puppet agent -t || true) &&
+	apt-get update &&
 	apt-get dist-upgrade &&
+	apt-get purge ruby1.8 libffi5:amd64 emacs23-nox libruby1.9.1 libfilesystem-ruby1.9.1 libruby1.8 emacs23-common ruby1.9.1 emacs23-bin-common &&
 	apt-get --purge autoremove &&
 	while [ "$(deborphan -n | wc -l)" -gt 0 ] ; do apt-get purge $(deborphan -n); done &&
 	dpkg --clear-avail &&
@@ -47,7 +49,7 @@ more clean ups:
 	(apt-get purge them)
 
 	apt-get --purge autoremove &&
-	while [ "$(deborphan -n | wc -l)" -gt 0 ] ; do apt-get purge $(deborphan -n); done &&
+	while [ "$(deborphan -n | wc -l)" -gt 0 ] ; do apt-get purge $(deborphan -n); done
 
 	(puppet agent -t || true) && (puppet agent -t || true)
 
@@ -71,12 +73,6 @@ apache cleanup:
 	  replace all order allow,deny, allow from all with
 	    Require all granted
 
-re-init samhain
-
-	(puppet agent -t || true) &&
-	(puppet agent -t || true) &&
-	samhain --foreground -t init -p none -s none -l none -m none
-
 Add the new ed25519 ssh host key:
 	run
 	  echo; echo "cat << EOF | ldapmodify -ZZ -x -D uid="\$USER",ou=users,dc=debian,dc=org -W -h db.debian.org"; echo "dn: host=`hostname`,ou=hosts,dc=debian,dc=org"; echo "changetype: modify"; echo "add: sshRSAHostKey"; echo "sshRSAHostKey: `cat /etc/ssh/ssh_host_ed25519_key.pub `"; echo; echo "EOF"; echo
@@ -84,4 +80,10 @@ Add the new ed25519 ssh host key:
 	
 update dsa-nagios.git (add host to jessie hostgroup)
 
-reboot.
+re-init samhain and finish with a reboot
+
+	(puppet agent -t || true) &&
+	(puppet agent -t || true) &&
+	(puppet agent -t || true) &&
+	samhain --foreground -t update -p none -s none -l none -m none &&
+	/sbin/reboot