Update pgp key

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

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 9ca83c9..8fe4be7 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. **
 
@@ -33,7 +33,7 @@ EOF
 
     apt-key add - << EOF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
 mQGiBEf4BP0RBACfXnRhBb9HKiA3h5A1tDnluVwfkSuDX4ZXdVAuMZapdOm8r9ug
 9zE/dDGWPWja+DArAPZ/i3BFvlMewmden/IFbQKtXluQVIC4GL1RBMwrtWsZzo0g
@@ -44,10 +44,10 @@ H/T2qbQTzv+woAjyR/e2Zpsc2DRfqO/8aCw1Jx8N3UbH9MBPYlYlyCnSra1OAyXW
 VvC0A/9nT/k6VIFBF0Oq2WwmzOLptOqg61WrnxBr3GIe503++p88tOwlCJlL0uZZ
 k68m3m5t7WDtQK4fHQwLramb9AqtBPhiEaXU5bXk77RYE54EeEH9Z4H4YSMMkdYU
 gLG5CZI2jprxAZew1mHKROv+15jxYd+BZCrORmpWn5g7N+TC5rQeZGIuZGViaWFu
-Lm9yZyBhcmNoaXZlIGtleSAyMDA4iGYEExECACYFAkf4BP0CGwMFCQHhM4AGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRC+p88QvSsO4JZLAJ4slp2uRZHtzMXK8oTB
-DV1XiztTZwCfQD7Y2mKDaMsmE4AmwOOTw2fmcZo=
-=+jlJ
+Lm9yZyBhcmNoaXZlIGtleSAyMDA4iGYEExECACYCGwMGCwkIBwMCBBUCCAMEFgID
+AQIeAQIXgAUCSdlA9AUJA8JvcwAKCRC+p88QvSsO4AoeAJ0dY+rDwxNVR6HPs8JZ
+xLceOYU/hgCeNW1KkOXrSt2Lv8PVWXnr5jHNZSo=
+=4LFD
 -----END PGP PUBLIC KEY BLOCK-----
 EOF
 }}}
@@ -84,19 +84,19 @@ EOF
 * 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
 }}}
 
@@ -137,19 +137,6 @@ EOF
     dpkg-reconfigure ca-certificates
 }}}
 
-* exim setup:
-{{{
-    :: now obsolete :: &&
-    apt-get install git-core curl &&
-    ! [ -d /etc/exim4.bak ] &&
-    /etc/init.d/exim4 stop &&
-    mv /etc/exim4 /etc/exim4.bak &&
-    mkdir /etc/exim4 &&
-    cd /etc/exim4 &&
-    git clone https://db.debian.org/git/dsa-exim.git Git &&
-    ./Git/bin/update &&
-    (cd / && /etc/init.d/exim4 start)
-}}}
 * Add debian-admin@debian.org to root in /etc/aliases
 
 * sane default editor
@@ -192,15 +179,9 @@ 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
+    : :: spohr :: && sudo vi /etc/munin/munin.conf
 }}}
 
 
@@ -216,4 +197,8 @@ EOF
 
 * 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