X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=e72648d222a227905fe0099def4282f7fb99d2f6;hb=f5891520e5ad425db5d880774168f6671e5e4266;hp=764747b0d64a0212d9d27aad7771b6740dd2a1d3;hpb=3499674baa298453944e3d5f351461a632ee3f06;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 764747b..e72648d 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -41,19 +41,9 @@ 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 &&
+    echo draghi.debian.org,draghi,db.debian.org,db,82.195.75.106,::ffff:82.195.75.106,2001:41b8:202:deb:1a1a:0:52c3:4b6a ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAy1mAS0xIOZH9OrJZf1Wv9qYORv5Z5fmpF0o8Y4IMdS+ZzTjN1Sl8M77jaFTJbumJNs+n2CMcX8CoMemQEPBoRe20a5t3dExPQ3c7FNU0z+WIVFbu/oTTkAWGp5gCDwF3pg2QxUjqYc0X4jpv6pkisyvisij6V/VJ5G1hsIMuKqrCKYyyyiJJytfzSfRrBx2QvB5ZWQxhYeSYDoLDvuF31qUy4TLZ/HR3qZQ1cBrP9dCh5d+GQxdY9LuO6zjlnSyU64GHkyjYt3p03AKG4plD7WHX01bD0DQQ/NOFVwFhOZ63mePyridPuqBMFW39jBf4jSsewV95RE5VbY04+MY4XQ== root@draghi >> /etc/ssh/ssh_known_hosts &&
     ud-replicate
 }}}
 
@@ -64,17 +54,12 @@ 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
-}}}
-
-* On handel, make sure the certs exist for the new host
-{{{
-  : :: handel :: : && sudo -u puppet make -C /srv/puppet.debian.org/ca/ install
+    apt-get install -y debian.org debian.org-recommended
 }}}
 
 * 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.
@@ -98,6 +83,16 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
   newaliases
 }}}
 
+* install samhain and get puppet to configure it
+{{{
+  apt-get install -y samhain &&
+  ( puppet agent -t || true ) &&
+  service samhain stop &&
+  rm /var/state/samhain/samhain_file &&
+  samhain --foreground -t init -p none -s none -l none -m none &&
+  service samhain start
+}}}
+
 * if it is a HP Proliant, or has other management fu, read [[howto/ilo-https]]
 
 * edit dedication into in $DSA-PUPPET/modules/debian-org/misc/local.yaml