X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=input%2Fhowto%2Fnew-machine.creole;h=08b75d1ab26a6f3c9842550eee7b436c8bdc6437;hb=47c7b623102b776095a8849371000569afc65b8c;hp=e66b0f0afffe5f9ae8c1fe955bebeb47c97f385b;hpb=ad9b095c02174b57c7febc0829d264fad8dd23ba;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index e66b0f0..08b75d1 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -41,16 +41,6 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * setup [[puppet|howto/puppet-setup]]  (run the puppet client two or three times until things converge.)
 
-
-* fix nsswitch for ud fu.  (you might have to restart sshd here)
-{{{
-    sed -i -e 's/^passwd:\[[:space:]]\+compat$/passwd:         compat db/;
-              s/^group:\[[:space:]]\+compat$/group:          db compat/;
-              s/^shadow:\[[:space:]]\+compat$/shadow:         compat db/' \
-        /etc/nsswitch.conf
-    (cd / && env -i /etc/init.d/ssh restart)
-}}}
-
 * on the host, run ud-replicate
 {{{
     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 &&
@@ -64,7 +54,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * install debian.org which brings you shells and much other fun
 {{{
-    apt-get install debian.org debian.org-recommended
+    apt-get install -y debian.org debian.org-recommended
 }}}
 
 * On handel, make sure the certs exist for the new host
@@ -74,7 +64,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run puppet a couple times
 {{{
-    puppetd -t; puppetd -t; puppetd -t; puppetd -t
+    puppet agent -t; puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 
 * try to login using your user and ssh key.  you should get a homedir.