prefer pinentry-curses to -gtk2

[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 0892006..717f3ea 100644 (file)
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -21,12 +21,13 @@ commands:
                sed -i "s#squeeze#wheezy#g" /etc/apt/sources.list.d/buildd.debian.org.list
        fi &&
        apt-get update &&
-       apt-get install dpkg apt samhain &&
+       apt-get install dpkg apt samhain pinentry-curses &&
        service samhain stop &&
        apt-get dist-upgrade &&
        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 &&
@@ -67,6 +68,7 @@ apache cleanup:
 
        per vhost:
          move sites-available file to foo.conf,
+          if they exist: move sites-available/RCS and sites-staging files to foo.conf,v and foo.conf
          remove dangling symlink in sites-enabled,
          a2ensite foo
          replace all order allow,deny, allow from all with
@@ -74,7 +76,7 @@ apache cleanup:
 
 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)
@@ -83,5 +85,6 @@ 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 &&
+       (puppet agent -t || true) &&
+       samhain --foreground -t update -p none -s none -l none -m none &&
        /sbin/reboot