X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-jessie.mdwn;h=309798a425a6009f9c41346f41246b50b2468600;hb=0005b5d0b23ab73cb26f508733fbc3c6d54de56b;hp=c2863bd2432f5dbdbbee26c18c24bc3abac62593;hpb=4653e45f928a9b8249f4bd0b99cc1f8b1596b7d8;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index c2863bd..309798a 100644
--- 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 &&
@@ -75,8 +75,11 @@ apache cleanup:
 	    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)