summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2019-09-21 18:39:00 -0400
committerJoey Hess2019-09-21 18:39:00 -0400
commit9a51dbab6250893e913f725805b0d5897d574d65 (patch)
tree829b75ab840c9e642ce3a15857b6373aa6be0955
parentc45ba5209cdd83a2a618b84cf5ea912fa94fb746 (diff)
parentf2328f19a9be8f97d31625456ffbf6c7783d89ab (diff)
Merge branch 'joeyconfig'
-rw-r--r--doc/README.mdwn2
-rw-r--r--joeyconfig.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs4
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/README.mdwn b/doc/README.mdwn
index 76d05255..e2d51e68 100644
--- a/doc/README.mdwn
+++ b/doc/README.mdwn
@@ -26,7 +26,7 @@ and
and
[Docker](http://hackage.haskell.org/package/propellor/docs/Propellor-Property-Docker.html), etc.
-There is no special language as used in puppet, chef, ansible, etc.. just
+There is no special language as used in puppet, ansible, etc.. just
the full power of Haskell. Hopefully that power can be put to good use in
making declarative properties that are powerful, nicely idempotent, and
easy to adapt to a system's special needs!
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 12480126..b7ce7a44 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -308,7 +308,7 @@ kite = host "kite.kitenet.net" $ props
& JoeySites.kgbServer
& Systemd.nspawned ancientKitenet
- & Systemd.nspawned openidProvider
+ ! Systemd.nspawned openidProvider
& alias "podcatcher.kitenet.net"
& JoeySites.podcatcher
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 25bd780b..f8e261a5 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1038,10 +1038,10 @@ house user hosts ctx sshkey = propertyList "home automation" $ props
)
homerouterWifiInterfaceOld :: String
-homerouterWifiInterfaceOld = "wlx00c0ca82eb78" -- thinkpenguin wifi adapter
+homerouterWifiInterfaceOld = "wlx7cdd90400448"
homerouterWifiInterface :: String
-homerouterWifiInterface = "wlx7cdd90400448" -- small wifi dongle
+homerouterWifiInterface = "wlx7cdd90753b9f"
-- My home router, running hostapd and dnsmasq,
-- with eth0 connected to a satellite modem, and a fallback ppp connection.