Freifunk-Leipzig
/
gluon-site
Archived
13
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: Freifunk-Leipzig:master
Branches Tags
Freifunk-Leipzig:master
Freifunk-Leipzig:ffl-old
Freifunk-Leipzig:fflold
Freifunk-Leipzig:stable
...
pull from: Freifunk-Leipzig:ffl-old
Branches Tags
Freifunk-Leipzig:master
Freifunk-Leipzig:ffl-old
Freifunk-Leipzig:fflold
Freifunk-Leipzig:stable
This repository has been archived on 2024-05-11. You can view files and clone it, but cannot push or open issues or pull requests.

5 Commits
master ... ffl-old

Author SHA1 Message Date
drbroiler d5e1bf8ce8 add autoupdater 2021-10-09 21:58:43 +02:00
drbroiler 7fe11d5a6a „site.conf“ ändern 2021-10-09 21:56:51 +02:00
drbroiler bc44e62a36 add 1.6.2 2021-10-09 17:05:21 +02:00
drbroiler 182b1d7ad0 del autoupdater 2021-10-09 17:01:58 +02:00
drbroiler f59522094b set autoupdate and ssh-key 2021-07-11 22:40:51 +02:00
2 changed files with 145 additions and 133 deletions
Show Stats Expand all files Collapse all files

9
README
View File

@ -1,13 +1,12 @@
first build 24.12.2014: first build 24.12.2014:
stabile version 2015 stabile versions 1.6.2
http://vpnb.leipzig.freifunk.net:8004/freifunk-gluon/images-freifunk-leipzig-20150129/
http://firmware.leipzig.freifunk.net
https://images.freifunk-leipzig.de/
Gluon versions used for specific Leipzig Freifunk Firmware builds: Gluon versions used for specific Leipzig Freifunk Firmware builds:
* 1.6.2: v2021.1.1
* 1.6.1: v2021.1.0 * 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
@ -23,4 +22,4 @@ Gluon versions used for specific Leipzig Freifunk Firmware builds:
* 0.4.1: v2014.2 * 0.4.1: v2014.2
* 0.4: v2014.1 * 0.4: v2014.1
* 0.4~1-beta2 (0.4 Beta 2): 2c751d3612a7229de878c40ae724611f2f4f0bee * 0.4~1-beta2 (0.4 Beta 2): 2c751d3612a7229de878c40ae724611f2f4f0bee
* 0.3.100-beta1 (0.4 Beta 1): 55a068104fa072ea7cd2decac9584a8f619badbf * 0.3.100-beta1 (0.4 Beta 1): 55a068104fa072ea7cd2decac9584a8f619badbf

269
site.conf
View File

