From 96144fa435a8c35e9861ecba47a786287b2bacf9 Mon Sep 17 00:00:00 2001 From: Martin Geno Date: Sat, 1 Jul 2017 17:45:51 +0200 Subject: [PATCH] enable default packages --- modules | 2 +- site.conf | 12 +++++++++--- site.mk | 14 +++++++++----- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/modules b/modules index 688027a..84751a2 100644 --- a/modules +++ b/modules @@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffhb' PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_BRANCH=develop -PACKAGES_FFHB_COMMIT=c5729e0c31c28598e6f9851c0ecfc70f98ccef9e +PACKAGES_FFHB_COMMIT=3f5ac9ad456189bbc274758344424e68367f4b68 diff --git a/site.conf b/site.conf index a24006c..dc9716e 100755 --- a/site.conf +++ b/site.conf @@ -11,10 +11,10 @@ site_code = 'breminale', site_seed = '48a9de099ffe3b2d4410955afd65c33edec2f109a638393b9ee66d837f12c514', - babel_mesh = { prefix = '2a00:C380:DEAD:7338::/64', }, - mesh_on_wan = true, -- breminale spezifisch - vxlan_id = 4123, + babel_mesh = { prefix = '2a00:C380:DEAD:7338::/64', }, + mesh_on_lan = true, -- breminale spezifisch poe_passthrough = true, + vxlan_id = 4123, prefix4 = '10.43.0.0/16', prefix6 = '2a00:C380:DEAD:7337::/64', @@ -52,7 +52,13 @@ }, }, + dns = { + cacheentries = 5000, + servers = { '2001:db8::1', }, + }, + next_node = { + name = 'node.ffhb.de', ip4 = '10.43.0.127', ip6 = '2a00:C380:DEAD:7337::127', mac = '16:41:95:40:f7:dc', diff --git a/site.mk b/site.mk index d5618d8..b8f4ced 100755 --- a/site.mk +++ b/site.mk @@ -7,13 +7,17 @@ GLUON_SITE_PACKAGES := \ gluon-respondd-lldp \ gluon-client-bridge \ gluon-radvd \ - gluon-authorized-keys \ - ffhb-breminale \ - ip-tiny \ + gluon-neighbour-info \ + gluon-node-info \ + gluon-speedtest \ + gluon-status-page \ + iputils-ping6 \ iwinfo \ iptables \ - reghack \ - haveged + haveged \ + gluon-authorized-keys \ + ffhb-breminale \ + reghack # Variables set with ?= can be overwritten from the command line GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))