krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Compare commits

merge into: krombel:release-v2018.1
Branches Tags
krombel:krombel/v2018.1 krombel:release-v2018.1 krombel:release-v2018.0 krombel:krombel/v2018.0-on2016 krombel:stable krombel:master krombel:site-select-foo krombel:babel-test krombel:new_buildserver_key krombel:experimental krombel:welcome krombel:umland krombel:babel krombel:altdorf
krombel:v2018.0-rc1 krombel:v2018.1-krombel
...
pull from: krombel:welcome
Branches Tags
krombel:release-v2018.1 krombel:release-v2018.0 krombel:krombel/v2018.0-on2016 krombel:krombel/v2018.1 krombel:stable krombel:master krombel:site-select-foo krombel:babel-test krombel:new_buildserver_key krombel:experimental krombel:welcome krombel:umland krombel:babel krombel:altdorf
krombel:v2018.0-rc1 krombel:v2018.1-krombel

12 Commits
release-v2 ... welcome

Author SHA1 Message Date
Franz Pletz
0d1ff59fac Release 2015.6.2 2015-10-15 23:03:08 +02:00
Franz Pletz
904652abdd Switch autoupdater URL back to main firmware repo path 2015-10-14 21:20:42 +02:00
Franz Pletz
378e517ff7 Release 2015.6.1 2015-10-14 19:39:26 +02:00
Christian Obersteiner
4e8364d02b using our own gluon-config-site-select module 2015-10-11 15:17:08 +02:00
Franz Pletz
42fe0d31fd Remove extra site symlink, fix site code 2015-10-05 12:34:51 +02:00
Franz Pletz
53e3c5dbe8 Merge branch 'site-select' into welcome 2015-10-04 17:05:04 +02:00
Franz Pletz
b96a4d3f3a Revert to HT20 for 2.4GHz Wifi 
See https://github.com/freifunk-gluon/gluon/issues/487.
 2015-09-19 20:49:50 +02:00
Franz Pletz
865a7bd177 Require 2 signatures for experimental (LQFB i139) 2015-09-19 20:48:08 +02:00
Franz Pletz
d017574397 Disable mesh on WAN by default 2015-09-19 20:44:23 +02:00
Franz Pletz
739bda2a16 Change site_code & use different ports for gateways 2015-09-15 12:37:35 +02:00
Franz Pletz
bc8dfbed2e Use correct ipv4 & ipv6 prefixes 2015-09-13 12:44:39 +02:00
Franz Pletz
bf148b9269 Changes for new partition 'welcome' 2015-09-13 12:13:40 +02:00
6 changed files with 199 additions and 69 deletions
Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,5 +1,12 @@
# Freifunk München Firmware Changelog
## v2015.6.2
* Bugfix build for welcome version
## v2015.6.1
* Added support of site selection in config mode
* Switch autoupdater URL back to main firmware repo path
## v2015.6
- Updated to Gluon 2015.1.2
- Changes: https://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html

1
extra/ffmuc.conf
View File

@@ -1 +0,0 @@
../site.conf

155
extra/ffmuc.conf Normal file
View File

