summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs6
2 files changed, 6 insertions, 1 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index e893917f..5c72e19b 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -185,6 +185,7 @@ honeybee = host "honeybee.kitenet.net" $ props
)
& JoeySites.cubieTruckOneWire
+ & Apt.installed ["firmware-atheros"]
& Apt.installed ["firmware-misc-nonfree"]
& Apt.installed ["firmware-brcm80211"]
-- Workaround for https://bugs.debian.org/844056
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 05b0b041..6087336d 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1034,12 +1034,16 @@ homePower user hosts ctx sshkey = propertyList "home power" $ props
rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/ joey@kitenet.net:/srv/web/homepower.joeyh.name/rrds/"
homerouterWifiInterface :: String
-homerouterWifiInterface = "wlx7cdd90400448" -- wifi dongle
+homerouterWifiInterface = "wlx00c0ca82eb78" -- thinkpenguin wifi adapter
+
+homerouterWifiInterfaceOld :: String
+homerouterWifiInterfaceOld = "wlx7cdd90400448" -- small wifi dongle
-- My home router, running hostapd and dnsmasq,
-- with eth0 connected to a satellite modem, and a fallback ppp connection.
homeRouter :: Property (HasInfo + DebianLike)
homeRouter = propertyList "home router" $ props
+ & File.notPresent (Network.interfaceDFile homerouterWifiInterfaceOld)
& Network.static homerouterWifiInterface (IPv4 "10.1.1.1") Nothing
`requires` Network.cleanInterfacesFile
& Apt.installed ["hostapd"]