enable default packages

This commit is contained in:
Martin Geno 2017-07-01 17:45:51 +02:00
parent 868c7e0628
commit 11249d581f
No known key found for this signature in database
GPG Key ID: F0D39A37E925E941
3 changed files with 15 additions and 9 deletions

View File

@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffhb'
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_BRANCH=develop PACKAGES_FFHB_BRANCH=develop
PACKAGES_FFHB_COMMIT=c5729e0c31c28598e6f9851c0ecfc70f98ccef9e PACKAGES_FFHB_COMMIT=3f5ac9ad456189bbc274758344424e68367f4b68

View File

@ -11,10 +11,10 @@
site_code = 'breminale', site_code = 'breminale',
site_seed = '48a9de099ffe3b2d4410955afd65c33edec2f109a638393b9ee66d837f12c514', site_seed = '48a9de099ffe3b2d4410955afd65c33edec2f109a638393b9ee66d837f12c514',
babel_mesh = { prefix = '2a00:C380:DEAD:7338::/64', }, babel_mesh = { prefix = '2a00:C380:DEAD:7338::/64', },
mesh_on_wan = true, -- breminale spezifisch mesh_on_lan = true, -- breminale spezifisch
vxlan_id = 4123,
poe_passthrough = true, poe_passthrough = true,
vxlan_id = 4123,
prefix4 = '10.43.0.0/16', prefix4 = '10.43.0.0/16',
prefix6 = '2a00:C380:DEAD:7337::/64', prefix6 = '2a00:C380:DEAD:7337::/64',
@ -53,6 +53,7 @@
}, },
next_node = { next_node = {
name = 'node.ffhb.de',
ip4 = '10.43.0.127', ip4 = '10.43.0.127',
ip6 = '2a00:C380:DEAD:7337::127', ip6 = '2a00:C380:DEAD:7337::127',
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',

15
site.mk
View File

@ -7,13 +7,18 @@ GLUON_SITE_PACKAGES := \
gluon-respondd-lldp \ gluon-respondd-lldp \
gluon-client-bridge \ gluon-client-bridge \
gluon-radvd \ gluon-radvd \
gluon-authorized-keys \ gluon-neighbour-info \
ffhb-breminale \ gluon-node-info \
ip-tiny \ gluon-speedtest \
gluon-status-page \
tcpdump \
iputils-ping6 \
iwinfo \ iwinfo \
iptables \ iptables \
reghack \ haveged \
haveged gluon-authorized-keys \
ffhb-breminale \
reghack
# Variables set with ?= can be overwritten from the command line # Variables set with ?= can be overwritten from the command line
GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+)) GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))