summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs8
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs4
2 files changed, 9 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
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index f5812e7e..dcba975a 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1321,3 +1321,7 @@ rsyncNetBorgRepo d os = Borg.BorgRepoUsing os' ("2318@usw-s002.rsync.net:" ++ d)
where
-- rsync.net has a newer borg here
os' = Borg.UsesEnvVar ("BORG_REMOTE_PATH", "borg1") : os
+
+noExim :: Property DebianLike
+noExim = Apt.removed ["exim4", "exim4-base", "exim4-daemon-light"]
+ `onChange` Apt.autoRemove