X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=241fd5ed6c16cd68a293ea430d3cd601485acadb;hb=d8f2ea8fb167de09f0da8c88425645d890523014;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..241fd5e 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -1,26 +1,11 @@
-== 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.
 
 
-* install ssh if it isn't there already
-{{{
-    apt-get install --no-install-recommends ssh
-}}}
-
-* sane editor
-{{{
-    apt-get install --no-install-recommends 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
+* some initial stuff:
 {{{
+    apt-get install --no-install-recommends ssh vim &&
     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
@@ -35,80 +20,38 @@ 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
-    : :: orff :: && sudo -H ud-replicate
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppet agent -t
+    : :: denis :: && 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)
-}}}
-
-* on the host, run ud-replicate
+* on the host, run ud-replicate and check if it worked
 {{{
-    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 &&
+    apt-get update;
+    puppet agent -t; puppet agent -t; puppet agent -t
     ud-replicate
+    puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 
-* check if it worked:
-{{{
-    id weasel
-}}}
-
-* install debian.org which brings you shells and much other fun
+* install security updates etc.
 {{{
-    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
-}}}
-
-* run puppet a couple times
-{{{
-    puppetd -t; puppetd -t; puppetd -t; puppetd -t
-}}}
-
-* try to login using your user and ssh key.  you should get a homedir.
-
-* try to become root using sudo.
-
-* make ca-certificates sane:  (choose to *not* trust new certs, and we only want the spi cert activated)
-{{{
-    echo "ca-certificates ca-certificates/trust_new_crts  select no" | debconf-set-selections
-    sed -i -e 's/^[^#!].*/!&/; s#^!spi-inc.org/spi-cacert-2008.crt#spi-inc.org/spi-cacert-2008.crt#' /etc/ca-certificates.conf
-    dpkg-reconfigure ca-certificates
-}}}
-
-* Add debian-admin@debian.org to root in /etc/aliases
-{{{
-  if ! egrep '^root:' /etc/aliases > /dev/null; then
-    echo "root: debian-admin@debian.org" >> /etc/aliases
-  elif ! egrep '^root:.*debian-admin@debian.org' /etc/aliases > /dev/null; then
-    sed -i -e 's/^root: .*/&, debian-admin@debian.org/' /etc/aliases
-  fi
-  newaliases
+    apt-get update && apt-get dist-upgrade && apt-get clean
 }}}
 
 * install samhain and get puppet to configure it
 {{{
-  apt-get install samhain
-  puppet agent -t
+  apt-get install -y samhain &&
+  ( puppet agent -t || true ) &&
+  service samhain stop &&
+  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
 }}}
 
 * 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
-
-* Add host to smarthost machines in $DSA-PUPPET/modules/debian-org/misc/local.yaml (if so desired).  Set MX in ud-ldap.
+* edit dedication into in $DSA-PUPPET/modules/debian_org/files/misc/local.yaml
 
 * add to nagios