Compare commits

..

No commits in common. "master" and "v0.10" have entirely different histories.

2 changed files with 7 additions and 14 deletions

View File

@ -2,10 +2,9 @@
hostname_prefix = 'helgo-', hostname_prefix = 'helgo-',
site_name = 'Freifunk Helgoland', site_name = 'Freifunk Helgoland',
site_code = 'helgo', site_code = 'helgo',
domain_seed = '34e135f273207a8085e4f08e4ac7d0e65302d9780f26b1640d66542d9e0d6323',
opkg = { opkg = {
openwrt = 'http://opkg.services.helgo/%n/%v/%S/packages', lede = 'http://opkg.services.helgo/%n/%v/%S/packages',
extra = { extra = {
modules = 'http://updates.helgoland.freifunk.net/stable/modules/gluon-%GS-%GR/%S', modules = 'http://updates.helgoland.freifunk.net/stable/modules/gluon-%GS-%GR/%S',
}, },
@ -50,14 +49,6 @@
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
mesh = {
vxlan = false,
batman_adv = {
gw_sel_class = 20,
routing_algo = 'BATMAN_IV',
},
},
mesh_vpn = { mesh_vpn = {
enabled = true, enabled = true,
mtu = 1406, mtu = 1406,

10
site.mk
View File

@ -4,12 +4,13 @@ GLUON_SITE_PACKAGES := \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-autoupdater \ gluon-config-mode-autoupdater \
gluon-config-mode-contact-info \ gluon-config-mode-contact-info \
gluon-config-mode-core \
gluon-config-mode-geo-location \ gluon-config-mode-geo-location \
gluon-config-mode-hostname \ gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \ gluon-config-mode-mesh-vpn \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-ebtables-limit-arp \ gluon-ebtables-segment-mld \
gluon-web-admin \ gluon-web-admin \
gluon-web-autoupdater \ gluon-web-autoupdater \
gluon-web-network \ gluon-web-network \
@ -19,21 +20,22 @@ GLUON_SITE_PACKAGES := \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-respondd \ gluon-respondd \
gluon-setup-mode \
gluon-status-page \ gluon-status-page \
iwinfo \ iwinfo \
iptables \ iptables \
haveged haveged
DEFAULT_GLUON_RELEASE := 0.11 DEFAULT_GLUON_RELEASE := 0.10
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
GLUON_PRIORITY ?= 2 GLUON_PRIORITY ?= 0
# Region code required for some images; supported values: us eu # Region code required for some images; supported values: us eu
GLUON_REGION ?= eu GLUON_REGION ?= eu
GLUON_WLAN_MESH ?= 11s GLUON_ATH10K_MESH ?= 11s
GLUON_LANGS ?= en de GLUON_LANGS ?= en de