From: Stephen Gran <steve@lobefin.net>
Date: Sun, 29 Mar 2009 18:08:27 +0000 (+0100)
Subject: Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1f5d28adf0cd901dcdd96ade1ef8a1f438c74ae9;hp=7e84448bf8fe78acbc1ae0d43e6ffc7b483fa554;p=mirror%2Fdsa-wiki.git

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

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 9ca83c9..fb6b280 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -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
 }}}
 
@@ -139,7 +139,7 @@ EOF
 
 * 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 @@ EOF
 }}}
 * add to munin on spohr
 {{{
-    :: spohr :: && sudo vi /etc/munin/munin.conf
+    : :: spohr :: && sudo vi /etc/munin/munin.conf
 }}}
 
 
diff --git a/input/howto/upgrade-to-lenny.mdwn b/input/howto/upgrade-to-lenny.mdwn
index 0776afb..5e51a68 100644
--- a/input/howto/upgrade-to-lenny.mdwn
+++ b/input/howto/upgrade-to-lenny.mdwn
@@ -23,6 +23,7 @@ turn off samhain
 maybe turn off exim
 
 	/etc/init.d/exim4 stop
+	mv /etc/rc2.d/S20exim4 /etc/rc2.d/K20exim4 # so it stays down
 
 
 install deborphan, clean up
@@ -185,3 +186,10 @@ purge removed packages
 
 	dpkg --get-selections | awk '$2!="install" {print $1}'
 	echo "really purge these [y/N]?"; read ans; [ "$ans" = "y" ] && dpkg --purge `dpkg --get-selections | awk '$2!="install" {print $1}'`
+
+possibly reboot
+
+re-enable exim
+
+	mv /etc/rc2.d/K20exim4 /etc/rc2.d/S20exim4
+	env -i /etc/init.d/exim4 start