propellor spin

This commit is contained in:
Joey Hess 2014-04-14 15:17:31 -04:00
parent 3da26fbfa1
commit 0b5c5f7c9a
Failed to extract signature
1 changed files with 8 additions and 4 deletions

View File

@ -4,11 +4,12 @@ import Propellor
import qualified Propellor.Property.File as File import qualified Propellor.Property.File as File
-- | Ensures that the hostname is set to the HostAttr value. -- | Ensures that the hostname is set to the HostAttr value.
-- Configures both /etc/hostname and the current hostname. -- Configures /etc/hostname and the current hostname.
-- --
-- When the hostname is a FQDN, also configures /etc/hosts, -- When the hostname is a FQDN, also configures /etc/mailname
-- with an entry for 127.0.1.1, which is standard at least on Debian -- with the domain part.
-- to set the FDQN (127.0.0.1 is localhost). -- A FQDN also configures /etc/hosts, with an entry for 127.0.1.1, which is
-- standard at least on Debian to set the FDQN (127.0.0.1 is localhost).
sane :: Property sane :: Property
sane = Property ("sane hostname") (ensureProperty . setTo =<< getHostName) sane = Property ("sane hostname") (ensureProperty . setTo =<< getHostName)
@ -25,6 +26,9 @@ setTo hn = combineProperties desc go
then Nothing then Nothing
else Just $ File.fileProperty desc else Just $ File.fileProperty desc
addhostline "/etc/hosts" addhostline "/etc/hosts"
, if null domain
then Nothing
else Just $ "/etc/mailname" `File.hasContent` [domain]
] ]
hostip = "127.0.1.1" hostip = "127.0.1.1"