X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-jessie.mdwn;h=09e96ab0610b1e98a84cdc4b6f581dead0953efd;hb=7218ca8bb78e99ba57f5c387bb7059c12e90f237;hp=cbb15f1e78db3aa10c5fda9e5d47e6dee7fcc2b6;hpb=49220bec57bbba0b0415fa9e1be1be274c1d35c3;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index cbb15f1..09e96ab 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 &&
@@ -73,7 +75,7 @@ apache cleanup:
 
 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
+	  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
 	and paste it on draghi.
 	
 update dsa-nagios.git (add host to jessie hostgroup)
@@ -82,5 +84,6 @@ re-init samhain and finish with a reboot
 
 	(puppet agent -t || true) &&
 	(puppet agent -t || true) &&
-	samhain --foreground -t init -p none -s none -l none -m none &&
+	(puppet agent -t || true) &&
+	samhain --foreground -t update -p none -s none -l none -m none &&
 	/sbin/reboot