diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-22 15:25:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-22 15:25:07 -0400 |
| commit | 98a311476379eb8c05a7a720799cd3416091bbe7 (patch) | |
| tree | d801a9931da20e01536b104e91865018f6b68407 /config-joey.hs | |
| parent | 56b1d73e60952bd90c24349aa66c563e7793442d (diff) | |
propellor spin
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config-joey.hs b/config-joey.hs index cdd21c80..40d48cb2 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -84,6 +84,7 @@ hosts = -- (o) ` ] & ipv4 "66.228.36.95" & ipv6 "2600:3c03::f03c:91ff:fe73:b0d2" + -- & alias "kitenet.net" -- not yet live! & Apt.installed ["linux-image-amd64"] & Linode.chainPVGrub 5 @@ -105,9 +106,12 @@ hosts = -- (o) ` `requires` Ssh.keyImported SshRsa "root" (Context "kite.kitenet.net") - & JoeySites.kiteMailServer -- & alias "smtp.kitenet.net" -- not yet live! -- & alias "imap.kitenet.net" -- not yet live! + -- & alias "mail.kitenet.net" -- not yet live! + & JoeySites.kiteMailServer + + & JoeySites.legacyWebSites & Apt.installed ["git-annex", "myrepos" @@ -131,10 +135,7 @@ hosts = -- (o) ` & Apt.serviceInstalledRunning "swapspace" & Apt.serviceInstalledRunning "apache2" - & File.hasPrivContent "/etc/ssl/certs/web.pem" (Context "kitenet.net") - & File.hasPrivContent "/etc/ssl/private/web.pem" (Context "kitenet.net") - & File.hasPrivContent "/etc/ssl/certs/startssl.pem" (Context "kitenet.net") - & Apache.modEnabled "ssl" + & JoeySites.kitenetHttps & Apache.multiSSL & File.ownerGroup "/srv/web" "joey" "joey" & Apt.installed ["analog"] @@ -410,14 +411,13 @@ monsters = -- but do want to track their public keys etc. - /postgrey - mailman - /spamassassin - - sqwebmail + - sqwebmail (cannot use this with dovecot, alternatives?) - /imap server - /pop server - apache - some static websites - - bitlbee - - prosody - - (used by daddy's git-annex) + - bitlbee (EOL?) + - prosody (EOL?) - named - (branchable is still pushing to here - (thinking it's ns2.branchable.com), but it's no |