summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2019-05-04 11:42:08 -0400
committerJoey Hess2019-05-04 11:42:08 -0400
commita18abf5258a6447a161bae1a02877ece221d9f8b (patch)
treee4545b60b9e0947a05d95e958544ea95c4b0bad5 /joeyconfig.hs
parent8f166683d18ce414fe629dc2d08266685063e5d3 (diff)
propellor spin
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 44215eba..547daee6 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -418,7 +418,8 @@ keysafe = host "keysafe.joeyh.name" $ props
& Apt.serviceInstalledRunning "swapspace"
& Cron.runPropellor (Cron.Times "30 * * * *")
& Apt.installed ["etckeeper", "sudo"]
- & Apt.removed ["nfs-common", "exim4", "exim4-base", "exim4-daemon-light", "rsyslog", "acpid", "rpcbind", "at"]
+ & JoeySites.noExim
+ & Apt.removed ["nfs-common", "rsyslog", "acpid", "rpcbind", "at"]
& User.hasSomePassword (User "root")
& User.accountFor (User "joey")
@@ -526,13 +527,14 @@ standardSystemUnhardened suite arch motd = propertyList "standard system" $ prop
& Apt.installed ["vim", "screen", "less"]
& Cron.runPropellor (Cron.Times "30 * * * *")
-- I use postfix, or no MTA.
- & Apt.removed ["exim4", "exim4-daemon-light", "exim4-config", "exim4-base"]
- `onChange` Apt.autoRemove
+ & JoeySites.noExim
-- This is my standard container setup, Featuring automatic upgrades.
standardContainer :: DebianSuite -> Property (HasInfo + Debian)
standardContainer suite = propertyList "standard container" $ props
& osDebian suite X86_64
+ -- Do not want to run mail daemon inside a random container..
+ & JoeySites.noExim
& Apt.stdSourcesList `onChange` Apt.upgrade
& Apt.unattendedUpgrades
& Apt.cacheCleaned