Compare commits

...

5 commits

Author SHA1 Message Date
bdobe
09df081aaa Release v0.7.1 2015-10-30 21:45:01 +01:00
bdobe
c34140504b Add package fastd-traffic-status 2015-10-12 22:04:14 +02:00
bdobe
38456c8b19 Add package gluon-ebtables-filter-multicast-ffhh 2015-10-04 22:03:35 +02:00
bdobe
127956a1ba Change VPN mtu to 1280 2015-10-03 17:38:12 +02:00
bdobe
2c4d21b366 Update Branch v0.7.x 2015-10-03 17:24:21 +02:00
4 changed files with 14 additions and 11 deletions

View file

@ -1,5 +1,5 @@
#### How to build the Freifunk Hamburg Firmware #### How to build the Freifunk Hamburg Firmware
git clone https://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository git clone https://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository
cd gluon cd gluon
git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository
@ -11,6 +11,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds #### Gluon versions used for specific Hamburg Freifunk Firmware builds
- 0.7.1: v2015.1.2
- 0.7: v2015.1 - 0.7: v2015.1
- 0.6: v2014.4 - 0.6: v2014.4
- 0.5: v2014.3 - 0.5: v2014.3
@ -19,4 +20,4 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
- 0.4.1: v2014.2-hh - 0.4.1: v2014.2-hh
- equal to official gluon v2014.2 + ffhh specific patches - equal to official gluon v2014.2 + ffhh specific patches
- 0.4a: v2014.1a - 0.4a: v2014.1a
- equal to official gluon v2014.1 + ffhh specific patches - equal to official gluon v2014.1 + ffhh specific patches

View file

@ -1,4 +1,4 @@
GLUON_SITE_FEEDS='ffhh_packages' GLUON_SITE_FEEDS='ffhh_packages'
PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
PACKAGES_FFHH_PACKAGES_COMMIT=818765060bc76a109dde1558513fd086e5973ef1 PACKAGES_FFHH_PACKAGES_COMMIT=0a70ceb1c636a5a21ce47e39513031e3794daea2

View file

@ -38,22 +38,22 @@
fastd_mesh_vpn = { fastd_mesh_vpn = {
enabled = true, enabled = true,
methods = {'salsa2012+umac'}, methods = {'salsa2012+umac'},
mtu = 1406, mtu = 1280,
groups = { groups = {
backbone = { backbone = {
limit = 1, limit = 1,
peers = { peers = {
gateway01 = { gateway01 = {
key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58', key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58',
remotes = {'"gw01.hamburg.freifunk.net" port 10000'}, remotes = {'"gw01.hamburg.freifunk.net" port 10001'},
}, },
gateway02 = { gateway02 = {
key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
remotes = {'"gw02.hamburg.freifunk.net" port 10000'}, remotes = {'"gw02.hamburg.freifunk.net" port 10001'},
}, },
gateway03 = { gateway03 = {
key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546', key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
remotes = {'"gw03.hamburg.freifunk.net" port 10000'}, remotes = {'"gw03.hamburg.freifunk.net" port 10001'},
}, },
gateway04 = { gateway04 = {
key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf', key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf',
@ -107,7 +107,7 @@
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
}, },
}, },
experimental = { experimental = {
name = 'experimental', name = 'experimental',

View file

@ -4,11 +4,12 @@ GLUON_SITE_PACKAGES := \
gluon-announced \ gluon-announced \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-autoupdater \ gluon-config-mode-autoupdater \
gluon-config-mode-core \ gluon-config-mode-core \
gluon-config-mode-hostname \ gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \ gluon-config-mode-mesh-vpn \
gluon-config-mode-reboot-ffhh \ gluon-config-mode-reboot-ffhh \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
gluon-ebtables-filter-multicast-ffhh \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-legacy \ gluon-legacy \
gluon-luci-admin \ gluon-luci-admin \
@ -18,14 +19,15 @@ GLUON_SITE_PACKAGES := \
gluon-next-node \ gluon-next-node \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \ gluon-setup-mode \
gluon-status-page \ gluon-status-page \
fastd-traffic-status \
iwinfo \ iwinfo \
iptables \ iptables \
haveged haveged
DEFAULT_GLUON_RELEASE := 0.7 DEFAULT_GLUON_RELEASE := 0.7.1
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)