summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2020-02-16 12:37:08 -0400
committerJoey Hess2020-02-16 12:37:08 -0400
commitfcb98514d3ba9f0c7a194017aca2e3257adcd43a (patch)
tree74f383e13b81465891336d95c2103f6044e87e00 /src
parent7bbca7f8340c59f24d4c2ebc69c4880163e9457f (diff)
parentaa41b17e6e28018c3b50e4ea13e913dadefe5fcf (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Bootstrap.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 6ca133cb..746cf54e 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -200,7 +200,7 @@ depsCommand bs msys = "( " ++ intercalate " ; " (go bs) ++ ") || true"
, "haskell-exceptions"
, "haskell-stm"
, "haskell-text"
- , "hashell-hashable"
+ , "haskell-hashable"
]
archlinuxdeps Stack =
[ "gnupg"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 623dc125..d6043517 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -936,7 +936,7 @@ house user hosts ctx sshkey = propertyList "home automation" $ props
user (userGroup user)
`requires` File.dirExists (takeDirectory sshkeyfile)
`requires` Ssh.knownHost hosts "kitenet.net" user
- & File.hasPrivContentExposed "/etc/darksky-forecast-url" anyContext
+ & File.hasPrivContentExposed "/etc/darksky-forecast-url" anyContext
where
d = "/home/joey/house"
sshkeyfile = d </> ".ssh/key"