diff options
| author | Joey Hess <joey@kitenet.net> | 2014-05-29 14:29:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-29 14:29:34 -0400 |
| commit | 2b77ee8e106abd5fbcaf8d5cd4719057a8d28a67 (patch) | |
| tree | c1a3620607a70a8912ade76a024ab47fb11bbba2 /src/Propellor/Property/Hostname.hs | |
| parent | ed6457f7fb381e47426a023ef4e0c474bdab4b6b (diff) | |
| parent | ead04c65e06ed47a175624922582a33082585f6d (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Hostname.hs')
| -rw-r--r-- | src/Propellor/Property/Hostname.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Hostname.hs b/src/Propellor/Property/Hostname.hs index 031abb9d..3859649e 100644 --- a/src/Propellor/Property/Hostname.hs +++ b/src/Propellor/Property/Hostname.hs @@ -13,7 +13,6 @@ sane = property ("sane hostname") (ensureProperty . setTo =<< getHostName) setTo :: HostName -> Property setTo hn = combineProperties desc go - `onChange` cmdProperty "hostname" [basehost] where desc = "hostname " ++ hn (basehost, domain) = separate (== '.') hn @@ -24,6 +23,7 @@ setTo hn = combineProperties desc go then Nothing else Just $ File.fileProperty desc addhostline "/etc/hosts" + , Just $ trivial $ cmdProperty "hostname" [basehost] ] hostip = "127.0.1.1" |