summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2019-06-15 12:37:46 -0400
committerJoey Hess2019-06-15 12:37:46 -0400
commitccb2c08c1537766338755e4bf97a7d15c2162ef3 (patch)
tree37fe46b5bea55ef94227aaefb8617eac9c8b31f8
parentd6a49fcf62552db38930a59b8269cb14b4973be0 (diff)
parent38c27aa25409b02a1957d3dd7b489cd511cc0a92 (diff)
Merge branch 'joeyconfig'
-rw-r--r--joeyconfig.hs8
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs6
2 files changed, 10 insertions, 4 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 97657ad7..337e239d 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -417,7 +417,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")
@@ -525,13 +526,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..faf242e0 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1025,7 +1025,7 @@ house user hosts ctx sshkey = propertyList "home automation" $ props
]
-- Any changes to the rsync command will need my .authorized_keys
-- rsync server command to be updated too.
- rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/ joey@kitenet.net:/srv/web/house.joeyh.name/rrds/"
+ rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/ joey@kitenet.net:/srv/web/house.joeyh.name/rrds/ >/dev/null 2>&1"
websitesymlink :: Property UnixLike
websitesymlink = check (not . isSymbolicLink <$> getSymbolicLinkStatus "/var/www/html")
@@ -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