@ -1,142 +1,155 @@
{ {
hostname_prefix = 'gluon-l', hostname_prefix = 'gluon-l',
site_name = 'Freifunk Leipzig', site_name = 'Freifunk Leipzig',
site_code = 'l', site_code = 'l',
domain_seed = '9cac58cc344d652b8b4d5d4e68dfa74d43d114a0e88041d6afe439b8caee54d5', domain_seed = '9cac58cc344d652b8b4d5d4e68dfa74d43d114a0e88041d6afe439b8caee54d5',
prefix4 = '10.61.3.0/24',
prefix6 = 'fdef:ffc0:7030::/64',
prefix4 = '10.61.3.0/24', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
prefix6 = 'fdef:ffc0:7030::/64', ntp_servers = {
'gluon-ntp.leipzig.freifunk.net'
},
regdom = 'DE',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin wifi24 = {
ntp_servers = {'gluon-ntp.leipzig.freifunk.net'}, ap = {
regdom = 'DE', ssid = '061-FREIFUNK-',
wifi24 = {
ap = {
ssid = '061-FREIFUNK-',
},
channel = 1,
mesh = {
id = 'LiMe',
mcast_rate = 12000,
},
},
wifi5 = {
ap = {
ssid = '061-FREIFUNK-',
},
channel = 44,
mesh = {
id = 'LiMe',
mcast_rate = 12000,
},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = 'BATMAN_IV',
},
}, },
channel = 1,
mesh = {
id = 'LiMe',
mcast_rate = 12000,
},
},
wifi5 = {
ap = {
ssid = '061-FREIFUNK-',
},
channel = 44,
mesh = {
id = 'LiMe',
mcast_rate = 12000,
},
},
next_node = { mesh = {
ip4 = '10.61.3.3', vxlan = false,
ip6 = 'fdef:ffc0:3dd7::1', batman_adv = {
mac = '16:41:95:40:f7:dc', routing_algo = 'BATMAN_IV',
}, },
},
mesh_vpn = { next_node = {
enabled = true, ip4 = '10.61.3.3',
mtu = 1426, ip6 = 'fdef:ffc0:3dd7::1',
fastd = { mac = '16:41:95:40:f7:dc',
configurable = true, },
methods = {'salsa2012+umac', 'salsa2012+gmac', 'null+salsa2012+umac'},
groups = { mesh_vpn = {
backbone = { enabled = true,
limit = 2, mtu = 1426,
peers = { fastd = {
vpngluon1 = { configurable = true,
key = '7e383ce9ba4fea8a82c1860864c2f940ef9f8a92b04f62fb7ac5f57442872f0e', methods = {
remotes = {'ipv4 "gluon20171a61.leipzig.freifunk.net" port 10061'}, 'salsa2012+umac',
}, 'salsa2012+gmac',
vpngluon2 = { 'null+salsa2012+umac'
key = '6a5e3d0d88feb0350078b5ce7c7a15baf918e0c2455d6854ec933c96c7a01a43', },
remotes = {'ipv4 "gluon20171b61.leipzig.freifunk.net" port 10061'},
}, groups = {
vpngluon3 = { backbone = {
key = '4414df684d9d6e28f845753e4c9c1ebe2cc041f567ca3f09cafb51b73d19ea6b', limit = 2,
remotes = {'ipv4 "gluon20171c61.leipzig.freifunk.net" port 10061'}, peers = {
}, vpngluon1 = {
}, key = '7e383ce9ba4fea8a82c1860864c2f940ef9f8a92b04f62fb7ac5f57442872f0e',
}, remotes = {'ipv4 "gluon20171a61.leipzig.freifunk.net" port 10061'},
},
vpngluon2 = {
key = '6a5e3d0d88feb0350078b5ce7c7a15baf918e0c2455d6854ec933c96c7a01a43',
remotes = {'ipv4 "gluon20171b61.leipzig.freifunk.net" port 10061'},
},
vpngluon3 = {
key = '4414df684d9d6e28f845753e4c9c1ebe2cc041f567ca3f09cafb51b73d19ea6b',
remotes = {'ipv4 "gluon20171c61.leipzig.freifunk.net" port 10061'},
},
},
},
}, },
}, },
}, },
autoupdater = { autoupdater = {
branch = 'stable', branch = 'stable',
branches = { branches = {
stable = { stable = {
name = 'stable', name = 'stable',
mirrors = {'http://gluon-updates-20161a.leipzig.freifunk.net/stable/sysupgrade'}, mirrors = {
good_signatures = 1, 'http://gluon-updates-20161a.leipzig.freifunk.net/stable/sysupgrade'
pubkeys = { },
'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph good_signatures = 1,
'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo pubkeys = {
}, 'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
}, '96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
beta = { },
name = 'beta', },
mirrors = {'http://gluon-updates20161a.leipzig.freifunk.net/beta/sysupgrade'}, beta = {
good_signatures = 1, name = 'beta',
pubkeys = { mirrors = {
'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph 'http://gluon-updates20161a.leipzig.freifunk.net/beta/sysupgrade'
'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo },
}, good_signatures = 1,
}, pubkeys = {
experimental = { 'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
name = 'experimental', '96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
mirrors = {'http://gluon-updates20161a.leipzig.freifunk.net/experimental/sysupgrade'}, },
good_signatures = 1, },
pubkeys = { experimental = {
'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph name = 'experimental',
'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo mirrors = {
}, 'http://gluon-updates20161a.leipzig.freifunk.net/experimental/sysupgrade'
}, },
}, good_signatures = 1,
}, pubkeys = {
'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
},
},
},
},
simple_tc = { simple_tc = {
mesh_vpn = { mesh_vpn = {
ifname = 'mesh-vpn', ifname = 'mesh-vpn',
enabled = false, enabled = false,
limit_egress = 200, limit_egress = 200,
limit_ingress = 3000, limit_ingress = 3000,
}, },
}, },
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.336512147,
lat = 51.346483137, lon = 12.338276803,
lon = 12.377471924,
}, },
zoom = 12, zoom = 12,
}, },
}, },
remote_login = { remote_login = {
show_password_form = true, show_password_form = true,
}, },
}, },
} }