Compare commits

..

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

4 changed files with 25 additions and 27 deletions

View File

@ -27,7 +27,7 @@ msgstr ""
"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein " "Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein "
"Knoten sich verbindet.</p>" "Knoten sich verbindet.</p>"
"<div class=\"the-key\">" "<div class=\"the-key\">"
" # <%= pcdata(hostname) %>" " # <%= escape(hostname) %>"
" <br/>" " <br/>"
"<%= pubkey %>" "<%= pubkey %>"
"</div>" "</div>"

View File

@ -24,7 +24,7 @@ msgstr ""
"<a href=\"mailto:keys@freifunk-prignitz.de\">keys@freifunk-prignitz.de</a>." "<a href=\"mailto:keys@freifunk-prignitz.de\">keys@freifunk-prignitz.de</a>."
"After sending the mail it can take a few hours until your node gets connected.</p>" "After sending the mail it can take a few hours until your node gets connected.</p>"
"<div class=\"the-key\">" "<div class=\"the-key\">"
" # <%= pcdata(hostname) %>" " # <%= escape(hostname) %>"
" <br/>" " <br/>"
"<%= pubkey %>" "<%= pubkey %>"
"</div>" "</div>"

View File

@ -40,11 +40,9 @@
ip6 = 'fde8:21c6:370b::1', ip6 = 'fde8:21c6:370b::1',
mac = '16:41:95:40:f7:dc' mac = '16:41:95:40:f7:dc'
}, },
mesh_vpn = { fastd_mesh_vpn = {
enabled = true,
mtu = 1426,
fastd = {
methods = { 'salsa2012+umac' }, methods = { 'salsa2012+umac' },
mtu = 1426,
groups = { groups = {
backbone = { backbone = {
limit = 1, limit = 1,
@ -63,7 +61,6 @@
} }
} }
} }
}
}, },
bandwidth_limit = { bandwidth_limit = {
enabled = false, enabled = false,

13
site.mk
View File

@ -12,11 +12,12 @@ GLUON_SITE_PACKAGES := \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-ebtables-segment-mld \ gluon-ebtables-segment-mld \
gluon-web-admin \ gluon-luci-admin \
gluon-web-autoupdater \ gluon-luci-autoupdater \
gluon-web-network \ gluon-luci-portconfig \
gluon-web-wifi-config \ gluon-luci-wifi-config \
gluon-web-node-role \ gluon-luci-node-role \
gluon-next-node \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \ gluon-setup-mode \
@ -102,7 +103,7 @@ GLUON_SITE_PACKAGES += \
$(USB_PACKAGES_STORAGE) $(USB_PACKAGES_STORAGE)
endif endif
DEFAULT_GLUON_RELEASE := 0.9 DEFAULT_GLUON_RELEASE := 0.8.1
# 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)