ffhb/gluon-site-ffhb
ffhb
/
gluon-site-ffhb
mirror of https://github.com/FreifunkBremen/gluon-site-ffhb.git
1
1
Fork 0
Code Issues Releases Wiki Activity

try to get clat on gluon

This commit is contained in:
Martin/Geno 2019-08-27 23:19:37 +02:00
parent 13ae12d132
commit 488b721b23
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gluon

@ -1 +1 @@
Subproject commit cd05007adf42c199673c971cf7f389c955d2be02 Subproject commit f704458cfb58c30eee8c67d7bd7840d1e40cf1d8

11
modules
View File

@ -1,11 +1,16 @@
GLUON_SITE_FEEDS='ffhb ffffmpackages' GLUON_SITE_FEEDS='ffhb christfddhcp ffffmpackages'
PACKAGES_GLUON_REPO=git://github.com/genofire/gluon-packages.git PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_BRANCH=master PACKAGES_GLUON_BRANCH=master
PACKAGES_GLUON_COMMIT=227cf16d90a72af3b0f3c69f16ef79e49bbcf12f PACKAGES_GLUON_COMMIT=89260206971f1716c256a75324651dca52d0211a
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
PACKAGES_CHRISTFDDHCP_REPO=https://github.com/christf/gluon-sargon.git
PACKAGES_CHRISTFDDHCP_COMMIT=d81a81af9f593dfd6aa5f7afbdb076c7c144c901
PACKAGES_CHRISTFDDHCP_BRANCH=bump
PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
PACKAGES_FFFFMPACKAGES_COMMIT=b0cd16ee80fa8c093b1c6a5b442f7e81b9d85e42 PACKAGES_FFFFMPACKAGES_COMMIT=b0cd16ee80fa8c093b1c6a5b442f7e81b9d85e42

4
site.conf
View File

@ -6,7 +6,9 @@
node_prefix6 = '2a06:8782:ffbb:bab0::/64', node_prefix6 = '2a06:8782:ffbb:bab0::/64',
prefix6 = '2a06:8782:ffbb:bab1::/64', prefix6 = '2a06:8782:ffbb:bab1::/64',
node_client_prefix6 = 'fd2f:5119:f2c::/64', -- just magic ula, if routed to legacy network node_client_prefix6 = 'fd2f:5119:f2c::/64', -- infrastructure net (ULA) for node-client-ip addresses
clat_range = 'fdff:ffff:ffff::/48', -- infrastructure net (ULA) from which a /96 clat prefix will be generated.
plat_range = 'fdff:ffff:fffe::/48', -- infrastructure net (ULA) from which a /96 plat prefix will be generated.
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = { ntp_servers = {

10
site.mk
View File

@ -25,7 +25,10 @@ GLUON_SITE_PACKAGES := \
iwinfo \ iwinfo \
iptables \ iptables \
gluon-iptables-clamp-mss-to-pmtu \ gluon-iptables-clamp-mss-to-pmtu \
babeldev babeldev \
haveged \
gluon-xlat464-clat \
gluon-ddhcpd
# Allow overriding the these variables from the command line # Allow overriding the these variables 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=+))
@ -34,7 +37,7 @@ GLUON_PRIORITY ?= 0
GLUON_LANGS ?= en de GLUON_LANGS ?= en de
GLUON_REGION ?= eu GLUON_REGION ?= eu
GLUON_WLAN_MESH ?= 11s GLUON_WLAN_MESH ?= 11s
GLUON_DEPRECATED ?= 0
# Debug packages # Debug packages
DEBUG_PACKAGES := \ DEBUG_PACKAGES := \
@ -43,6 +46,5 @@ DEBUG_PACKAGES := \
# x86-64 # x86-64
ifeq ($(GLUON_TARGET),x86-64) ifeq ($(GLUON_TARGET),x86-64)
GLUON_SITE_PACKAGES += \ GLUON_SITE_PACKAGES += \
$(DEBUG_PACKAGES) \ $(DEBUG_PACKAGES)
haveged
endif endif