FF-RGB
/
site-ffrgb
mirror of https://github.com/ffrgb/site-ffrgb.git
3
0
Fork 0
Code Releases Wiki Activity

Merge pull request #13 from ffrgb/master 

v2016.1-12
This commit is contained in:
Bastian 2016-05-31 19:30:49 +02:00
parent b3f7ea1432 98a129f2fb
commit 8eb59fa8ce
7 changed files with 255 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -1,5 +1,14 @@
# Freifunk Regensburg Firmware Changelog
## v2016.1-12 experimental
- Update to Gluon 2016.1.5
## v2016.1
- Update to Gluon v2015.1.4
- Many new devices
- switched from announced to respondd
- changed naming: no more sitecode in version, Schwandorf dropped
## v2015.1-ffrgb
- Update to Gluon v2015.1
- Integrated no_rebroadcast fix on mesh-vpn from Gluon Upstream

2
Makefile
View File

@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := 80d5f5f995f131ce1444587318e544bfca337b0d
GLUON_GIT_REF := 6899e50c97b34976fcb7d627062e6effa8078067
#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43

119
extra/ffrgb.conf Normal file
View File

@ -0,0 +1,119 @@
{
hostname_prefix = '',
site_name = 'Freifunk Regensburg',
site_code = 'ffrgb',
opkg = {
openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
},
prefix4 = '10.90.0.0/19',
prefix6 = 'fdef:f00f:1337:cafe/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
mesh_on_wan = true,
regdom = 'DE',
wifi24 = {
channel = 1,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
}
},
next_node = {
ip4 = '10.90.0.1',
ip6 = 'fdef:f00f:1337:cafe::1',
mac = '16:41:95:40:f7:dd',
},
fastd_mesh_vpn = {
bandwidth_limit = {
enabled = false,
ingress = 12000,
egress = 1200,
},
methods = {'salsa2012+umac'},
mtu = 1426,
groups = {
backbone = {
limit = 2,
peers = {
gw01 = { --[[ sven ]]
key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
remotes = {
'ipv4 "78.47.168.108" port 10000',
},
},
gw02 = { --[[ alamar ]]
key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
remotes = {
'ipv4 "185.53.218.23" port 10000',
},
},
gw04 = { --[[ mephisto ]]
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
remotes = {
'ipv4 "213.166.225.5" port 10000',
},
},
},
},
},
},
autoupdater = {
enabled = 1,
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/',
},
probability = 0.1,
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/',
},
probability = 0.5,
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
},
},
},
},
}
-- vim: set ft=lua:ts=2:sw=2:et

119
extra/ffrgb_umland.conf Normal file
View File

@ -0,0 +1,119 @@
{
hostname_prefix = '',
site_name = 'Freifunk Regensburg Umland',
site_code = 'ffrgb_umland',
opkg = {
openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
},
prefix4 = '10.90.32.0/19',
prefix6 = 'fdef:f00f:1337:caff/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
mesh_on_wan = true,
regdom = 'DE',
wifi24 = {
channel = 1,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb.umland',
bssid = '02:0E:8E:1E:61:18',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb.umland',
bssid = '02:0E:8E:1E:61:18',
mcast_rate = 12000,
}
},
next_node = {
ip4 = '10.90.32.1',
ip6 = 'fdef:f00f:1337:caff::1',
mac = '16:41:95:40:f7:dd',
},
fastd_mesh_vpn = {
bandwidth_limit = {
enabled = false,
ingress = 12000,
egress = 1200,
},
methods = {'salsa2012+umac'},
mtu = 1426,
groups = {
backbone = {
limit = 2,
peers = {
gw01 = { --[[ sven ]]
key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
remotes = {
'ipv4 "78.47.168.108" port 10010',
},
},
gw02 = { --[[ alamar ]]
key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
remotes = {
'ipv4 "185.53.218.23" port 10010',
},
},
gw04 = { --[[ mephisto ]]
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
remotes = {
'ipv4 "213.166.225.5" port 10010',
},
},
},
},
},
},
autoupdater = {
enabled = 1,
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/',
},
probability = 0.1,
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/',
},
probability = 0.5,
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
},
},
},
},
}
-- vim: set ft=lua:ts=2:sw=2:et

7
modules
View File

@ -1,3 +1,4 @@
GLUON_SITE_FEEDS='ffmuc_packages'
PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/ffrgb/gluon-packages.git
PACKAGES_FFMUC_PACKAGES_COMMIT=3441ee26433d2bd35a27440add6d6b686c1f4b38
GLUON_SITE_FEEDS='ffrgb'
PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
PACKAGES_FFRGB_BRANCH=master
PACKAGES_FFRGB_COMMIT=68f1139ad72ce1a50320eee02aa6797967b9c214

4
site.conf
View File

@ -1,13 +1,13 @@
{
hostname_prefix = '',
site_name = 'Freifunk Regensburg',
site_code = 'ffrgb-bat15',
site_code = 'ffrgb',
opkg = {
openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
},
prefix4 = '10.90.0.0/16',
prefix4 = '10.90.0.0/19',
prefix6 = 'fdef:f00f:1337:cafe/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',

2
site.mk
View File

@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \
haveged \
gluon-ebtables-filter-arp-ffmuc \
gluon-ebtables-filter-multicast-ffmuc
# gluon-config-mode-site-select
# basic support for USB stack
USB_PACKAGES_BASIC := \