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

Compare commits

base: krombel:welcome
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
..
compare: krombel:umland
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

11 Commits
welcome ... umland

Author SHA1 Message Date
Franz Pletz
0937f79688 Switch autoupdater URL back to main firmware repo path 2015-10-14 21:14:16 +02:00
Franz Pletz
3d1631e71e Release 2015.6.1 2015-10-14 19:40:58 +02:00
Christian Obersteiner
a3a5af5b00 using our own gluon-config-site-select module 2015-10-11 15:16:09 +02:00
Franz Pletz
0548f8483b Remove extra site symlink 2015-10-05 12:33:50 +02:00
Franz Pletz
02595a4f1f Merge branch 'site-select' into umland 2015-10-04 15:36:16 +02:00
Franz Pletz
2d331cad34 Change site code to ffmuc_umland 2015-10-04 09:02:34 +02:00
Franz Pletz
ff8cd69569 Merge pull request #21 from freifunkMUC/t-offline-patch-1 
Update site.conf
 2015-09-26 20:42:28 +02:00
Christian
895775d8e3 Update site.conf 2015-09-26 20:22:15 +02:00
Franz Pletz
01d6d18948 Fix typos in mesh ssid & gwu02 port 2015-09-26 02:39:01 +02:00
Franz Pletz
4c52f1b3d8 If you're happy and you know it: syntax error 2015-09-25 23:57:02 +02:00
Franz Pletz
64b42e68d5 Changes for ffmuc-umland segment 2015-09-25 18:30:46 +02:00
2 changed files with 34 additions and 30 deletions
Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,8 +1,5 @@
# Freifunk München Firmware Changelog # Freifunk München Firmware Changelog
## v2015.6.2
* Bugfix build for welcome version
## v2015.6.1 ## v2015.6.1
* Added support of site selection in config mode * Added support of site selection in config mode
* Switch autoupdater URL back to main firmware repo path * Switch autoupdater URL back to main firmware repo path

61
site.conf
View File

@@ -1,11 +1,11 @@
{ {
hostname_prefix = 'welcome', hostname_prefix = '',
site_name = 'Freifunk München Welcome', site_name = 'Freifunk München Umland',
site_code = 'ffmuc_welcome', site_code = 'ffmuc_umland',
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
prefix4 = '10.80.64.0/19', prefix4 = '10.80.96.0/19',
prefix6 = 'fdef:ffc0:4fff:1::/64', prefix6 = 'fdef:ffc0:4fff:2::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' }, ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -18,8 +18,8 @@
ssid = 'muenchen.freifunk.net', ssid = 'muenchen.freifunk.net',
channel = 6, channel = 6,
htmode = 'HT20', htmode = 'HT20',
mesh_ssid = 'mesh.ffmuc.welcome', mesh_ssid = 'mesh.ffmuc.umland',
mesh_bssid = '02:0E:8E:1E:61:18', mesh_bssid = '02:0E:8E:1E:61:19',
mesh_mcast_rate = 12000, mesh_mcast_rate = 12000,
}, },
@@ -27,14 +27,14 @@
ssid = 'muenchen.freifunk.net', ssid = 'muenchen.freifunk.net',
channel = 44, channel = 44,
htmode = 'HT40+', htmode = 'HT40+',
mesh_ssid = 'mesh.ffmuc.welcome', mesh_ssid = 'mesh.ffmuc.umland',
mesh_bssid = '02:0E:8E:1E:61:18', mesh_bssid = '02:0E:8E:1E:61:19',
mesh_mcast_rate = 12000, mesh_mcast_rate = 12000,
}, },
next_node = { next_node = {
ip4 = '10.80.64.1', ip4 = '10.80.96.1',
ip6 = 'fdef:ffc0:4fff:1::1', ip6 = 'fdef:ffc0:4fff:2::1',
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
@@ -45,32 +45,39 @@
backbone = { backbone = {
limit = 1, limit = 1,
peers = { peers = {
gwf01 = { gwu01 = {
key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e', key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
remotes = { remotes = {
'ipv4 "gwf01.ffmuc.net" port 11000', 'ipv4 "gwu01.ffmuc.net" port 10010',
'ipv4 "gwf01.freifunk-muenchen.de" port 11000', 'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
}, },
}, },
gwf02 = { gwu02 = {
key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35', key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
remotes = { remotes = {
'ipv4 "gwf02.ffmuc.net" port 11000', 'ipv4 "gwu02.ffmuc.net" port 10011',
'ipv4 "gwf02.freifunk-muenchen.de" port 11001', 'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
}, },
}, },
gwf03 = { gwu03 = {
key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386', key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
remotes = { remotes = {
'ipv4 "gwf03.ffmuc.net" port 11000', 'ipv4 "gwu03.ffmuc.net" port 10012',
'ipv4 "gwf03.freifunk-muenchen.de" port 11002', 'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
}, },
}, },
gwf04 = { gwu04 = {
key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539', key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
remotes = { remotes = {
'ipv4 "gwf04.ffmuc.net" port 11000', 'ipv4 "gwu04.ffmuc.net" port 10013',
'ipv4 "gwf04.freifunk-muenchen.de" port 11003', 'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
},
},
gwu05 = {
key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
remotes = {
'ipv4 "gwu05.ffmuc.net" port 10014',
'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
}, },
}, },
}, },