summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-07-17 21:16:03 -0400
committerJoey Hess2014-07-17 21:16:03 -0400
commite31210248defec9ca3559c20b25f4b06d94ba4da (patch)
tree0aa582445bc7fc99a051cac4d4051b76f6c8fa1c /config-joey.hs
parent1aab98549e2fe7183fff6c054b261a277e2abf6a (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs37
1 files changed, 1 insertions, 36 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 7f55b953..2f56f999 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -101,17 +101,8 @@ hosts = -- (o) `
`requires` Gpg.keyImported "98147487" "root"
`requires` Ssh.keyImported SshRsa "root"
(Context "kite.kitenet.net")
+ & JoeySites.kiteMailServer
- & Docker.configured
- & Docker.garbageCollected `period` (Weekly (Just 1))
-
- -- Mail server is in a docker container for stability.
- & Docker.docked hosts "mail-server"
- `requires` File.dirExists "/var/spool/postfix"
- -- sstmp is used to relay mail on kite into the container's
- -- mail server.
- & Apt.installed ["ssmtp"]
-
, standardSystem "diatom.kitenet.net" Stable "amd64"
[ "Important stuff that needs not too much memory or CPU." ]
& ipv4 "107.170.31.195"
@@ -250,32 +241,6 @@ hosts = -- (o) `
& Docker.volume "/var/www:/var/www"
& Apt.serviceInstalledRunning "apache2"
- -- Mail server (smtp, pop, imap) in a container.
- -- Uses the host's /home, /var/mail and /var/spool/postfix directories,
- -- which must exist on the host.
- , standardContainer "mail-server" Stable "amd64"
- & Docker.volume "/home"
- & Docker.volume "/var/mail"
- & Docker.volume "/var/spool/postfix"
- & Docker.publish "25:25" -- smtp
- & Docker.publish "110:110" -- pop3
- & Docker.publish "220:220" -- imap3
- & Docker.publish "465:465" -- smtps
- & Docker.publish "993:993" -- imaps
- & Docker.publish "995:995" -- pop3s
- & Postfix.installed
- & Apt.installed ["postgrey", "postfix-pcre"]
- & Apt.installed ["spamass-milter", "spamassassin"]
- & "/etc/default/spamassassin" `File.containsLines`
- [ "ENABLED=1"
- , "OPTIONS=\"--create-prefs --max-children 5 --helper-home-dir\""
- , "CRON=1"
- , "NICE=\"--nicelevel 15\""
- ]
- & Apt.installed ["maildrop"]
- & Apt.serviceInstalledRunning "dovecot-imapd"
- & Apt.serviceInstalledRunning "dovecot-pop3d"
-
-- My own openid provider. Uses php, so containerized for security
-- and administrative sanity.
, standardContainer "openid-provider" Stable "amd64"