summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-05-09 16:24:48 -0400
committerJoey Hess2018-05-09 16:24:48 -0400
commit7e0c47b2a6b490187dceab24cc44575017798a70 (patch)
tree5050a7310112ffcd5ab4d042072871571534ebaf
parent3a86f77bec6e47b1d1a07024f6f0a17e5255da9b (diff)
parent41c2492b93285a70c619609bc569cfe48e2535b5 (diff)
Merge branch 'joeyconfig'
l---------config.hs2
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
3 files changed, 3 insertions, 2 deletions
diff --git a/config.hs b/config.hs
index ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 1ce8204b..46c90449 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1042,7 +1042,7 @@ homeRouter = propertyList "home router" $ props
, "domain=kitenet.net"
-- lease time is short because the homepower
-- controller wants to know when clients disconnect
- , "dhcp-range=10.1.1.100,10.1.1.150,5m"
+ , "dhcp-range=10.1.1.100,10.1.1.150,10m"
, "no-hosts"
, "address=/honeybee.kitenet.net/10.1.1.1"
, "address=/house.kitenet.net/10.1.1.1"