@@ -0,0 +1,155 @@
{
hostname_prefix = '',
site_name = 'Freifunk München',
site_code = 'ffmuc',
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
prefix4 = '10.80.32.0/19',
prefix6 = 'fdef:ffc0:4fff::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
mesh_on_wan = false,
regdom = 'DE',
wifi24 = {
ssid = 'muenchen.freifunk.net',
channel = 6,
htmode = 'HT20',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_mcast_rate = 12000,
},
wifi5 = {
ssid = 'muenchen.freifunk.net',
channel = 44,
htmode = 'HT40+',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_mcast_rate = 12000,
},
next_node = {
ip4 = '10.80.32.1',
ip6 = 'fdef:ffc0:4fff::1',
mac = '16:41:95:40:f7:dc',
},
fastd_mesh_vpn = {
methods = {'salsa2012+umac'},
mtu = 1426,
groups = {
backbone = {
limit = 1,
peers = {
gw03 = {
key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
remotes = {
'ipv4 "gw03.ffmuc.net" port 10000',
'ipv4 "gw03.freifunk-muenchen.de" port 10000',
},
},
gw04 = {
key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
remotes = {
'ipv4 "gw04.ffmuc.net" port 10000',
'ipv4 "gw04.freifunk-muenchen.de" port 10000',
},
},
gw05 = {
key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
remotes = {
'ipv4 "gw05.ffmuc.net" port 10000',
'ipv4 "gw05.freifunk-muenchen.de" port 10000',
},
},
gw06 = {
key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
remotes = {
'ipv4 "gw06.ffmuc.net" port 10000',
'ipv4 "gw06.freifunk-muenchen.de" port 10000',
},
},
gw07 = {
key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
remotes = {
'ipv4 "gw07.ffmuc.net" port 10000',
'ipv4 "gw07.freifunk-muenchen.de" port 10000',
},
},
gw08 = {
key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
remotes = {
'ipv4 "gw08.ffmuc.net" port 10000',
'ipv4 "gw08.freifunk-muenchen.de" port 10000',
},
},
gw09 = {
key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
remotes = {
'ipv4 "gw09.ffmuc.net" port 10000',
'ipv4 "gw09.freifunk-muenchen.de" port 10000',
},
},
gw10 = {
key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
remotes = {
'ipv4 "gw10.ffmuc.net" port 10000',
'ipv4 "gw10.freifunk-muenchen.de" port 10000',
},
},
},
},
},
},
autoupdater = {
enabled = 1,
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://firmware.ffmuc.net/stable/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
},
probability = 0.1,
good_signatures = 2,
pubkeys = {
'2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
'7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
'56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
'2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://firmware.ffmuc.net/experimental/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
},
probability = 0.5,
good_signatures = 2,
pubkeys = {
'2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
'7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
'56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
'2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
},
},
},
},
simple_tc = {
mesh_vpn = {
ifname = 'mesh-vpn',
enabled = false,
limit_egress = 1200,
limit_ingress = 12000,
},
},
}
-- vim: set ft=lua:ts=2:sw=2:et

8
extra/ffmuc_umland.conf
View File

