X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-jessie.mdwn;h=0892006eba928464505e22d329bf946096af28db;hb=5bd68707526a9f603c84bfc0b9cfa1c3ca7aeebf;hp=60a21f470cb0b7a1cf6f732f8eec617918ce3105;hpb=859ccfa508332ca37f2b4165e2bbc06c2fd864cd;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index 60a21f4..0892006 100644
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -28,6 +28,7 @@ commands:
 	samhain --foreground -t init -p none -s none -l none -m none &&
 	(puppet agent -t || true) &&
 	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,10 +48,13 @@ 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)
 
+nfs kernel module fu:
+	grep '^nfs$' /etc/modules && ! grep '^nfsv4$' /etc/modules && echo nfsv4 | tee -a /etc/modules
+
 apache cleanup:
 
 	mkdir /etc/apache2/conf.d.WHEEZY &&
@@ -61,11 +65,12 @@ apache cleanup:
 	  cd .. &&
 	  rmdir conf.d
 
-re-init samhain
-
-	(puppet agent -t || true) &&
-	(puppet agent -t || true) &&
-	samhain --foreground -t init -p none -s none -l none -m none
+	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
 
 Add the new ed25519 ssh host key:
 	run
@@ -74,4 +79,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