Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-wiki

diff --combined input/howto/new-machine.creole
index 9ca83c9,81ec799..fb6b280
--- 1/input/howto/new-machine.creole
--- 2/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@@ -84,19 -84,19 +84,19 @@@ EO
  * on samosa, add the host to /home/sshdist/.ssh/authorized_keys and generate.conf
  (you want the host's rsa host key there: {{{cat /etc/ssh/ssh_host_rsa_key.pub}}})
  {{{
-     :: samosa :: && sudo vi /home/sshdist/.ssh/authorized_keys
-     :: samosa :: && sudo vi /etc/userdir-ldap/generate.conf
+     : :: samosa :: && sudo vi /home/sshdist/.ssh/authorized_keys
+     : :: samosa :: && sudo vi /etc/userdir-ldap/generate.conf
  }}}
  * run generate, or wait until cron runs it for you
  {{{
-     :: samosa :: && sudo -u sshdist ud-generate
+     : :: samosa :: && sudo -u sshdist ud-generate
  }}}
  
  * fix nsswitch for ud fu.
  {{{
-     sed -i -e 's/^passwd:[[:space:]]\+compat$/passwd:         compat db/;
-               s/^group:[[:space:]]\+compat$/group:           db compat/;
-               s/^shadow:[[:space:]]\+compat$/shadow:         compat db/' \
+     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
  }}}
  
@@@ -139,7 -139,7 +139,7 @@@
  
  * exim setup:
  {{{
-     :: now obsolete :: &&
+     : :: now obsolete :: &&
      apt-get install git-core curl &&
      ! [ -d /etc/exim4.bak ] &&
      /etc/init.d/exim4 stop &&
@@@ -200,7 -200,7 +200,7 @@@ EO
  }}}
  * add to munin on spohr
  {{{
-     :: spohr :: && sudo vi /etc/munin/munin.conf
+     : :: spohr :: && sudo vi /etc/munin/munin.conf
  }}}
  
  
@@@ -214,6 -214,6 +214,6 @@@
      (cd / && env -i /etc/init.d/ssh restart)
  }}}
  
 -* if it is a HP Proliant, or has other management fu, read setup-oob
 +* if it is a HP Proliant, or has other management fu, read [[howto/ilo-https]]
  
  -- weasel, Wed, 04 Jun 2008 20:52:56 +0200