summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2019-10-08 16:59:28 -0400
committerJoey Hess2019-10-08 16:59:28 -0400
commit09e97fa5f5e51b599b0ce9b263b82dd61fce0ba5 (patch)
tree587bfdbc0584d48f9766243618f1a69db2df9bb0 /src
parenta820c5c9ed876c70cf18c141cd6be471313dad65 (diff)
parentc97619e860a09606e56a3da27b4984ea329ef063 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Localdir.hs7
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs8
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Propellor/Property/Localdir.hs b/src/Propellor/Property/Localdir.hs
index 2323f569..69d9af74 100644
--- a/src/Propellor/Property/Localdir.hs
+++ b/src/Propellor/Property/Localdir.hs
@@ -9,6 +9,7 @@ import Propellor.Git.Config
import Propellor.Types.Info
import Propellor.Types.Container
import Propellor.Property.Mount (partialBindMountsOf, umountLazy)
+import qualified Propellor.Property.Git as Git
-- | Sets the url to use as the origin of propellor's git repository.
--
@@ -19,8 +20,10 @@ import Propellor.Property.Mount (partialBindMountsOf, umountLazy)
-- When hosts are being updated without using -- --spin, eg when using
-- the `Propellor.Property.Cron.runPropellor` cron job, this property can
-- be set to redirect them to a new git repository url.
-hasOriginUrl :: String -> Property (HasInfo + UnixLike)
-hasOriginUrl u = setInfoProperty p (toInfo (InfoVal (OriginUrl u)))
+hasOriginUrl :: String -> Property (HasInfo + DebianLike)
+hasOriginUrl u =
+ setInfoProperty p (toInfo (InfoVal (OriginUrl u)))
+ `requires` Git.installed
where
p :: Property UnixLike
p = property ("propellor repo url " ++ u) $ do
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 493a0ce5..83a7ac8d 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1040,11 +1040,11 @@ house user hosts ctx sshkey = propertyList "home automation" $ props
createSymbolicLink d "/var/www/html"
)
-homerouterWifiInterfaceOld :: String
-homerouterWifiInterfaceOld = "wlx7cdd90400448"
-
homerouterWifiInterface :: String
-homerouterWifiInterface = "wlx7cdd90753b9f"
+homerouterWifiInterface = "wlx9cefd5fcd6f3"
+
+homerouterWifiInterfaceOld :: String
+homerouterWifiInterfaceOld = "wlx7cdd90753b9f"
-- My home router, running hostapd and dnsmasq,
-- with eth0 connected to a satellite modem, and a fallback ppp connection.