Skip to content
Snippets Groups Projects
Commit 370fb509 authored by DO9XE's avatar DO9XE
Browse files

replace everything to the ffnord config

parent 5a5a54a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
site.conf
+ 55
− 94
View file @ 370fb509
......@@ -3,36 +3,36 @@
site_name = 'Freifunk Nord',
site_code = 'ffnord',
prefix4 = '10.116.128.0/17',
prefix6 = 'fda1:384a:74de:4242::/64',
prefix4 = '10.187.0.0/16',
prefix6 = '2a03:2267:4e6f:7264::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {'1.ntp.services.ffki'},
opkg_repo = 'http://opkg.services.ffki/barrier_breaker/14.07/%S/packages',
ntp_servers = {'1.ntp.services.ffnord'},
opkg_repo = 'http://opkg.services.ffnord/barrier_breaker/14.07/%S/packages',
regdom = 'DE',
wifi24 = {
ssid = 'nord.freifunk.net',
channel = 1,
htmode = 'HT40-',
mesh_ssid = '02:ca:ff:ee:ba:be',
mesh_bssid = '02:ca:ff:ee:ba:be',
mesh_ssid = 'ca:ff:ee:02:be:ef',
mesh_bssid = 'ca:ff:ee:02:be:ef',
mesh_mcast_rate = 12000,
},
wifi5 = {
ssid = 'nord.freifunk.net',
channel = 44,
htmode = 'HT40+',
mesh_ssid = '02:ca:ff:ee:ba:be',
mesh_bssid = '02:ca:ff:ee:ba:be',
mesh_ssid = 'ca:ff:ee:02:be:ef',
mesh_bssid = 'ca:ff:ee:02:be:ef',
mesh_mcast_rate = 12000,
},
next_node = {
ip4 = '10.116.254.254',
ip6 = 'fda1:384a:74de:4242::ffff',
ip4 = '10.187.0.1',
ip6 = '2a03:2267:4e6f:7264::ffff',
mac = '36:f4:54:fc:e5:11'
mac = '36:f4:54:fc:e5:22'
},
fastd_mesh_vpn = {
......@@ -42,41 +42,29 @@
backbone = {
limit = 2,
peers = {
ffki_vpn0 = {
key = '7a01772ff2351ce7ad3e305da58ba96178997cadb23fcd8c527e88b2fb677528',
remotes = {'ipv4 "vpn0.freifunk.in-kiel.de" port 10000'},
ffnord_vpn0 = {
key = 'kommt noch...',
remotes = {'ipv4 "vpn0.ffnord.net" port 10001', 'ipv6 "vpn0.ffnord.net" port 10001'},
},
ffki_vpn1 = {
key = '65db8bff947e7c02ef7e152e73fb17c39ee9cfea91d047cb7a063ecb1eb7dd88',
remotes = {'ipv4 "vpn1.freifunk.in-kiel.de" port 10000'},
ffnord_vpn1 = {
key = 'kommt noch...',
remotes = {'ipv4 "vpn1.ffnord.net" port 10001', 'ipv6 "vpn1.ffnord.net" port 10001'},
},
ffki_vpn2 = {
key = 'fa400de81fc9f53127a4e60980c9756af372161c01ecbc7574fe115cf6434821',
remotes = {'ipv4 "vpn2.freifunk.in-kiel.de" port 10000'},
ffnord_vpn2 = {
key = 'kommt noch...',
remotes = {'ipv4 "vpn2.ffnord.net" port 10001', 'ipv6 "vpn2.ffnord.net" port 10001'},
},
ffki_vpn3 = {
key = 'c986eff66227bf0181d07fcaa1624def8895b6ed99e0effd0015d7bd5ef89ea6',
remotes = {'ipv4 "vpn3.freifunk.in-kiel.de" port 10000'},
ffnord_vpn3 = {
key = 'kommt noch...',
remotes = {'ipv4 "vpn3.ffnord.net" port 10001', 'ipv6 "vpn3.ffnord.net" port 10001'},
},
ffki_vpn4 = {
key = '647b2af8c795a30b9f55758b1e59d9740e65c06bde6baec2c88136b12e974cb7',
remotes = {'ipv4 "vpn4.freifunk.in-kiel.de" port 10000'},
ffnord_vpn4 = {
key = 'kommt noch...',
remotes = {'ipv4 "vpn4.ffnord.net" port 10001', 'ipv6 "vpn4.ffnord.net" port 10001'},
},
ffki_vpn5 = {
key = '0b3dc9457a1966857fe9364b5c836a75fd02bd46388845b5ad104d200a585a99',
remotes = {'ipv4 "vpn5.freifunk.in-kiel.de" port 10000'},
},
ffki_vpn6 = {
key = '1b43401ccab790f908f189bf5c1ed0de17f84f683dfd6622d72a8f26fa490e59',
remotes = {'ipv4 "vpn6.freifunk.in-kiel.de" port 10000'},
},
ffki_vpn7 = {
key = 'ff4ae2e3a23ed10262b23bbfd316fa6f3be32bf9d2ced6c763b0c7378b97b8ac',
remotes = {'ipv4 "vpn7.freifunk.in-kiel.de" port 10000'},
},
ffki_vpn8 = {
key = '10e25a530094e278fb877323575b47c79f96e3639a2640ad7096e1aa414dc4ba',
remotes = {'ipv4 "vpn8.freifunk.in-kiel.de" port 10000'},
ffnord_vpn5 = {
key = 'kommt noch...',
remotes = {'ipv4 "vpn5.ffnord.net" port 10001', 'ipv6 "vpn5.ffnord.net" port 10001'},
},
},
},
......@@ -89,56 +77,40 @@
stable = {
name = 'stable',
mirrors = {
'http://[fda1:384a:74de:4242::1]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::2]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd00]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd01]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd02]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd03]/firmware/stable/sysupgrade/',
},
good_signatures = 2,
'http://[fda1:384a:74de:4242::1]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::2]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd00]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd01]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd02]/firmware/stable/sysupgrade/',
'http://[fda1:384a:74de:4242::fd03]/firmware/stable/sysupgrade/',
},
good_signatures = 3,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
'ee6ffe0fd4cada0358204c4f62a80d859478e7f12982068d65e48ed0a37a4fea', -- e-chb
'e46bcbb302a250d414d2f014fc55d179693cd39c6527d120924a1e985dd8ae5f', -- DO9XE
},
},
backbone = {
name = 'backbone',
mirrors = {
'http://[fda1:384a:74de:4242::1]/firmware/backbone/sysupgrade/',
'http://[fda1:384a:74de:4242::2]/firmware/backbone/sysupgrade/',
'http://[fda1:384a:74de:4242::fd00]/firmware/backbone/sysupgrade/',
'http://[fda1:384a:74de:4242::fd01]/firmware/backbone/sysupgrade/',
'http://[fda1:384a:74de:4242::fd02]/firmware/backbone/sysupgrade/',
'http://[fda1:384a:74de:4242::fd03]/firmware/backbone/sysupgrade/',
},
good_signatures = 2,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
'ee6ffe0fd4cada0358204c4f62a80d859478e7f12982068d65e48ed0a37a4fea', -- e-chb
'e46bcbb302a250d414d2f014fc55d179693cd39c6527d120924a1e985dd8ae5f', -- DO9XE
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'e46bcbb302a250d414d2f014fc55d179693cd39c6527d120924a1e985dd8ae5f', -- DO9XE
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
},
},
experimental = {
name = 'experimental',
name = 'experimental',
mirrors = {
'http://[fda1:384a:74de:4242::2]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::1]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd00]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd01]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd02]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd03]/firmware/experimental/sysupgrade/',
},
'http://[fda1:384a:74de:4242::2]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::1]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd00]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd01]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd02]/firmware/experimental/sysupgrade/',
'http://[fda1:384a:74de:4242::fd03]/firmware/experimental/sysupgrade/',
},
probability = 0.1,
good_signatures = 1,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
'ee6ffe0fd4cada0358204c4f62a80d859478e7f12982068d65e48ed0a37a4fea', -- e-chb
'e46bcbb302a250d414d2f014fc55d179693cd39c6527d120924a1e985dd8ae5f', -- DO9XE
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'e46bcbb302a250d414d2f014fc55d179693cd39c6527d120924a1e985dd8ae5f', -- DO9XE
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
},
},
},
......@@ -152,15 +124,4 @@
limit_ingress = 4000,
},
},
legacy = {
version_files = {'/etc/.freifunk_version_keep', '/etc/.kff_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/ffki', '/etc/config/freifunk'},
config_mode_configs = {'config_mode', 'ffki', 'freifunk'},
fastd_configs = {'ffki_mesh_vpn', 'mesh_vpn'},
mesh_ifname = 'freifunk',
tc_configs = {'ffki', 'freifunk'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
},
}
site.mk
+ 0
− 1
View file @ 370fb509
......@@ -12,7 +12,6 @@ GLUON_SITE_PACKAGES := \
gluon-config-mode-contact-info \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-legacy \
gluon-luci-admin \
gluon-luci-autoupdater \
gluon-luci-portconfig \
......
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