X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=241fd5ed6c16cd68a293ea430d3cd601485acadb;hb=4748598a49ca95a8569fb7638db087e00821ddeb;hp=675c708f9d46aa363e80ca8bd98e340cd37074b4;hpb=869b58c310197cf6155f7e9ec756489f7d94ee29;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 675c708..241fd5e 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -6,8 +6,6 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 * some initial stuff:
 {{{
     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
@@ -22,7 +20,7 @@ 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 puppet agent --no-daemonize --onetime
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppet agent -t
     : :: denis :: && sudo -H ud-replicate
 }}}
 
@@ -30,20 +28,10 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * 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
-}}}
-
-* install debian.org which brings you shells and much other fun
-{{{
-    apt-get install -y debian.org debian.org-recommended
-}}}
-
-* run puppet a couple times
-{{{
-    puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime
+    apt-get update;
+    puppet agent -t; puppet agent -t; puppet agent -t
+    ud-replicate
+    puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 
 * install security updates etc.
@@ -51,24 +39,10 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
     apt-get update && apt-get dist-upgrade && apt-get clean
 }}}
 
-* try to login using your user and ssh key.  you should get a homedir.
-
-* try to become root using sudo.
-
-* 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
-}}}
-
 * install samhain and get puppet to configure it
 {{{
   apt-get install -y samhain &&
-  ( puppet agent --no-daemonize --onetime || true ) &&
+  ( 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 &&