summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 00:11:24 -0400
committerJoey Hess2014-04-04 00:11:24 -0400
commit3aff9915532ae7256deb982e9c8d05e174249a32 (patch)
tree0e0e6aa37cb474e466cf6e0943503224b09dd66d
parent2231fce6bfdf7dd164490d81e75c236fde87c7da (diff)
propellor spin
-rw-r--r--Propellor/Property/Hostname.hs2
-rw-r--r--config-joeyh.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Propellor/Property/Hostname.hs b/Propellor/Property/Hostname.hs
index f710df70..26635374 100644
--- a/Propellor/Property/Hostname.hs
+++ b/Propellor/Property/Hostname.hs
@@ -10,7 +10,7 @@ import qualified Propellor.Property.File as File
-- 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).
set :: HostName -> Property
-set hostname = propertyList desc go
+set hostname = combineProperties desc go
`onChange` cmdProperty "hostname" [host]
where
desc = "hostname " ++ hostname
diff --git a/config-joeyh.hs b/config-joeyh.hs
index 6f8b75c2..e4a9dcac 100644
--- a/config-joeyh.hs
+++ b/config-joeyh.hs
@@ -45,7 +45,7 @@ host hostname@"orca.kitenet.net" = standardSystem Unstable $ props
& Docker.configured
& Apt.buildDep ["git-annex"]
& Docker.docked container hostname "amd64-git-annex-builder"
- ! Docker.docked container hostname "i386-git-annex-builder"
+ & Docker.docked container hostname "i386-git-annex-builder"
& Docker.garbageCollected
-- My laptop
host _hostname@"darkstar.kitenet.net" = Just $ props