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

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index f2e9c7d..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 &&
@@ -43,20 +45,45 @@ purge removed packages
 more clean ups:
 
 	/usr/lib/nagios/plugins/dsa-check-packages | tr -d ,
+
 	(apt-get purge them)
-	apt-get --purge autoremove
 
-re-init samhain
+	apt-get --purge autoremove &&
+	while [ "$(deborphan -n | wc -l)" -gt 0 ] ; do apt-get purge $(deborphan -n); done
 
-	(puppet agent -t || true) &&
-	(puppet agent -t || true) &&
-	samhain --foreground -t init -p none -s none -l none -m none
+	(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 &&
+	cd /etc/apache2/conf.d &&
+	  for i in *; do
+	    diff -u $i ../conf-enabled/$i.conf && mv -v $i ../conf.d.WHEEZY/
+	  done &&
+	  cd .. &&
+	  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
 
 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)
 
-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