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 60a21f4..cbb15f1 100644 (file)
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -47,10 +47,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 +64,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 +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