reboot after samhain run

[mirror/dsa-wiki.git] / input / howto / upgrade-to-jessie.mdwn

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index 9463dd4..cbb15f1 100644 (file)
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -6,11 +6,7 @@ general developer box.
 
 on buildds:
 
-       cd ~buildd
-       sudo su - buildd
-       touch NO-DAEMON-PLEASE EXIT-DAEMON-PLEASE && exit
-
-       now wait for the buildd to quit
+       buildds want moving to the new puppetized setup!
 
 upgrade stuff:
 
@@ -47,14 +43,33 @@ 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
@@ -63,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