No longer mention local munin configuration in new-machine,

[mirror/dsa-wiki.git] / input / howto / new-machine.creole

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 27ff539..442c36e 100644 (file)
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -1,6 +1,6 @@
 == setup/integrate a new machine ==
 
-Note: this is partially obsolete now that we have [[puppet-setup|puppet]].  We should probably update/rework some parts.
+Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].  We should probably update/rework some parts.
 
 ** Warning: This procedure has not been tested since being moved to the wiki.  Beware. **
 
@@ -94,9 +94,9 @@ EOF
 
 * 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
 }}}
 
@@ -192,12 +192,6 @@ TLS_REQCERT     hard
 EOF
 }}}
 
-* munin setup:
-* grant access to spohr
-{{{
-    sed -i -e '/^allow/d; $ a \allow ^192\\\.25\\\.206\\\.57$\nallow ^192\\\.25\\\.206\\\.33$' /etc/munin/munin-node.conf
-    ( cd / && env -i /etc/init.d/munin-node restart )
-}}}
 * add to munin on spohr
 {{{
     : :: spohr :: && sudo vi /etc/munin/munin.conf
@@ -214,6 +208,10 @@ EOF
     (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]]
+
+* setup [[puppet|howto/puppet-setup]]
+
+* add to nagios
 
 -- weasel, Wed, 04 Jun 2008 20:52:56 +0200