From 1eae61a72a4b4636326d042cdf66d7cb94c7e708 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Aug 2019 11:35:10 -0400 Subject: Localdir.hasOriginUrl: Depend on Git.installed. * Localdir.hasOriginUrl: Depend on Git.installed. * Localdir.hasOriginUrl: Type changed from UnixLike to DebianLike because Git.installed is not implemented for other unixes. (API change) This commit was sponsored by Denis Dzyubenko on Patreon. --- src/Propellor/Property/Localdir.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.3 From c97619e860a09606e56a3da27b4984ea329ef063 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Oct 2019 16:58:15 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- src/Propellor/Property/SiteSpecific/JoeySites.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/joeyconfig.hs b/joeyconfig.hs index b7ce7a44..51eef24c 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -187,7 +187,7 @@ honeybee = host "honeybee.kitenet.net" $ props ) & JoeySites.cubieTruckOneWire & Systemd.persistentJournal - & Apt.installed ["firmware-atheros"] + & Apt.installed ["firmware-misc-nonfree"] -- wifi & Apt.serviceInstalledRunning "ntp" -- no hardware clock & bootstrappedFrom GitRepoOutsideChroot & Ssh.hostKeys hostContext diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index f8e261a5..17279ee1 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1037,11 +1037,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. -- cgit v1.2.3