summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Hostname.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor/Property/Hostname.hs')
-rw-r--r--src/Propellor/Property/Hostname.hs24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/Propellor/Property/Hostname.hs b/src/Propellor/Property/Hostname.hs
index 1cce4e60..c489e2fb 100644
--- a/src/Propellor/Property/Hostname.hs
+++ b/src/Propellor/Property/Hostname.hs
@@ -3,10 +3,14 @@ module Propellor.Property.Hostname where
import Propellor
import qualified Propellor.Property.File as File
+import Data.List
+
-- | Ensures that the hostname is set using best practices.
--
-- Configures /etc/hostname and the current hostname.
--
+-- Configures /etc/mailname with the domain part of the hostname.
+--
-- /etc/hosts is also configured, with an entry for 127.0.1.1, which is
-- standard at least on Debian to set the FDQN.
--
@@ -29,6 +33,8 @@ setTo hn = combineProperties desc go
else Just $ trivial $ hostsline "127.0.1.1" [hn, basehost]
, Just $ trivial $ hostsline "127.0.0.1" ["localhost"]
, Just $ trivial $ cmdProperty "hostname" [basehost]
+ , Just $ "/etc/mailname" `File.hasContent`
+ [if null domain then hn else domain]
]
hostsline ip names = File.fileProperty desc
@@ -37,3 +43,21 @@ setTo hn = combineProperties desc go
addhostsline ip names ls =
(ip ++ "\t" ++ (unwords names)) : filter (not . hasip ip) ls
hasip ip l = headMaybe (words l) == Just ip
+
+-- | Makes /etc/resolv.conf contain search and domain lines for
+-- the domain that the hostname is in.
+searchDomain :: Property
+searchDomain = property desc (ensureProperty . go =<< asks hostName)
+ where
+ desc = "resolv.conf search and domain configured"
+ go hn =
+ let (_basehost, domain) = separate (== '.') hn
+ in File.fileProperty desc (use domain) "/etc/resolv.conf"
+ use domain ls = filter wanted $ nub (ls ++ cfgs)
+ where
+ cfgs = ["domain " ++ domain, "search " ++ domain]
+ wanted l
+ | l `elem` cfgs = True
+ | "domain " `isPrefixOf` l = False
+ | "search " `isPrefixOf` l = False
+ | otherwise = True