propellor spin

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

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