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 2978f7a..cbb15f1 100644 (file)
--- 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)
 
@@ -71,12 +71,6 @@ apache cleanup:
          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
@@ -84,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