X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=cd5bbe8b54f33948c6a9af5899a08dc2686b0309;hb=4560c210de7352f480b37ab77d1467de229b75b3;hp=4bfd9f5c7f8e6e33eb2c49058fbbb11cf4fd11f1;hpb=4a848b2a9d6d1d29ecfe41cfe7fe84bcba711a2c;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 4bfd9f5..cd5bbe8 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -3,25 +3,12 @@
 Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup]].  If stuff breaks fix it.
 
 
-* install ssh if it isn't there already
+* some initial stuff:
 {{{
-    apt-get install ssh
-}}}
-
-* sane editor
-{{{
-    apt-get install vim
-}}}
-
-* sane locales: (make sure there is _no_ locale defined in /etc/environment and /etc/default/locale)
-{{{
-   echo -n > /etc/environment
-   echo -n > /etc/default/locale
-}}}
-
-* make debconf the same on every host: - dialog, - high
-{{{
-    apt-get install dialog &&
+    apt-get install --no-install-recommends ssh vim &&
+    echo -n > /etc/environment &&
+    echo -n > /etc/default/locale &&
+    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
 }}}
@@ -33,31 +20,17 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * on draghi, add the host to the ldap using ud-host.  Set the ssh key and the IP Address attributes.
 
-* run generate, or wait until cron runs it for you
+* run generate, or wait until cron runs it for you.  Update DNS.
 {{{
-    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppetd -t
+    : :: orff :: && sudo -H ud-replicate
 }}}
 
 * 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)
-}}}
-
-* install userdir-ldap
-{{{
-    apt-get update && apt-get install userdir-ldap
-}}}
-
 * 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
 }}}
 
@@ -68,7 +41,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
+    apt-get install -y debian.org debian.org-recommended
+}}}
+
+* run puppet a couple times
+{{{
+    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.
@@ -92,9 +70,14 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
   newaliases
 }}}
 
-* add to munin on spohr
+* install samhain and get puppet to configure it
 {{{
-    : :: spohr :: && sudo vi /etc/munin/munin.conf
+  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]]