move some install steps into puppet

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 36edc83..241fd5e 100644 (file)
--- 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 &&
 * 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
     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


@@ -30,19 +28,9 @@ 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
 {{{
 
 * 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
-{{{
+    apt-get update;
+    puppet agent -t; puppet agent -t; puppet agent -t
+    ud-replicate

     puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 
     puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 


@@ -51,20 +39,6 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
     apt-get update && apt-get dist-upgrade && apt-get clean
 }}}
 
     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 &&
 * install samhain and get puppet to configure it
 {{{
   apt-get install -y samhain &&