From 5f5d99824a2b24d11ccbf4969f934c94e58a9a90 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Aug 2018 13:24:52 -0400 Subject: Split mailname property out of Hostname.sane Since bad mailname guesses can lead to ugly surprises. (API change) Kept it in the Hostname module for easy discoverability, and similar to Hostname.searchDomain it sets a value based on the hostname so makes sense to keep it in that module. Didn't implement the mailname equivilant of Hostname.setTo, because it's trivial to write the mailname file with a custom value if desired. This commit was sponsored by John Pellman on Patreon. --- joeyconfig.hs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 4b9fb785..05c93346 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -66,6 +66,7 @@ darkstar = host "darkstar.kitenet.net" $ props & osDebian Unstable X86_64 & ipv6 "2001:4830:1600:187::2" & Hostname.sane + & Hostname.mailname & Apt.serviceInstalledRunning "swapspace" & Laptop.powertopAutoTuneOnBoot & Laptop.trimSSD @@ -461,6 +462,7 @@ keysafe :: Host keysafe = host "keysafe.joeyh.name" $ props & ipv4 "139.59.17.168" & Hostname.sane + & Hostname.mailname & osDebian (Stable "stretch") X86_64 & Apt.stdSourcesList `onChange` Apt.upgrade & Apt.unattendedUpgrades @@ -565,6 +567,7 @@ standardSystemUnhardened :: DebianSuite -> Architecture -> Motd -> Property (Has standardSystemUnhardened suite arch motd = propertyList "standard system" $ props & osDebian suite arch & Hostname.sane + & Hostname.mailname & Hostname.searchDomain & Locale.available "en_US.UTF-8" & File.hasContent "/etc/motd" ("":motd++[""]) -- cgit v1.2.3