diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-12-05 17:53:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-05 17:53:32 -0400 |
| commit | 97a224b194b96184c7938de0bb1e1f423612ccbc (patch) | |
| tree | 7cc147c4726af8644510c07ba87597920f8301dc /src/Propellor/Property/Hostname.hs | |
| parent | 5c6a43c3b888242443d790efbc1f9282e4e5675c (diff) | |
| parent | 12548bae3d8feecce6a322162d91b827289ae824 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Hostname.hs')
| -rw-r--r-- | src/Propellor/Property/Hostname.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Property/Hostname.hs b/src/Propellor/Property/Hostname.hs index 4597b178..fcb88f59 100644 --- a/src/Propellor/Property/Hostname.hs +++ b/src/Propellor/Property/Hostname.hs @@ -45,10 +45,11 @@ setTo' extractdomain hn = combineProperties desc go [ Just $ "/etc/hostname" `File.hasContent` [basehost] , if null domain then Nothing - else Just $ trivial $ hostsline "127.0.1.1" [hn, basehost] - , Just $ trivial $ hostsline "127.0.0.1" ["localhost"] - , Just $ trivial $ check (not <$> inChroot) $ + else Just $ hostsline "127.0.1.1" [hn, basehost] + , Just $ hostsline "127.0.0.1" ["localhost"] + , Just $ check (not <$> inChroot) $ cmdProperty "hostname" [basehost] + `assume` NoChange , Just $ "/etc/mailname" `File.hasContent` [if null domain then hn else domain] ] |