From 321a0bdef6c34c250af8c893290747e6e3e628c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jul 2014 10:52:26 -0400
Subject: [PATCH] propellor spin

---
 config-joey.hs                                | 24 ++++++++++++++++---
 .../Property/SiteSpecific/JoeySites.hs        | 10 ++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/config-joey.hs b/config-joey.hs
index 1736944..92ec0a8 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -409,16 +409,34 @@ monsters =	      -- but do want to track their public keys etc.
 		 -   /spamassassin
 		 -   sqwebmail (cannot use this with dovecot, alternatives?)
 		 -   /imap server
-		 -   	(note: will need to re-download offlineimap)
 		 -   /pop server
-		 -   	(note: different hostname and ssl cert, will need
-		 -   	to reconfigure errol's email client)
 		 - /apache
 		 -   (need to re-rsync /srv/web to new kite.kitenet.net
 		 -   server before decommissioning)
 		 - bitlbee (EOL?)
 		 - prosody (EOL?)
 		 - ftpd (EOL)
+		 -
+		 - Pre-transition:
+		 - - re-rsync /home
+		 - - set up imap passwords for users who use pine
+		 - 
+		 - Transition plan:
+		 - - on darkstar: offlineimap run & disable cron job
+		 -    & move offlineimap files to tmp
+		 - - take down wren pstfix, imap, pop servers
+		 - - log all users out of wren
+		 - - final /home rsync
+		 - - rsync /var/mail
+		 - - rsync mailman and mailman list archives dirs
+		 - - switch kitenet.net dns and enable pop.kitenet.net etc aliass
+		 - - point wren.kitenet.net at kite.kitenet.net temporarily
+		 -   (make real-wren.kitenet.net alias)
+		 - - reconfigure errol's email client to use new server
+		 - - re-run offlinimap against new server
+		 - - test mail
+		 - - test virus filtering
+		 - - test http://kitenet.net/~kyle/ (user home dirs)
 		 -}
 	, host "mouse.kitenet.net"
 		& ipv6 "2001:4830:1600:492::2"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 51d3d60..6409cac 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -688,6 +688,16 @@ legacyWebSites = propertyList "legacy web sites"
 		, Apache.allowAll
 		, "</Directory>"
 		]
+	, alias "creeksidepress.com"
+	, toProp $ Apache.siteEnabled "creeksidepress.com" $ apachecfg "creeksidepress.com" False
+		[ "ServerAlias www.creeksidepress.com"
+		, "DocumentRoot /srv/web/creeksidepress.com"
+		, "<Directory /srv/web/creeksidepress.com>"
+		, "  Options FollowSymLinks"
+		, "  AllowOverride None"
+		, Apache.allowAll
+		, "</Directory>"
+		]
 	, alias "joey.kitenet.net"
 	, toProp $ Apache.siteEnabled "joey.kitenet.net" $ apachecfg "joey.kitenet.net" False
 		[ "DocumentRoot /home/joey/html"