Commit d1c7571c authored by Neal Oakey's avatar Neal Oakey
Browse files

Bugfixes + PR #11 changes

parent db13e276
......@@ -2,7 +2,7 @@
## fastd or l2tp firmware
Use the environment variable VPN_TYPE to choose whether you want to create fastd or l2tp firmware.
Set the environment variable `VPN_TYPE` to choose whether you want to create fastd or l2tp firmware.
If unset fastd firmware is built.
```
export VPN_TYPE=fastd
......
......@@ -23,8 +23,8 @@
channel = 5,
ap = {
ssid = 'Freifunk',
owe_ssid = 'Freifunk-OWE',
owe_transition_mode = true,
-- owe_ssid = 'Freifunk-OWE',
-- owe_transition_mode = true,
},
mesh = {
id = 'fe:fe:5b:ad:be:ef',
......@@ -35,7 +35,7 @@
wifi5 = {
channel = 44,
htmode = 'HT40',
htmode = 'HT40+',
ap = {
ssid = 'Freifunk',
owe_ssid = 'Freifunk-OWE',
......@@ -50,9 +50,9 @@
dns = {
servers = {
2a03:2260:116::2,
2a03:2260:116::3,
2a03:2260:116::4,
'2a03:2260:116::2',
'2a03:2260:116::3',
'2a03:2260:116::4',
},
},
......@@ -87,8 +87,7 @@
},
mesh_vpn = {
-- upgrade to 1370 would be good https://gluon.readthedocs.io/en/latest/user/faq.html#faq-mtu
-- tunneldigger uses 1364, but setting 1320 here does not seem to affect performance
-- mtu: an upgrade to 1370 would be good https://gluon.readthedocs.io/en/latest/user/faq.html#faq-mtu
mtu = 1320,
enabled = true,
fastd = {
......
# default to fastd
# If variable VPN_TYPE is unset default to "fastd"
VPN_TYPE ?= fastd
# Specify Gluon features/packages to enable;
# Gluon will automatically enable a set of packages
# depending on the combination of features listed
GLUON_FEATURES := \
autoupdater \
config-mode-geo-location-osm \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
ebtables-limit-arp \
......@@ -11,32 +13,38 @@ GLUON_FEATURES := \
iptables-clamp-mss-to-pmtu \
mesh-batman-adv-15 \
mesh-wireless-sae \
radv-filterd \
respondd \
ssid-changer \
status-page \
radv-filterd \
web-advanced \
web-private-wifi \
web-wizard \
wireless-encryption-wpa3
# Support for L2TP
ifeq ($(VPN_TYPE),l2tp)
# support for l2tp
GLUON_FEATURES += \
mesh-vpn-tunneldigger
GLUON_BRANCH := stable_l2tp
else
# support for fastd
endif
# Support for fastd
ifeq ($(VPN_TYPE),fastd)
GLUON_FEATURES += \
mesh-vpn-fastd \
web-mesh-vpn-fastd
GLUON_BRANCH := stable
endif
GLUON_FEATURES_tiny := \
-config-mode-geo-location-osm \
-web-private-wifi
# GLUON_*_standard is for adding features/packages to devices with more than 7 MB flash / 32 MB RAM
GLUON_FEATURES_standard := \
config-mode-geo-location-osm \
web-private-wifi
# Specify additional Gluon/OpenWrt packages to include here;
# A minus sign may be prepended to remove a packages from the
# selection that would be enabled by default or due to the
# chosen feature flags
GLUON_SITE_PACKAGES_standard := \
ca-bundle \
curl \
......@@ -53,11 +61,11 @@ GLUON_SITE_PACKAGES += \
pciutils
endif
GLUON_DEPRECATED := full
GLUON_DEPRECATED ?= full
GLUON_PRIORITY := 3
GLUON_LANGS := de en
GLUON_WLAN_MESH := 11s
GLUON_REGION := eu
GLUON_COMMIT ?= $(shell git describe --tags | sed 's/\-g[a-f0-9]*$$//')
GLUON_RELEASE ?= $(GLUON_COMMIT)+$(shell git -C $(GLUON_SITEDIR) rev-list --count HEAD)
GLUON_RELEASE ?= $(GLUON_COMMIT)+$(shell git -C $(GLUON_SITEDIR) rev-list --count HEAD)-$(VPN_TYPE)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment