summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2017-11-17 19:18:39 -0400
committerJoey Hess2017-11-17 19:20:02 -0400
commit15073fd5fc812941e2ab2d39d5950106fb3b7a98 (patch)
tree67cd99ea5be81eda68410417c8367e2b934249df /src/Propellor/Property/SiteSpecific/JoeySites.hs
parent5befa31942af20df03fa1d061de1cd05db0996f2 (diff)
fixed for bootstrapping honeybee from chroot
Install dnsmasq first to avoid connfile conflict Don't set up container when in chroot, won't work. Propellor should perhaps prevent this..
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 7812c855..6f04b187 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -965,22 +965,23 @@ homeRouter = propertyList "home router" $ props
, "channel=8"
]
`requires` File.dirExists "/lib/hostapd"
- & Apt.serviceInstalledRunning "dnsmasq"
- `requires` File.hasContent "/etc/dnsmasq.conf"
- [ "domain-needed"
- , "bogus-priv"
- , "interface=wlan0"
- , "domain=kitenet.net"
- , "dhcp-range=10.1.1.100,10.1.1.150,24h"
- , "no-hosts"
- , "address=/honeybee.kitenet.net/10.1.1.1"
- ]
- `requires` File.hasContent "/etc/resolv.conf"
- [ "domain kitenet.net"
- , "search kitenet.net"
- , "nameserver 8.8.8.8"
- , "nameserver 8.8.4.4"
- ]
+ & File.hasContent "/etc/resolv.conf"
+ [ "domain kitenet.net"
+ , "search kitenet.net"
+ , "nameserver 8.8.8.8"
+ , "nameserver 8.8.4.4"
+ ]
+ & Apt.installed ["dnsmasq"]
+ & File.hasContent "/etc/dnsmasq.conf"
+ [ "domain-needed"
+ , "bogus-priv"
+ , "interface=wlan0"
+ , "domain=kitenet.net"
+ , "dhcp-range=10.1.1.100,10.1.1.150,24h"
+ , "no-hosts"
+ , "address=/honeybee.kitenet.net/10.1.1.1"
+ ]
+ `onChange` Service.restarted "dnsmasq"
& ipmasq "wlan0"
& Apt.serviceInstalledRunning "netplug"
& Network.dhcp' "eth0"