Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
alex | db19a8a443 |
4
README
4
README
|
@ -8,10 +8,10 @@ http://firmware.leipzig.freifunk.net
|
||||||
|
|
||||||
Gluon versions used for specific Leipzig Freifunk Firmware builds:
|
Gluon versions used for specific Leipzig Freifunk Firmware builds:
|
||||||
|
|
||||||
* 1.6.1: v2021.1.1
|
* 1.6.1: v2021.1.0
|
||||||
* 1.5.3: v2020.2.3
|
* 1.5.3: v2020.2.3
|
||||||
* 1.5.2: v2020.2.2
|
* 1.5.2: v2020.2.2
|
||||||
* 1.4.4: v2020.1.4
|
* 1.4.4: v2o2o.1.4
|
||||||
* 1.3.3: v2019.1.3
|
* 1.3.3: v2019.1.3
|
||||||
* 1.2.4: v2018.2.4
|
* 1.2.4: v2018.2.4
|
||||||
* 1.2.1: v2018.2.1
|
* 1.2.1: v2018.2.1
|
||||||
|
|
125
site.conf
125
site.conf
|
@ -1,50 +1,48 @@
|
||||||
{
|
{
|
||||||
hostname_prefix = 'gluon-l',
|
hostname_prefix = 'node-',
|
||||||
site_name = 'Freifunk Leipzig',
|
site_name = 'freifunk-leipzig.de',
|
||||||
site_code = 'l',
|
site_code = 'gluon.freifunk-leipzig.de',
|
||||||
domain_seed = '9cac58cc344d652b8b4d5d4e68dfa74d43d114a0e88041d6afe439b8caee54d5',
|
domain_seed = '9cac58cc344d652b8b4d5d4e68dfa74d43d114a0e88041d6afe439b8caee54d5',
|
||||||
|
|
||||||
prefix4 = '10.61.3.0/24',
|
prefix4 = '10.13.12.0/24',
|
||||||
prefix6 = 'fdef:ffc0:7030::/64',
|
prefix6 = 'fdd3:2e74:041e::/64',
|
||||||
|
|
||||||
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 = {'ntp.freifunk-leipzig.de'},
|
||||||
'gluon-ntp.leipzig.freifunk.net'
|
|
||||||
},
|
|
||||||
regdom = 'DE',
|
regdom = 'DE',
|
||||||
|
|
||||||
wifi24 = {
|
wifi24 = {
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'freifunk-leipzig.de',
|
ssid = 'freifunk-leipzig.de',
|
||||||
},
|
},
|
||||||
channel = 1,
|
channel = 1,
|
||||||
mesh = {
|
mesh = {
|
||||||
id = 'de:ze:nt:ra:le.space',
|
id = 'de:ze:nt:ra:le.space',
|
||||||
mcast_rate = 12000,
|
mcast_rate = 12000,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
wifi5 = {
|
wifi5 = {
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'freifunk-leipzig.de',
|
ssid = 'freifunk-leipzig.de',
|
||||||
},
|
},
|
||||||
channel = 44,
|
channel = 44,
|
||||||
mesh = {
|
mesh = {
|
||||||
id = 'de:ze:nt:ra:le.space',
|
id = 'de:ze:nt:ra:le.space',
|
||||||
mcast_rate = 12000,
|
mcast_rate = 12000,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
mesh = {
|
mesh = {
|
||||||
vxlan = false,
|
vxlan = false,
|
||||||
batman_adv = {
|
batman_adv = {
|
||||||
routing_algo = 'BATMAN_IV',
|
routing_algo = 'BATMAN_IV',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
next_node = {
|
next_node = {
|
||||||
ip4 = '10.61.3.3',
|
ip4 = '10.13.12.3',
|
||||||
ip6 = 'fdef:ffc0:3dd7::1',
|
ip6 = 'fdd3:2e74:041e::1',
|
||||||
mac = '16:41:95:40:f7:dc',
|
mac = '77:82:71:33:54:2c',
|
||||||
},
|
},
|
||||||
|
|
||||||
mesh_vpn = {
|
mesh_vpn = {
|
||||||
|
@ -52,26 +50,18 @@
|
||||||
mtu = 1426,
|
mtu = 1426,
|
||||||
fastd = {
|
fastd = {
|
||||||
configurable = true,
|
configurable = true,
|
||||||
methods = {
|
methods = {'salsa2012+umac', 'salsa2012+gmac', 'null+salsa2012+umac'},
|
||||||
'salsa2012+umac',
|
|
||||||
'salsa2012+gmac',
|
|
||||||
'null+salsa2012+umac'
|
|
||||||
},
|
|
||||||
groups = {
|
groups = {
|
||||||
backbone = {
|
backbone = {
|
||||||
limit = 2,
|
limit = 2,
|
||||||
peers = {
|
peers = {
|
||||||
vpngluon1 = {
|
vpn_ip4 = {
|
||||||
key = '7e383ce9ba4fea8a82c1860864c2f940ef9f8a92b04f62fb7ac5f57442872f0e',
|
key = 'fcdccf8beee4c2dc3064f13d44339173ca23f94ef081c7d43be5ca0a2e89e93d',
|
||||||
remotes = {'ipv4 "gluon20171a61.leipzig.freifunk.net" port 10061'},
|
remotes = {'ipv4 "gluon-vpn.freifunk-leipzig.de" port 2342'},
|
||||||
},
|
},
|
||||||
vpngluon2 = {
|
vpn_ip6 = {
|
||||||
key = '6a5e3d0d88feb0350078b5ce7c7a15baf918e0c2455d6854ec933c96c7a01a43',
|
key = 'fcdccf8beee4c2dc3064f13d44339173ca23f94ef081c7d43be5ca0a2e89e93d',
|
||||||
remotes = {'ipv4 "gluon20171b61.leipzig.freifunk.net" port 10061'},
|
remotes = {'ipv6 "gluon-vpn.freifunk-leipzig.de" port 2342'},
|
||||||
},
|
|
||||||
vpngluon3 = {
|
|
||||||
key = '4414df684d9d6e28f845753e4c9c1ebe2cc041f567ca3f09cafb51b73d19ea6b',
|
|
||||||
remotes = {'ipv4 "gluon20171c61.leipzig.freifunk.net" port 10061'},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -84,42 +74,29 @@
|
||||||
branches = {
|
branches = {
|
||||||
stable = {
|
stable = {
|
||||||
name = 'stable',
|
name = 'stable',
|
||||||
mirrors = {
|
mirrors = {'http://update.freifunk-leipzig.de/stable/sysupgrade'},
|
||||||
'http://images.freifunk-leipzig.de/images/stable/images/sysupgrade/'
|
|
||||||
},
|
|
||||||
good_signatures = 1,
|
good_signatures = 1,
|
||||||
pubkeys = {
|
pubkeys = {
|
||||||
'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
|
'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
|
||||||
|
'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
testing = {
|
beta = {
|
||||||
name = 'testing',
|
name = 'beta',
|
||||||
mirrors = {
|
mirrors = {'http://update.leipzig.freifunk.net/beta/sysupgrade'},
|
||||||
'http://images.freifunk-leipzig.de/images/testing/images/sysupgrade/'
|
|
||||||
},
|
|
||||||
good_signatures = 1,
|
good_signatures = 1,
|
||||||
pubkeys = {
|
pubkeys = {
|
||||||
'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
|
'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
|
||||||
},
|
'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
|
||||||
},
|
|
||||||
unstable = {
|
|
||||||
name = 'unstable',
|
|
||||||
mirrors = {
|
|
||||||
'http://images.freifunk-leipzig.de/images/unstable/images/sysupgrade/'
|
|
||||||
},
|
|
||||||
good_signatures = 1,
|
|
||||||
pubkeys = {
|
|
||||||
'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
experimental = {
|
experimental = {
|
||||||
name = 'experimental',
|
name = 'experimental',
|
||||||
mirrors = {
|
mirrors = {'http://update.leipzig.freifunk.net/experimental/sysupgrade'},
|
||||||
'http://images.freifunk-leipzig.de/images/experimental/images/sysupgrade/'
|
|
||||||
},
|
|
||||||
good_signatures = 1,
|
good_signatures = 1,
|
||||||
pubkeys = {
|
pubkeys = {
|
||||||
'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
|
'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
|
||||||
|
'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -135,27 +112,27 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
roles = {
|
roles = {
|
||||||
default = 'node',
|
default = 'node',
|
||||||
list = {
|
list = {
|
||||||
'node',
|
'node',
|
||||||
'test',
|
'test',
|
||||||
'backbone',
|
'backbone',
|
||||||
'service',
|
'service',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config_mode = {
|
config_mode = {
|
||||||
geo_location = {
|
geo_location = {
|
||||||
show_altitude = true,
|
show_altitude = true,
|
||||||
osm = {
|
osm = {
|
||||||
center = {
|
center = {
|
||||||
lat = 51.346483137,
|
lat = 51.346483137,
|
||||||
lon = 12.377471924,
|
lon = 12.377471924,
|
||||||
},
|
},
|
||||||
zoom = 12,
|
zoom = 12,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
remote_login = {
|
remote_login = {
|
||||||
show_password_form = true,
|
show_password_form = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue