summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2018-09-29 14:39:25 -0400
committerJoey Hess2018-09-29 14:39:25 -0400
commitb853c8a82361af7ee1a35c1e0ab0d5e627d2b029 (patch)
tree82945557ec1517a4be4827944db73eee5e6b4e04 /src/Propellor
parentc20b8ae4211fa95bb1832e30652a0461b9a23563 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index e9eb0d5e..33707aef 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1076,6 +1076,7 @@ homeRouter = propertyList "home router" $ props
[ "domain-needed"
, "bogus-priv"
, "interface=" ++ homerouterWifiInterface
+ , "interface=eth0"
, "domain=kitenet.net"
-- lease time is short because the homepower
-- controller wants to know when clients disconnect
@@ -1086,7 +1087,9 @@ homeRouter = propertyList "home router" $ props
]
`onChange` Service.restarted "dnsmasq"
& ipmasq homerouterWifiInterface
- & Apt.serviceInstalledRunning "netplug"
+ -- 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