summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-07-23 10:52:26 -0400
committerJoey Hess2014-07-23 10:52:26 -0400
commit321a0bdef6c34c250af8c893290747e6e3e628c3 (patch)
treed5d0861a68849bccaac1580048f5d0b43c0e857f
parent660f77c28fe11534139e8d9ecda2d573921fa8dd (diff)
propellor spin
-rw-r--r--config-joey.hs24
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs10
2 files changed, 31 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 17369445..92ec0a84 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 51d3d60c..6409cac8 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"