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

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index 4f803c3..cbb15f1 100644
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -47,7 +47,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)
 
@@ -65,15 +65,12 @@ apache cleanup:
 	  rmdir conf.d
 
 	per vhost:
+	  move sites-available file to foo.conf,
+	  remove dangling symlink in sites-enabled,
+	  a2ensite foo
 	  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
@@ -81,4 +78,9 @@ 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) &&
+	samhain --foreground -t init -p none -s none -l none -m none &&
+	/sbin/reboot