X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-lenny.mdwn;h=2fc2423ac1d2b697e506d7ed8d30550d8a393fc6;hb=4748598a49ca95a8569fb7638db087e00821ddeb;hp=be1e50200b5748948b4d8795967f75a460f2557b;hpb=66ed837e8b1847a1074e176ffaefab7e47a17ada;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-lenny.mdwn b/input/howto/upgrade-to-lenny.mdwn
index be1e502..2fc2423 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
@@ -140,24 +141,13 @@ rest follows
 	apt-get dist-upgrade
 
 
- * merge changes into /etc/pam.d/sudo
+reject changes to /etc/pam.d/sudo (puppet will install a new file later anyway)
 
-
-	(change old and reject (N))
-	cat >> /etc/pam.d/sudo << EOF
-	
-	session required pam_permit.so
-	session required pam_limits.so
-	EOF
-
- * merge changes into /etc/munin/plugin-conf.d/munin-node
-
-   (change new and accept (A))
+merge changes into /etc/munin/plugin-conf.d/munin-node (change new and accept (A)):
 
 	sed -i -e 's/adm$/adm, maillog/' /etc/munin/plugin-conf.d/munin-node.dpkg-new
 
-
- * keep local (i.e. reject (N))
+ * keep local (i.e. reject (N)):
   * all changes relating to exim  (in /etc/exim4 and in logrotate)
   * /etc/ldap/ldap.conf
   * /etc/nagios/nrpe.cfg
@@ -171,7 +161,7 @@ rest follows
 
 update nagios on samosa  (add host to lenny hostgroup)
 
-maybe install [[puppet|puppet-install]]
+maybe install [[puppet|puppet-setup]]
 
 check for obsolete packages
 
@@ -189,3 +179,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