diff --git a/site.conf b/site.conf
index 1be3727eea648974998f90d669839a0ed7e639ac..a53676f2d8f4c576f0d27b27978627ec9022a2d5 100644
--- a/site.conf
+++ b/site.conf
@@ -1,158 +1,152 @@
{
- hostname_prefix = 'ffs-',
- site_name = 'Freifunk Stuttgart',
- site_code = 'ffs',
-
- opkg = {
- openwrt = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
- },
-
- prefix4 = '172.21.0.0/18',
- prefix6 = 'fd21:b4dc:4b1e::/64',
+ hostname_prefix = 'ffs-',
+ site_name = 'Freifunk Stuttgart',
+ site_code = 'ffs',
+
+ prefix4 = '172.21.0.0/18',
+ prefix6 = 'fd21:b4dc:4b1e::/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 = {
- 'fd21:b4dc:4b1e::a38:1', -- gw01
- },
+ ntp_servers = {
+ 'fd21:b4dc:4b1e::a38:1', -- gw01
+ },
- regdom = 'DE',
-
+ regdom = 'DE',
- wifi24 = {
- channel = 1,
- htmode = 'HT20', --only for optic
- ap = {
- ssid = 'Freifunk',
- },
- ibss = {
- ssid = '02:04:08:16:32:64',
- bssid = '02:04:08:16:32:64',
- mcast_rate = 12000,
- },
- },
+ wifi24 = {
+ channel = 1,
+ htmode = 'HT20', --only for optic
+ ap = {
+ ssid = 'Freifunk',
+ },
+ ibss = {
+ ssid = '02:04:08:16:32:64',
+ bssid = '02:04:08:16:32:64',
+ mcast_rate = 12000,
+ },
+ },
- wifi5 = {
- channel = 44,
- htmode = 'HT20', --only for optic
- ap = {
- ssid = 'Freifunk',
- },
- ibss = {
- ssid = '02:04:08:16:32:64',
- bssid = '02:04:08:16:32:64',
- mcast_rate = 12000,
- },
- },
+ wifi5 = {
+ channel = 44,
+ htmode = 'HT20', --only for optic
+ ap = {
+ ssid = 'Freifunk',
+ },
+ ibss = {
+ ssid = '02:04:08:16:32:64',
+ bssid = '02:04:08:16:32:64',
+ mcast_rate = 12000,
+ },
+ },
- next_node = {
- ip4 = '172.21.24.254',
- ip6 = 'fd21:b4dc:4b1e::1',
- mac = '02:00:0a:25:00:01',
- },
+ next_node = {
+ ip4 = '172.21.24.254',
+ ip6 = 'fd21:b4dc:4b1e::1',
+ mac = '02:00:0a:25:00:01',
+ },
- fastd_mesh_vpn = {
- methods = {'salsa2012+umac'},
- mtu = 1406,
- enabled = true,
- groups = {
- backbone = {
- limit = 1,
- peers = {
- gw01 = {
- key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
- remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
- },
- gw02 = {
- key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
- remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
- },
- gw03 = {
- key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
- remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
- },
- gw04 = {
- key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
- remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
- },
- gw05 = {
- key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
- remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
- },
- gw06 = {
- key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
- remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
- },
- gw07 = {
- key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
- remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
- },
- gw08 = {
- key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
- remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
- },
- gw09 = {
- key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
- remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
- },
- gw10 = {
- key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
- remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
- },
- },
- },
- },
- },
-
- bandwidth_limit = {
- -- Default upload limit (kbit/s).
+ fastd_mesh_vpn = {
+ methods = {'salsa2012+umac'},
+ mtu = 1406,
+ enabled = true,
+ groups = {
+ backbone = {
+ limit = 1,
+ peers = {
+ gw01 = {
+ key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
+ remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
+ },
+ gw02 = {
+ key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
+ remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
+ },
+ gw03 = {
+ key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
+ remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
+ },
+ gw04 = {
+ key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
+ remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
+ },
+ gw05 = {
+ key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
+ remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
+ },
+ gw06 = {
+ key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
+ remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
+ },
+ gw07 = {
+ key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
+ remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
+ },
+ gw08 = {
+ key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
+ remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
+ },
+ gw09 = {
+ key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
+ remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
+ },
+ gw10 = {
+ key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
+ remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
+ },
+ },
+ },
+ },
+ },
+
+ bandwidth_limit = {
+ -- Default upload limit (kbit/s).
egress = 500,
-- Default download limit (kbit/s).
ingress = 15000,
},
- autoupdater = {
- enabled = 1,
- branch = 'stable',
- branches = {
- stable = {
- name = 'stable',
- mirrors = {
- 'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade', -- gluongw
- },
- good_signatures = 2,
- pubkeys = {
- '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
- '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
- 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
- },
- },
- beta = {
- name = 'beta',
- mirrors = {
- 'http://[fd21:b4dc:4b1e::a38:1]/gluon/beta/sysupgrade', -- gluongw
- },
- good_signatures = 1,
- pubkeys = {
- '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
- '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
- 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
- },
- },
- nightly = {
- name = 'nightly',
- mirrors = {
- 'http://[fd21:b4dc:4b1e::a38:1]/gluon/nightly/sysupgrade', -- gluongw
- },
- good_signatures = 1,
- pubkeys = {
- '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
- '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
- 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
- },
- },
+ autoupdater = {
+ enabled = 1,
+ branch = 'stable',
+ branches = {
+ stable = {
+ name = 'stable',
+ mirrors = {
+ 'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade', -- gluongw
+ },
+ good_signatures = 2,
+ pubkeys = {
+ '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
+ },
+ },
+ beta = {
+ name = 'beta',
+ mirrors = {
+ 'http://[fd21:b4dc:4b1e::a38:1]/gluon/beta/sysupgrade', -- gluongw
+ },
+ good_signatures = 1,
+ pubkeys = {
+ '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
+ },
+ nightly = {
+ name = 'nightly',
+ mirrors = {
+ 'http://[fd21:b4dc:4b1e::a38:1]/gluon/nightly/sysupgrade', -- gluongw
+ },
+ good_signatures = 1,
+ pubkeys = {
+ '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
+ },
+ },
},
-
+ },
}