summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-03 23:35:36 -0400
committerJoey Hess2014-04-03 23:35:36 -0400
commitfbc57d684509180f518c84469c45e2d85bb20708 (patch)
treed1d431e0685019b85f0efe05ecc074a74a32afb7
parentff49cf562c3761993a22ea6fe6904325a1e53d33 (diff)
propellor spin
-rw-r--r--Propellor/Property/Docker/Shim.hs2
-rw-r--r--Propellor/Property/Hostname.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/Propellor/Property/Docker/Shim.hs b/Propellor/Property/Docker/Shim.hs
index 402f1c12..a210e162 100644
--- a/Propellor/Property/Docker/Shim.hs
+++ b/Propellor/Property/Docker/Shim.hs
@@ -40,7 +40,7 @@ setup propellorbin dest = do
return shim
file :: FilePath -> FilePath -> FilePath
-file propellorbin dest = dest </> propellorbin
+file propellorbin dest = dest </> takeFileName propellorbin
installFile :: FilePath -> FilePath -> IO ()
installFile top f = do
diff --git a/Propellor/Property/Hostname.hs b/Propellor/Property/Hostname.hs
index f5aa5da7..a2e3c7c6 100644
--- a/Propellor/Property/Hostname.hs
+++ b/Propellor/Property/Hostname.hs
@@ -10,3 +10,5 @@ set :: HostName -> Property
set hostname = "/etc/hostname" `File.hasContent` [hostname]
`onChange` cmdProperty "hostname" [hostname]
`describe` ("hostname " ++ hostname)
+ where
+ (host, domain) = separate (== '.') hostname