X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=a8cb69cbcf28c2021cfaa9206c6635d6ea65f981;hb=083c0a47ec1c5e0eccedff1756bac931556842ec;hp=ec3c8a2b1a34cb4006650a269e147a62499321bf;hpb=5eaef104528f579b6d00c5d4f0b772c0ad3faf74;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index ec3c8a2..a8cb69c 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -1,4 +1,4 @@
-== setup/integrate a new machine ==
+= how to add a new machine =
 
 Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup]].  If stuff breaks fix it.
 
@@ -8,7 +8,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
     apt-get install --no-install-recommends ssh vim &&
     echo -n > /etc/environment &&
     echo -n > /etc/default/locale &&
-    apt-get install --no-install-recommends dialog && &&
+    apt-get install --no-install-recommends dialog &&
     echo "debconf debconf/priority        select high" | debconf-set-selections &&
     echo "debconf debconf/frontend        select Dialog" | debconf-set-selections
 }}}
@@ -22,20 +22,17 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run generate, or wait until cron runs it for you.  Update DNS.
 {{{
-    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppetd -t
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppetd --no-daemonize --onetime
     : :: denis :: && sudo -H ud-replicate
 }}}
 
 * setup [[puppet|howto/puppet-setup]]  (run the puppet client two or three times until things converge.)
 
-* on the host, run ud-replicate
-{{{
-    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
-}}}
-
-* check if it worked:
+* on the host, run ud-replicate and check if it worked
 {{{
+    apt-get update &&
+    apt-get install -y --no-install-recommends userdir-ldap &&
+    ud-replicate &&
     id weasel
 }}}
 
@@ -46,7 +43,12 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run puppet a couple times
 {{{
-    puppet agent -t; puppet agent -t; puppet agent -t; puppet agent -t
+    puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime
+}}}
+
+* install security updates etc.
+{{{
+    apt-get update && apt-get dist-upgrade && apt-get clean
 }}}
 
 * try to login using your user and ssh key.  you should get a homedir.
@@ -73,9 +75,9 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 * install samhain and get puppet to configure it
 {{{
   apt-get install -y samhain &&
-  ( puppet agent -t || true ) &&
+  ( puppet agent --no-daemonize --onetime || true ) &&
   service samhain stop &&
-  rm /var/state/samhain/samhain_file &&
+  rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
   samhain --foreground -t init -p none -s none -l none -m none &&
   service samhain start
 }}}