From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 7 May 2009 21:46:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7c590a9bc63e8cea2e0a5788bac01035f97f634e;hp=1581ced37df8cf4ec2e21e54b25541ebba3388df;p=mirror%2Fdsa-wiki.git

Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  fix spelling mistake
  add it to the index page
  I'm not sure there's anything else I can do to rescue this :)
  add some documentation about iscsi and adding volumes
  A few more pointers
  Move new 5 hosts bugs setup to historical
  new mail stuff seems to be dead or at least hibernating for now
  we should be looking for a new ftp-master and backup.d.o this year or next
  move hardware wishlist from markdown to creole
---

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 8fe4be7..f4486c6 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -81,15 +81,15 @@ EOF
 }}}
 
 
-* on samosa, add the host to /home/sshdist/.ssh/authorized_keys and generate.conf
+* on draghi, add the host to /home/sshdist/.ssh/authorized_keys and generate.conf
 (you want the host's rsa host key there: {{{cat /etc/ssh/ssh_host_rsa_key.pub}}})
 {{{
-    : :: samosa :: && sudo vi /home/sshdist/.ssh/authorized_keys
-    : :: samosa :: && sudo vi /etc/userdir-ldap/generate.conf
+    : :: draghi :: && sudo vi /home/sshdist/.ssh/authorized_keys
+    : :: draghi :: && sudo vi /etc/userdir-ldap/generate.conf
 }}}
 * run generate, or wait until cron runs it for you
 {{{
-    : :: samosa :: && sudo -u sshdist ud-generate
+    : :: draghi :: && sudo -u sshdist ud-generate
 }}}
 
 * fix nsswitch for ud fu.
@@ -108,8 +108,7 @@ EOF
 
 * on the host, run ud-replicate
 {{{
-    mkdir -p /root/.ssh &&
-    echo db,db.debian.org,192.25.206.57 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAph3LozYmcwHwgnxfKia1lg1AXNuJiEroi/GpPztbcqxmFOYBZbMgYDj+kM+usoXF2diT9OQWqg1yx19CeEoghHYz4/yZa0PYdLgPj9Si4PScekVaE051GrLM63osfK0j3wIfpgLJv2/zs42NbXjkKPdjInEaWPn8W1fe88M3JDE= root@newsamosa >> /root/.ssh/known_hosts &&
+    echo draghi.debian.org,draghi,db.debian.org,db,82.195.75.106,::ffff:82.195.75.106 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAy1mAS0xIOZH9OrJZf1Wv9qYORv5Z5fmpF0o8Y4IMdS+ZzTjN1Sl8M77jaFTJbumJNs+n2CMcX8CoMemQEPBoRe20a5t3dExPQ3c7FNU0z+WIVFbu/oTTkAWGp5gCDwF3pg2QxUjqYc0X4jpv6pkisyvisij6V/VJ5G1hsIMuKqrCKYyyyiJJytfzSfRrBx2QvB5ZWQxhYeSYDoLDvuF31qUy4TLZ/HR3qZQ1cBrP9dCh5d+GQxdY9LuO6zjlnSyU64GHkyjYt3p03AKG4plD7WHX01bD0DQQ/NOFVwFhOZ63mePyridPuqBMFW39jBf4jSsewV95RE5VbY04+MY4XQ== root@draghi >> /etc/ssh/ssh_known_hosts &&
     ud-replicate
 }}}