summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2017-07-26 23:49:04 -0400
committerJoey Hess2017-07-26 23:49:04 -0400
commit24fe88f64069bd7463cb49d923a36abadae8a127 (patch)
tree8de26302edf4b7618ccafbc554b9603ea4479d76 /joeyconfig.hs
parent2f277014efb5716cba54047f8b171b2018b41f97 (diff)
Added Network.dhcp' and Network.static', which allow specifying additional options for interfaces files.
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs10
1 files changed, 7 insertions, 3 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 2dce2940..c0f4f4db 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -202,9 +202,6 @@ honeybee = host "honeybee.kitenet.net" $ props
& Apt.serviceInstalledRunning "ntp"
-- Home router
- & Network.static "eth0" (IPv4 "192.168.1.42")
- (Just (Network.Gateway (IPv4 "192.168.1.1")))
- `requires` Network.cleanInterfacesFile
& Network.static "wlan0" (IPv4 "10.1.1.1") Nothing
`requires` Network.cleanInterfacesFile
& Apt.serviceInstalledRunning "hostapd"
@@ -232,6 +229,13 @@ honeybee = host "honeybee.kitenet.net" $ props
, "nameserver 8.8.4.4"
]
& JoeySites.ipmasq "wlan0"
+ & Network.static' "eth0" (IPv4 "192.168.1.42")
+ (Just (Network.Gateway (IPv4 "192.168.1.1")))
+ -- When satellite is down, fall back to dialup
+ [ ("pre-up", "poff -a || true")
+ , ("post-down", "pon")
+ ]
+ `requires` Network.cleanInterfacesFile
& Apt.installed ["ppp"]
`before` File.hasContent "/etc/ppp/peers/provider"
[ "user \"joeyh@arczip.com\""