diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-09 14:22:42 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-09 14:22:42 -0400 |
| commit | 9d06d2f835143c308bc409b7dc737c4292d9bc72 (patch) | |
| tree | fb151d5e2563953807432ccc85f90d414efe6b2e /src/Propellor/Property/Hostname.hs | |
| parent | 36eec4e2ea9fd22973dfb492363b407f1bcf621a (diff) | |
| parent | 2e2438ae66490a2a00972be16e95f0d9cda2f9ea (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Hostname.hs')
| -rw-r--r-- | src/Propellor/Property/Hostname.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/Hostname.hs b/src/Propellor/Property/Hostname.hs index 4a5e77d3..f1709d4d 100644 --- a/src/Propellor/Property/Hostname.hs +++ b/src/Propellor/Property/Hostname.hs @@ -7,14 +7,14 @@ import Data.List -- | Ensures that the hostname is set using best practices. -- --- Configures `/etc/hostname` and the current hostname. +-- Configures </etc/hostname> and the current hostname. -- --- Configures `/etc/mailname` with the domain part of the 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 +-- </etc/hosts> is also configured, with an entry for 127.0.1.1, which is -- standard at least on Debian to set the FDQN. -- --- Also, the `/etc/hosts` 127.0.0.1 line is set to localhost. Putting any +-- Also, the </etc/hosts> 127.0.0.1 line is set to localhost. Putting any -- other hostnames there is not best practices and can lead to annoying -- messages from eg, apache. sane :: Property @@ -44,7 +44,7 @@ setTo hn = combineProperties desc go (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 +-- | 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) |