From 399060ec845c61756522cf42d3dc541a3d178de2 Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Fri, 9 Nov 2018 14:40:29 +0100
Subject: [PATCH] Add ddhcpd configuration directly to site.conf Bump sargon,
new roamguide, ddhcpd arp test
---
modules | 4 ++--
site.conf | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules b/modules
index ab88e4c..d5a6707 100644
--- a/modules
+++ b/modules
@@ -10,8 +10,8 @@ PACKAGES_FFKI_COMMIT=f21206db8c8f6362eb40609ff92f1e6713236c4b
PACKAGES_FFKI_BRANCH=2018.1.x
# ddhcpd and roamguide
-PACKAGES_SARGON_REPO=https://github.com/Freifunk-Nord/gluon-sargon
-PACKAGES_SARGON_COMMIT=893b894a57c34aa2deb847d091c963b84c4c7879
+PACKAGES_SARGON_REPO=https://github.com/sargon/gluon-sargon.git
+PACKAGES_SARGON_COMMIT=70ac2f698b9e358494cabefa9f85fc48598848f8
PACKAGES_SARGON_BRANCH=v2018.x
# gluon-quickfix
diff --git a/site.conf b/site.conf
index aa45e4e..531427a 100644
--- a/site.conf
+++ b/site.conf
@@ -66,6 +66,7 @@
},
ddhcpd = {
+ enabled = false,
range = "10.187.220.0/22",
broadcast = "10.187.255.255"
},
--
GitLab