From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 27 Apr 2015 14:50:14 +0000 (+0200)
Subject: apache cleanup
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=859ccfa508332ca37f2b4165e2bbc06c2fd864cd

apache cleanup
---

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index f2e9c7d..60a21f4 100644
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -43,8 +43,23 @@ purge removed packages
 more clean ups:
 
 	/usr/lib/nagios/plugins/dsa-check-packages | tr -d ,
+
 	(apt-get purge them)
-	apt-get --purge autoremove
+
+	apt-get --purge autoremove &&
+	while [ "$(deborphan -n | wc -l)" -gt 0 ] ; do apt-get purge $(deborphan -n); done &&
+
+	(puppet agent -t || true) && (puppet agent -t || true)
+
+apache cleanup:
+
+	mkdir /etc/apache2/conf.d.WHEEZY &&
+	cd /etc/apache2/conf.d &&
+	  for i in *; do
+	    diff -u $i ../conf-enabled/$i.conf && mv -v $i ../conf.d.WHEEZY/
+	  done &&
+	  cd .. &&
+	  rmdir conf.d
 
 re-init samhain