summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 8e3f1fbb..c132fa78 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1083,16 +1083,19 @@ homeRouter = propertyList "home router" $ props
]
`onChange` Service.restarted "dnsmasq"
& ipmasq homerouterWifiInterface
- -- Used to bring down eth0 when satellite is off, which causes ppp
- -- to start, but I am not using this currently.
- & Apt.removed ["netplug"]
& Network.static' "eth0" (IPv4 "192.168.1.100")
(Just (Network.Gateway (IPv4 "192.168.1.1")))
-- When satellite is down, fall back to dialup
[ ("pre-up", "poff -a || true")
, ("post-down", "pon")
+ -- ethernet autonegotiation with satellite receiver
+ -- sometimes fails
+ , ("ethernet-autoneg", "off")
+ , ("link-speed", "100")
+ , ("link-duplex", "full")
]
`requires` Network.cleanInterfacesFile
+ `requires` Apt.installed ["ethtool"]
& Apt.installed ["ppp"]
`before` File.hasContent "/etc/ppp/peers/provider"
[ "user \"joeyh@arczip.com\""