Skip to content
Snippets Groups Projects
Commit 15a9dd46 authored by Tarnatos's avatar Tarnatos
Browse files

LEDE: L2TP Support

parent 7b29d5e8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules
+ 5
− 25
View file @ 15a9dd46
# This file allows specifying additional repositories to use
# when building gluon.
GLUON_SITE_FEEDS='ffki eulenfunk ssidchanger roamguide'
GLUON_SITE_FEEDS='ffrl_packages'
# the git repository from where to clone the package feed
PACKAGES_FFKI_REPO=git://github.com/freifunk-kiel/ffki-packages.git
PACKAGES_EULENFUNK_REPO=https://github.com/Freifunk-Nord/eulenfunk-packages
PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git
#ROAMGUID from GitHub Fork
PACKAGES_ROAMGUIDE_REPO=https://github.com/Freifunk-Nord/roamguide
#PACKAGES_ROAMGUIDE_REPO=https://git.toppoint.de/sargon/roamguide
# for roamguide:
#GIT_SSL_NO_VERIFY=true git clone https://git.toppoint.de/sargon/roamguide
#cd roamguide
#git config http.sslVerify false
# the version/commit of the git repository to clone
PACKAGES_FFKI_COMMIT=5ba5aaf73aab4937978ad98150518e0d1f32d611
PACKAGES_EULENFUNK_COMMIT=e3196e8d2ed07849441c38de8a644123354e7243
PACKAGES_SSIDCHANGER_COMMIT=2550af343202746ac6be9ce9b719cb1caa672d82
PACKAGES_ROAMGUIDE_COMMIT=cc8253d6dd62cd6ba4f04506711edd0705dc5532
# the branch to check out
PACKAGES_FFKI_BRANCH=master
PACKAGES_EULENFUNK_BRANCH=v2016.2
PACKAGES_SSIDCHANGER_BRANCH=master
PACKAGES_ROAMGUIDE_BRANCH=master
#FFRL Packages
PACKAGES_FFRL_PACKAGES_REPO=https://github.com/ffrl/ffrl-packages.git
PACKAGES_FFRL_PACKAGES_COMMIT=434f2181290b129bdfbb09ca16e1d9696c8327be
PACKAGES_FFRL_PACKAGES_BRANCH=master
site.conf
+ 14
− 215
View file @ 15a9dd46
......@@ -4,9 +4,9 @@
site_code = 'ffnord',
opkg = {
lede = 'http://[2a03:2267:4e6f:7264::fd00]/lede/snapshots/packages/%A',
lede = 'http://[2a03:2267:4e6f:7264::fd99]/lede/snapshots/packages/%A',
extra = {
gluon = 'http://[2a03:2267:4e6f:7264::fd00]/packages/gluon-%GS-%GR/%S',
gluon = 'http://[2a03:2267:4e6f:7264::fd99]/packages/gluon-%GS-%GR/%S',
},
},
......@@ -15,22 +15,7 @@
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {
'2a03:2267:4e6f:7264::fd00',
'2a03:2267:4e6f:7264::fd01',
'2a03:2267:4e6f:7264::fd02',
'2a03:2267:4e6f:7264::fd03',
'2a03:2267:4e6f:7264::fd04',
'2a03:2267:4e6f:7264::fd05',
'2a03:2267:4e6f:7264::fd06',
'2a03:2267:4e6f:7264::fd07',
'2a03:2267:4e6f:7264::fd08',
'2a03:2267:4e6f:7264::fd09',
'2a03:2267:4e6f:7264::fd10',
'2a03:2267:4e6f:7264::fd11',
'2a03:2267:4e6f:7264::fd12',
'2a03:2267:4e6f:7264::fd13',
'2a03:2267:4e6f:7264::fd14',
'2a03:2267:4e6f:7264::fd15',
'2a03:2267:4e6f:7264::fd99',
},
regdom = 'DE',
......@@ -78,22 +63,7 @@
dns = {
cacheentries = 5000,
servers = {
'2a03:2267:4e6f:7264::fd00',
'2a03:2267:4e6f:7264::fd01',
'2a03:2267:4e6f:7264::fd02',
'2a03:2267:4e6f:7264::fd03',
'2a03:2267:4e6f:7264::fd04',
'2a03:2267:4e6f:7264::fd05',
'2a03:2267:4e6f:7264::fd06',
'2a03:2267:4e6f:7264::fd07',
'2a03:2267:4e6f:7264::fd08',
'2a03:2267:4e6f:7264::fd09',
'2a03:2267:4e6f:7264::fd10',
'2a03:2267:4e6f:7264::fd11',
'2a03:2267:4e6f:7264::fd12',
'2a03:2267:4e6f:7264::fd13',
'2a03:2267:4e6f:7264::fd14',
'2a03:2267:4e6f:7264::fd15',
'2a03:2267:4e6f:7264::fd99',
},
},
......@@ -104,86 +74,15 @@
mac = '36:f4:54:fc:e5:22'
},
mesh_vpn = {
tunneldigger_mesh_vpn = {
enabled = true,
mtu = 1280,
fastd = {
methods = {'salsa2012+umac'},
-- configurable = true,
-- syslog_level = 'warn',
groups = {
backbone = {
limit = 1,
peers = {
ffnord_vpn0 = {
key = '3dd48007765a0392244df2f3b627c487bae1269d242278140ab6caac1e5f5f34',
remotes = {'ipv4 "vpn0.freifunknord.de" port 10050','ipv6 "vpn0.freifunknord.de" port 10050'},
},
ffnord_vpn1 = {
key = '552e490f8b3392a8f92b20ad66134a3b6ed298bb22ee72a3bb9685ce4da06216',
remotes = {'ipv4 "vpn1.freifunknord.de" port 10050', 'ipv6 "vpn1.freifunknord.de" port 10050'},
},
ffnord_vpn2 = {
key = 'fe534908794ab69e3c12a109fdaf723b5857ad76bd214220a08fc7cd245df4f8',
remotes = {'ipv4 "vpn2.freifunknord.de" port 10050', 'ipv6 "vpn2.freifunknord.de" port 10050'},
},
ffnord_vpn3 = {
key = '51cb55fac596f8bdcaddc721d2390d44ef8d9ef0ff0c9152a44b8bd823207909',
remotes = {'ipv4 "vpn3.freifunknord.de" port 10050', 'ipv6 "vpn3.freifunknord.de" port 10050'},
},
ffnord_vpn4 = {
key = '2bd5bb1f45f76b0c43d3ba145b162d4d08960b12f968e5a7abeb2b3400b64d05',
remotes = {'ipv4 "vpn4.freifunknord.de" port 10050', 'ipv6 "vpn4.freifunknord.de" port 10050'},
},
ffnord_vpn5 = {
key = '766c2380bb1118ccd7132ad0588a65f20242c9d1995869c1509b0e91f1fc79e0',
remotes = {'ipv4 "vpn5.freifunknord.de" port 10050', 'ipv6 "vpn5.freifunknord.de" port 10050'},
},
ffnord_vpn6 = {
key = '734913882d3592603d1c704d4e4133c12606192ebd1a49429e7d980a2ca121d0',
remotes = {'ipv4 "vpn6.freifunknord.de" port 10050', 'ipv6 "vpn6.freifunknord.de" port 10050'},
},
ffnord_vpn7 = {
key = '6c35f366d430a6637cf5696fee2806b70ea4a3b3dfba2cb0e576b3ef4a77a7be',
remotes = {'ipv4 "vpn7.freifunknord.de" port 10050', 'ipv6 "vpn7.freifunknord.de" port 10050'},
},
ffnord_vpn8 = {
key = '9d6bf926071340171cc8a692c9a858e482a4368856dcb63e095e393049b8d6fd',
remotes = {'ipv4 "vpn8.freifunknord.de" port 10050', 'ipv6 "vpn8.freifunknord.de" port 10050'},
},
ffnord_vpn9 = {
key = '3b09482cee91e08839c1bfcca5a1135583c03817b1e8ff52019902faef7e2f28',
remotes = {'ipv4 "vpn9.freifunknord.de" port 10050', 'ipv6 "vpn9.freifunknord.de" port 10050'},
},
ffnord_vpn10 = {
key = 'a326197364109a3a7bfc9344e19da9277734989bc06d930617e00206feb6a065',
remotes = {'ipv4 "vpn10.freifunknord.de" port 10050', 'ipv6 "vpn10.freifunknord.de" port 10050'},
},
ffnord_vpn11 = {
key = '9ab17517450a52d1eac521a6ae4e696cf7861c3e55cd63acf0a94e85cb3e5172',
remotes = {'ipv4 "vpn11.freifunknord.de" port 10050', 'ipv6 "vpn11.freifunknord.de" port 10050'},
},
ffnord_vpn12 = {
key = 'bec4e95be17044ead0e1926b58cafc0d2cca9df3eb7a836234e886f3b51679f9',
remotes = {'ipv4 "vpn12.freifunknord.de" port 10050', 'ipv6 "vpn12.freifunknord.de" port 10050'},
},
ffnord_vpn13 = {
key = '1eeabc7534bed144c30b6d62f9cefd2e0b54607ac4c2ac1343c5153bceb01ab1',
remotes = {'ipv4 "vpn13.freifunknord.de" port 10050', 'ipv6 "vpn13.freifunknord.de" port 10050'},
},
ffnord_vpn14 = {
key = '5c7930f1fc37ceca6c921c13bed8010e4bada7e422aa69ad195c24f92c12f679',
remotes = {'ipv4 "vpn14.freifunknord.de" port 10050', 'ipv6 "vpn14.freifunknord.de" port 10050'},
},
ffnord_vpn15 = {
key = 'ae5bfc856ffc779bd766619aa24242890539495bdac03bf28405e41ba087b9a8',
remotes = {'ipv4 "vpn15.freifunknord.de" port 10050', 'ipv6 "vpn15.freifunknord.de" port 10050'},
},
},
},
mtu = 1364,
brokers = {'217.182.94.146:10060'},
bandwidth_limit = {
enabled = false,
ingress = 3000,
egress = 200,
},
},
},
bandwidth_limit = {
......@@ -193,27 +92,12 @@
},
autoupdater = {
branch = 'lede',
branch = 'lede-l2tp',
branches = {
stable = {
name = 'stable',
name = 'lede-l2tp',
mirrors = {
'http://[2a03:2267:4e6f:7264::fd00]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd01]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd02]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd03]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd04]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd05]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd06]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd07]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd08]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd09]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd10]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd11]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd12]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd13]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd14]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd15]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd99]/firmware/stable/sysupgrade/',
},
good_signatures = 2,
pubkeys = {
......@@ -224,91 +108,6 @@
'359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- sven (FF-FL)
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://[2a03:2267:4e6f:7264::fd00]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd02]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd03]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd04]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd05]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd06]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd07]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd08]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd09]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd10]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd11]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd12]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd13]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd14]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd15]/firmware/experimental/sysupgrade/',
},
good_signatures = 1,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
'9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
'359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- sven (FF-FL)
},
},
mesh11s = {
name = 'mesh11s',
mirrors = {
'http://[2a03:2267:4e6f:7264::fd00]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd02]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd03]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd04]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd05]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd06]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd07]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd08]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd09]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd10]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd11]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd12]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd13]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd14]/firmware/mesh11s/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd15]/firmware/mesh11s/sysupgrade/',
},
good_signatures = 1,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
'9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
'359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- sven (FF-FL)
},
},
lede = {
name = 'lede',
mirrors = {
'http://[2a03:2267:4e6f:7264::fd00]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd01]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd02]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd03]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd04]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd05]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd06]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd07]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd08]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd09]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd10]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd11]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd12]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd13]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd14]/firmware/lede/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd15]/firmware/lede/sysupgrade/',
},
good_signatures = 1,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
'9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
'359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- sven (FF-FL)
},
},
},
},
}
site.mk
+ 3
− 1
View file @ 15a9dd46
......@@ -16,11 +16,13 @@ GLUON_SITE_PACKAGES := \
gluon-web-network \
gluon-web-private-wifi \
gluon-web-wifi-config \
gluon-mesh-vpn-fastd \
gluon-mesh-vpn-tunneldigger \
gluon-radvd \
gluon-status-page \
iwinfo \
iptables \
gluon-config-mode-tunneldigger \
gluon-tunneldigger-watchdog \
haveged
# from eulenfunk:
......
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

Hosted with love by Chaotikum e.V. Support us if you can