upgrade-to-jessie: improve ssh key addition syntax

[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 2254092..07f0afc 100644 (file)
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -1,4 +1,4 @@
-# Upgrade from squeeze to wheezy
+# Upgrade from wheezy to jessie
 
 Make sure to coordinate with whoever uses the host, be it the buildd
 operator, the QA team, the ftp team or just announce it if it's a
@@ -18,10 +18,10 @@ commands:
        sed -i "s#wheezy#jessie#g" /etc/apt/sources.list.d/debian.list /etc/apt/sources.list.d/security.list &&
        dpkg --clear-avail &&
        if [ -e /etc/apt/sources.list.d/buildd.debian.org.list ]; then
-               sed -i "s#squeeze#wheezy#g" /etc/apt/sources.list.d/buildd.debian.org.list
+               sed -i "s#wheezy#jessie#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 &&
@@ -68,14 +68,18 @@ 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
            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)