@@ -92,8 +92,8 @@
stable = {
name = 'stable',
mirrors = {
'http://firmware.ffmuc.net/umland/stable/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/umland/stable/sysupgrade/',
'http://firmware.ffmuc.net/stable/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
},
probability = 0.1,
good_signatures = 2,
@@ -107,8 +107,8 @@
experimental = {
name = 'experimental',
mirrors = {
'http://firmware.ffmuc.net/umland/experimental/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/umland/experimental/sysupgrade/',
'http://firmware.ffmuc.net/experimental/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
},
probability = 0.5,
good_signatures = 2,

8
extra/ffmuc_welcome.conf
View File

@@ -85,8 +85,8 @@
stable = {
name = 'stable',
mirrors = {
'http://firmware.ffmuc.net/welcome/stable/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/welcome/stable/sysupgrade/',
'http://firmware.ffmuc.net/stable/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
},
probability = 0.1,
good_signatures = 2,
@@ -100,8 +100,8 @@
experimental = {
name = 'experimental',
mirrors = {
'http://firmware.ffmuc.net/welcome/experimental/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/welcome/experimental/sysupgrade/',
'http://firmware.ffmuc.net/experimental/sysupgrade/',
'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
},
probability = 0.5,
good_signatures = 2,

7
modules
View File

@@ -1,7 +1,4 @@
GLUON_SITE_FEEDS='ffmuc_packages gluon_community'
GLUON_SITE_FEEDS='ffmuc_packages'
PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
PACKAGES_FFMUC_PACKAGES_COMMIT=d4d5aa3e3874ca6099e91fd70008ad5d54038169
PACKAGES_GLUON_COMMUNITY_REPO=https://github.com/freifunk-gcp/v2015.1
PACKAGES_GLUON_COMMUNITY_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87
PACKAGES_FFMUC_PACKAGES_COMMIT=985bfad86005c7a9f754ddc8432d88641d8183b3

82
site.conf
View File

@@ -1,11 +1,11 @@
{
hostname_prefix = '',
site_name = 'Freifunk München',
site_code = 'ffmuc',
hostname_prefix = 'welcome',
site_name = 'Freifunk München Welcome',
site_code = 'ffmuc_welcome',
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
prefix4 = '10.80.32.0/19',
prefix6 = 'fdef:ffc0:4fff::/64',
prefix4 = '10.80.64.0/19',
prefix6 = 'fdef:ffc0:4fff:1::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -18,8 +18,8 @@
ssid = 'muenchen.freifunk.net',
channel = 6,
htmode = 'HT20',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_ssid = 'mesh.ffmuc.welcome',
mesh_bssid = '02:0E:8E:1E:61:18',
mesh_mcast_rate = 12000,
},
@@ -27,14 +27,14 @@
ssid = 'muenchen.freifunk.net',
channel = 44,
htmode = 'HT40+',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_ssid = 'mesh.ffmuc.welcome',
mesh_bssid = '02:0E:8E:1E:61:18',
mesh_mcast_rate = 12000,
},
next_node = {
ip4 = '10.80.32.1',
ip6 = 'fdef:ffc0:4fff::1',
ip4 = '10.80.64.1',
ip6 = 'fdef:ffc0:4fff:1::1',
mac = '16:41:95:40:f7:dc',
},
@@ -45,60 +45,32 @@
backbone = {
limit = 1,
peers = {
gw03 = {
key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
gwf01 = {
key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
remotes = {
'ipv4 "gw03.ffmuc.net" port 10000',
'ipv4 "gw03.freifunk-muenchen.de" port 10000',
'ipv4 "gwf01.ffmuc.net" port 11000',
'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
},
},
gw04 = {
key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
gwf02 = {
key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
remotes = {
'ipv4 "gw04.ffmuc.net" port 10000',
'ipv4 "gw04.freifunk-muenchen.de" port 10000',
'ipv4 "gwf02.ffmuc.net" port 11000',
'ipv4 "gwf02.freifunk-muenchen.de" port 11001',
},
},
gw05 = {
key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
gwf03 = {
key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
remotes = {
'ipv4 "gw05.ffmuc.net" port 10000',
'ipv4 "gw05.freifunk-muenchen.de" port 10000',
'ipv4 "gwf03.ffmuc.net" port 11000',
'ipv4 "gwf03.freifunk-muenchen.de" port 11002',
},
},
gw06 = {
key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
gwf04 = {
key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
remotes = {
'ipv4 "gw06.ffmuc.net" port 10000',
'ipv4 "gw06.freifunk-muenchen.de" port 10000',
},
},
gw07 = {
key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
remotes = {
'ipv4 "gw07.ffmuc.net" port 10000',
'ipv4 "gw07.freifunk-muenchen.de" port 10000',
},
},
gw08 = {
key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
remotes = {
'ipv4 "gw08.ffmuc.net" port 10000',
'ipv4 "gw08.freifunk-muenchen.de" port 10000',
},
},
gw09 = {
key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
remotes = {
'ipv4 "gw09.ffmuc.net" port 10000',
'ipv4 "gw09.freifunk-muenchen.de" port 10000',
},
},
gw10 = {
key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
remotes = {
'ipv4 "gw10.ffmuc.net" port 10000',
'ipv4 "gw10.freifunk-muenchen.de" port 10000',
'ipv4 "gwf04.ffmuc.net" port 11000',
'ipv4 "gwf04.freifunk-muenchen.de" port 11003',
},
},
},