Compare commits

..

158 commits

Author SHA1 Message Date
Daniel Frank
b3c3b41e30
support BUILD_DATE for experimental versions 2024-11-04 20:05:53 +01:00
Daniel Frank
db81f77fd0
dont nuke the output directory on each run 2024-11-04 00:49:48 +01:00
Daniel Frank
9c77f19549
v2023.2.4.0 2024-11-01 20:52:11 +01:00
Entil_Zha
6251517fe4 add mediatek-filogic targets 2024-09-16 19:38:57 +02:00
Daniel Frank
87e65917f8
v2023.2.2.0 2024-03-26 21:34:19 +01:00
Daniel Frank
1a956e5375
add updates for v2023.2 from Björn 2024-03-26 21:33:19 +01:00
Daniel Frank
6436e5cec6
v2023.1.2 2024-03-25 17:00:17 +01:00
Daniel Frank
e0206d0372
v2022.1.4.0 2024-02-02 20:05:50 +01:00
Daniel Frank
cd2d266749
Updates for v2022.1.3.0 2023-03-20 20:11:49 +01:00
Daniel Frank
df829eb3d0
Update for v2022.1.1.0 2023-02-06 20:48:42 +01:00
Daniel Frank
932dfba35e Updates for gluon v2022.1 2022-10-17 20:29:52 +02:00
Daniel Frank
639d076417
Add new version numbers in preparation for the security update 2022-05-05 18:21:32 +02:00
Daniel Frank
7ad2cd6af6
build.sh: fix broken build.sh 2022-05-02 21:37:49 +02:00
Daniel Frank
4dd3a72978
Merge remote-tracking branch 'x/master' 2022-03-21 21:55:52 +01:00
Daniel Frank
9647ec4693
Updates for v2021.1.1.0 2022-03-21 21:53:35 +01:00
Daniel Frank
cffd0a8553
no more git on github 2022-01-11 01:25:05 +01:00
Daniel Frank
28795fdd67
Updates for v2021.1.1.0 2022-01-10 20:29:37 +01:00
Daniel Frank
9ddf2f6720
Prepare release of v2020.2.3.0 2021-05-17 20:05:27 +02:00
Daniel Frank
78606aea3a
Prepare v2020.2.2.0 2020-12-16 22:08:57 +01:00
Daniel Frank
8e01a9a42a
README update for v2020.1.4.0 2020-09-12 00:37:24 +02:00
f996941c77 site.mk: remove haveged
Remove the package haveged from site config, since it is no longer supported from Gluon
2020.2.
2020-08-08 12:16:24 +02:00
Daniel Frank
5e24ad535b
Merge branch 'rubo77-indentions' 2020-06-22 20:54:21 +02:00
Daniel Frank
3eae036e64
merge commits from rubo77 2020-06-22 20:54:06 +02:00
bdobe
0d3140f325 site.conf: add channel list for 5GHz outdoor mode 2020-06-22 20:10:36 +02:00
Daniel Frank
ccad2d2a2b
Bump to v2020.1.3.0 2020-06-20 22:01:31 +02:00
Daniel Frank
48083c51de
bump version to 2019.1.2 2020-06-08 20:47:09 +02:00
Ruben Barkow
c23854de97 add gluon-radv-filterd 2019-12-22 01:16:29 +01:00
Ruben Barkow-Kuder
049172bb03 add web-private-wifi 2019-12-22 01:01:22 +01:00
Daniel Frank
dcc3abbea9
Prepare migration to gluon v2019.1 2019-12-13 22:11:59 +01:00
Ruben Barkow
553ba5c01e
unify setting of extra software on x86-generic and x86-64 2019-12-01 19:50:36 +01:00
Ruben Barkow
cd90115c74
gluon-radvd and gluon-ebtables-limit-arp are already in batman feature 2019-12-01 19:44:54 +01:00
Ruben Barkow
e5934ce04f
fix indentions 2019-12-01 19:37:15 +01:00
Daniel Frank
88a1d79c85
build.sh: get rid of some shellcheck warnings 2019-09-21 16:41:58 +02:00
Daniel Frank
a60bb91b77
build.sh: Fix a stupid error that prevents building without -v
Signed-off-by: Daniel Frank <git@danielfrank.net>
2019-09-21 16:39:00 +02:00
Daniel Frank
678c61ae10
Update README.md for v2018.2.3.0
(cherry picked from commit 4608dcd94a)
2019-09-13 20:30:10 +02:00
Daniel Frank
2affcbeb3e
build.sh: create images.list with first line indication the release version 2019-09-06 21:32:13 +02:00
Daniel Frank
9ec6df8a05
set mesh.batman_adv.routing_algo to BATMAN_IV as it is now mandatory 2019-09-06 21:26:31 +02:00
Daniel Frank
91adc78646
Cleanup some wrong indentation 2019-09-06 20:49:01 +02:00
Daniel Frank
74088a18a9
build.sh: fix remove known-broken images after the build 2019-08-18 23:55:55 +02:00
Daniel Frank
50b79c0dc4
build.sh: remove known-broken images after the build 2019-08-18 13:16:31 +02:00
Daniel Frank
cfebeb94b5
build.sh: some cleanup with shellcheck 2019-08-18 13:15:52 +02:00
Daniel Frank
fbb4b5dc78
build.sh: use list-targets make target 2019-08-16 23:23:55 +02:00
Daniel Frank
44e04d3d9c
build.sh: dont build everything while detecting the targets... 2019-08-16 23:01:45 +02:00
Daniel Frank
f4b45ff5f7
build.sh: the make that lists the targets can run a long time, copy the output to /dev/stderr 2019-08-16 22:58:56 +02:00
Daniel Frank
e763875644
build.sh: fix the ordering of the steps 2019-08-16 22:53:20 +02:00
Daniel Frank
9eadb86c82
build.sh: automatically detect available targets and build them all 2019-08-16 22:44:43 +02:00
Daniel Frank
bc82d9d6b7
Add GLUON_DEPRECATED variable 2019-07-05 21:16:12 +02:00
bobcanthelpyou
23952fdaf5 remove obsolete wifi24 rates settings 2019-07-05 20:39:31 +02:00
bobcanthelpyou
256e9dfe98 Remove lede opkg mirror 2019-07-05 20:37:55 +02:00
Daniel Frank
12e8b053f5
fix some (not all) warnings that shellcheck displays 2019-05-26 22:14:30 +02:00
Daniel Frank
1dc6507e8c
rename target sunxi to sunxi-cortexa7 2019-04-27 22:58:53 +02:00
Daniel Frank
7c9f32db1e
rename target ramips-mt7628 to ramips-mt76x8 2019-04-26 22:20:13 +02:00
Daniel Frank
67ee1300b8
Bump version numbers for v2018.2.1.0 2019-04-26 19:47:12 +02:00
Daniel Frank
4fb0b6769a
fix the list of the firmware files in images.list to include symlinks 2019-04-26 17:33:05 +02:00
Daniel Frank
001a6b6a6b
generate images.list after building the firmware 2019-04-26 17:33:01 +02:00
Daniel Frank
7bbd9ad621
Fix stable target build list 2019-02-18 20:45:31 +01:00
Daniel Frank
feb4f63df7
Move update servers away from .ffhh domain 2019-02-10 17:23:58 +01:00
Daniel Frank
4914976cda
Update targets 2019-02-08 21:48:18 +01:00
Daniel Frank
6201fe4f06
Fix package directory and path for the autoupdater 2019-02-08 21:44:15 +01:00
Daniel Frank
bc84c03fc4
Update readme for single domain firmware 2019-02-08 20:56:16 +01:00
Daniel Frank
40b96f1213
Version bump v2018.1.4.2 2019-02-08 15:34:43 +01:00
Daniel Frank
35d976d136
build.sh bugfix für experimental 2019-02-04 22:28:09 +01:00
Daniel Frank
680e7a2501
Fix Version and update URL for autoupdate 2019-02-01 21:17:33 +01:00
Daniel Frank
f86bb6ca0c
bump version numbers to gluon v2018.1.4 2018-12-21 20:27:38 +01:00
Daniel Frank
b8cdd47059
Update README.md for v2018.1.3.0
(cherry picked from commit eb41a5a3cd)
2018-11-30 21:53:46 +01:00
Daniel Frank
d1ff8a93ea
Variable was renamed to GLUON_WLAN_MESH and 11s is the default, so just remove the variable 2018-11-04 21:59:52 +01:00
Matthias Wientapper
791e08de22 Text für Multi-Domain Konfigurationsseite 2018-10-15 19:21:38 +02:00
Daniel Frank
e59d96d6dd
Umbau auf Multi-Domain firmware 2018-10-05 21:52:55 +02:00
Daniel Frank
bd5ba8ca40
Neues Paket: gluon-web-mesh-vpn-fastd 2018-09-28 20:55:08 +02:00
Daniel Frank
7161a0bc69
Eingabe eines Knotennamens erzwingen 2018-09-28 20:00:36 +02:00
Daniel Frank
86637d7262
Migration zu Gluon Features 2018-09-24 21:48:47 +02:00
Daniel Frank
fa474b7a7d
Set config_mode options for hostname 2018-09-23 23:21:05 +02:00
Daniel Frank
2f528b1c44
Targets für Gluon master setzen 2018-09-21 19:51:50 +02:00
Daniel Frank
af558e4676
build.sh: Allow specifying the gluon targets that should be built 2018-09-07 21:07:51 +02:00
Daniel Frank
7e94b11623
Targets für v2018.1.1.0-exp aktualisieren 2018-08-30 19:03:18 +02:00
Daniel Frank
c1f2d4ec37
Targets für v2018.1.1.0 aktualisieren 2018-08-28 23:41:02 +02:00
Daniel Frank
dc5cc9eb69
Update für Gluon v2018.1.1 2018-08-28 21:47:53 +02:00
Daniel Frank
2bd0396c03
Update targets 2018-08-06 19:57:33 +02:00
Daniel Frank
b3b559103e
prepare next stable v2018.1.0.0 2018-07-30 20:31:23 +02:00
Daniel Frank
4b9b64fe8d
fix a comment 2018-07-30 20:23:37 +02:00
Daniel Frank
0b518e27fd
Add more targets when potentially broken models are included 2018-07-30 20:12:06 +02:00
Daniel Frank
2839cdc451 Update version number for next gluon build 2018-07-13 22:21:50 +02:00
Daniel Frank
729407b789 Disable VXLAN until we have a migration path 2018-07-13 20:09:02 +02:00
Daniel Frank
16d601c9c9 Update readme for v0.9.2 2018-07-09 19:13:55 +02:00
Daniel Frank
dd949f3db3 Package removed in master by gluon #1339 2018-04-06 21:59:26 +02:00
Daniel Frank
10ce183652 fix 11s mesh build 2018-04-06 21:50:20 +02:00
Daniel Frank
d7a554c430 rework build.sh option parsing 2018-04-06 21:46:23 +02:00
Daniel Frank
7381c864ac update build.sh shebang 2018-04-06 21:33:30 +02:00
Daniel Frank
1af0a7fa5f domain seed aus site_code generieren lassen 2018-04-06 20:44:33 +02:00
Daniel Frank
c4c8ed4596 ibss aus config entfernen. gluon-mesh-batman-adv-15 in die zentrale config verschieben 2018-04-06 20:43:58 +02:00
Daniel Frank
8767ae099d bump version 2018-04-06 20:40:37 +02:00
Daniel Frank
e3d70eb44e Update README.md for 0.9.1 2018-02-13 21:08:59 +01:00
Daniel Frank
6fe02bdcba 0.9.1 stable preparation 2018-02-08 21:36:46 +01:00
Entil-Zha
bf41f1cf37 add x86 extras 2018-02-05 19:02:27 +01:00
Daniel Frank
b4bcec2c52 Add new target to build: ramips-mt7621 2018-02-04 02:10:18 +01:00
Daniel Frank
7a94914ecd Update version number to 0.9.1 experimental 2018-02-04 02:07:59 +01:00
Daniel Frank
9fd3468455 Change separator from + to ~ between version and "exp" 2018-02-04 02:07:19 +01:00
Daniel Frank
656fa92f2f Update README.md for the upcoming v0.9.1 2018-02-04 02:04:23 +01:00
Alexander
b3b01248aa
Update README.md 2018-02-03 15:55:16 +01:00
Daniel Frank
49510972d0 Update README for 0.9.0-stable 2018-01-30 19:42:33 +01:00
Daniel Frank
60f3038220 v0.9.0-stable 2018-01-26 20:49:19 +01:00
Daniel Frank
e19deffe61 yay... more xml... 2018-01-19 23:25:17 +01:00
Daniel Frank
2176aa8a1d yay... xml... 2018-01-19 23:12:30 +01:00
Daniel Frank
bc6d9bd33b the config mode reboot package is not required anymore 2018-01-19 22:19:57 +01:00
Daniel Frank
0ed780b634 Add the support for the form for Freifunk Hamburg 2018-01-19 20:18:49 +01:00
Daniel Frank
96046d19ef Update .gitignore 2018-01-19 20:16:05 +01:00
Daniel Frank
7a9d0ef39d yet another wrong variable 2017-12-30 22:13:57 +01:00
Daniel Frank
bb74591544 one more bugfix (variables didnt exist anymore) 2017-12-30 20:06:26 +01:00
Daniel Frank
bd256ba6c0 bug fixes durch lede änderungen und jede domain hatte die gleiche mesh id 2017-12-30 20:02:48 +01:00
Daniel Frank
33d9a521ca Alte ffhh Site löschen und die neuen Sites eintragen 2017-12-19 03:17:57 +01:00
Daniel Frank
8f67ce9aac Paket gluon-ebtables-source-filter ersetzt das Gluon v2016er Paket ffho-ebtables-net-rules 2017-12-19 03:12:10 +01:00
Daniel Frank
1dcb8657d7 Alle Targets von LEDE bauen 2017-12-19 03:11:17 +01:00
Daniel Frank
03a399b547 Update the build.sh in master to the version used in 0.8.x 2017-12-19 03:00:34 +01:00
Daniel Frank
1544c80a4f Baldo hat den Key nicht mehr
(cherry picked from commit 6691d80454)
2017-12-19 02:55:13 +01:00
Daniel Frank
76214078fc Neuer NTP-Server 3.ntp.services.ffhh
(cherry picked from commit 0971a6125c)
2017-12-19 02:54:09 +01:00
Daniel Frank
a99439a550 Add key for Olli 2017-12-18 22:01:15 +01:00
Alexander
c2486baaaf Add key for Alexander 2017-12-18 21:58:59 +01:00
Daniel Frank
c43417bdea gw01-new hatte einen falschen key
(cherry picked from commit c7f81cc3b3)
2017-11-28 19:14:12 +01:00
Daniel Frank
a4bb8b863d Copy build.sh from 0.8.x 2017-10-30 21:08:43 +01:00
Entil-Zha
3e1e1a5c4c change URL 2017-10-23 21:53:13 +02:00
Entil-Zha
552d48b12f change URL 2017-10-23 21:16:18 +02:00
Daniel Frank
4d541e6a9d Merge pull request #17 from tokudan/master
Migration to LEDE
2017-10-23 20:53:24 +02:00
Daniel Frank
c917ae5dfd Migration to LEDE 2017-10-22 22:31:54 +02:00
bdobe
4bb15ab0f9
Update readme 2017-09-18 20:11:33 +02:00
bdobe
10d96dfd8b
Delete modules file from config root 2017-09-18 20:09:10 +02:00
bdobe
1fac91557f
Change to config structure for multiple sites. Merge site ffhh-sued to master branch 2017-09-18 20:06:18 +02:00
Entil-Zha
2c22d01c85 Merge pull request #14 from tokudan/master
Neuer key für tokudan
2017-09-04 19:35:31 +02:00
Daniel Frank
f416dcd4e3 Neuer key für tokudan 2017-09-04 19:29:09 +02:00
bdobe
b651e7046b
site.mk: prepare for next LEDE based releases 2017-01-19 18:18:30 +01:00
bdobe
cc1159b149
modules: Update ffhh packages 2017-01-19 18:12:56 +01:00
bdobe
d73c8964ec
site.conf: Add PoE pass through option to config mode 2016-11-07 10:11:06 +01:00
bdobe
530cda260f site.mk: remove package fastd-traffic-status 2016-10-04 20:36:20 +02:00
bdobe
9b6934c63b modules: Update ffhh packages 2016-10-04 19:54:04 +02:00
bdobe
c3506961fd site.mk: package gluon-ebtables-segment-mld added 2016-09-26 22:41:28 +02:00
bdobe
a56476065f site.mk: set GLUON_ATH10K_MESH default to ibss 2016-09-26 22:39:19 +02:00
bdobe
363d59571b site.conf: default VPN bandwidth limit raised 2016-09-26 22:36:16 +02:00
bdobe
7c9ce52ad0 site.conf: support for 802.11b data rates removed 2016-09-26 22:33:57 +02:00
bdobe
3d7324cbc4 i18n: adjustments for gluon v2016.2 2016-09-26 22:32:15 +02:00
bdobe
f033bb58e2 site.mk: add region code 2016-09-08 17:40:42 +02:00
bdobe
4a0e71421f Next experimental releases 0.8+ 2016-05-07 20:29:36 +02:00
bdobe
7b80b2a113 Release v0.8 2016-05-06 20:37:57 +02:00
bdobe
766b9e70d5 site.mk: replace package gluon-announced with gluon-respondd 2016-02-02 19:25:28 +01:00
bdobe
05905b9d3e Add opkg repository for ffhh firmware modules 2015-11-23 17:07:46 +01:00
bdobe
5519342b49 Remove package gluon-ebtables-filter-multicast-ffhh
The multicast rule set is now included in gluon-ebtables-filter-multicast.
2015-11-23 17:00:01 +01:00
bdobe
21a63e9cd2 Remove obsolete htmode settings 2015-11-21 18:32:44 +01:00
bdobe
74e4b23303 Disable 802.11s mesh 2015-11-13 21:58:30 +01:00
bdobe
8998f1188c Add package fastd-traffic-status 2015-10-17 20:43:07 +02:00
bdobe
568ade3137 Add package gluon-ebtables-filter-multicast-ffhh 2015-10-17 20:42:16 +02:00
bdobe
6fbf2e6cba site.conf: Adjust to new opkg configuration 2015-10-15 23:42:32 +02:00
bdobe
81e7d06331 site.conf: Move bandwidth limitation settings to VPN section 2015-10-15 23:38:14 +02:00
bdobe
92609e8b99 Change VPN mtu to 1280 2015-10-15 23:22:20 +02:00
bdobe
9b5452f4a5 i18n: adjust pubkey message 2015-09-02 21:14:08 +02:00
bdobe
a620e66ae7 Add Bjoerns image signing key 2015-08-08 00:28:33 +02:00
bdobe
ebc2a63907 Add 802.11s mesh interface 2015-08-07 22:22:56 +02:00
bdobe
e06b25f7eb New experimental release with gluon-luci-wifi-config 2015-07-21 22:06:23 +02:00
bdobe
ff7dfe0b8b Update opkg repo to 15.05-rc2 2015-06-16 07:25:36 +02:00
bdobe
6a73a2e1ce Remove support for upgrading legacy nodes
Directly upgrade from pre-gluon notes is no longer supported.

This commit also cleans some white spaces.
2015-06-14 21:34:40 +02:00
bdobe
2b9e831a7b new experimental / switch to Chaos Calmer 2015-06-06 10:21:04 +02:00
14 changed files with 626 additions and 150 deletions

2
.gitignore vendored
View file

@ -1 +1,3 @@
*~ *~
info
sites/

View file

@ -1,19 +1,55 @@
#### 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 In the next two commands replace GLUON_VERSION and SITE_VERSION with the actual version numbers.
cd gluon $ git clone -b GLUON_VERSION https://github.com/freifunk-gluon/gluon.git
git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository $ git clone -b SITE_VERSION https://git.hamburg.ccc.de/freifunk/site-ffhh.git
make update # Get other repositories used by Gluon $ cd site-ffhh
make # Build Gluon
To build the firmware into the subdirectory firmware:
$ ./build.sh -g ../gluon -o firmware
The build.sh supports the argument -b if you wish to also build firmware images marked as broken in gluon.
Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process. Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process.
#### Gluon versions used for specific Hamburg Freifunk Firmware builds #### Gluon versions used for specific Hamburg Freifunk Firmware builds
- v2023.2.4.0: site-ffhh: v2023.2.4.0, gluon: v2023.2.4
- v2023.2.2.1: site-ffhh: v2023.2.2.0, gluon: v2023.2.2 (add mediatek-filogic Routers)
- v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
- v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
- v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3 (nur experimental verteilt)
- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
- v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
- v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
- v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
- v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
- v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
- v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
- v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
- v2018.1.4.1: site-ffhh: v2018.1.4.1, gluon: v2018.1.4
- v2018.1.4.0: site-ffhh: v2018.1.4.0, gluon: v2018.1.4
- v2018.1.3.0: site-ffhh: v2018.1.3.0, gluon: v2018.1.3
- v2018.1.1.0: site-ffhh: v2018.1.1.0, gluon: v2018.1.1
- v2018.1.0.0: site-ffhh: v2018.1.0.0, gluon: v2018.1 (never rolled out due to issues with the auto updater in gluon)
- 0.9.2: site-ffhh: v0.9.2, gluon: v2017.1.8
- 0.9.1: site-ffhh: v0.9.1, gluon: v2017.1.5
- 0.9.0: site-ffhh: 60f30382209ffc050baa82be9bad3622a1d88d5b, gluon: v2017.1.x (9295abcea7b016b0fe4b05c534ea0731b48ef593) (never rolled out due to 0.9.1)
- 0.8.6: v2016.2.7 Fix gw01-new key, add 3.ntp.services.ffhh to NTP servers, add Firmware signing keys for Alexander and Olli, remove old domain
- 0.8.5: v2016.2.7 Domain split, new package: ffho-ebtables-net-rules
- 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4)
- 0.8.3: v2016.2.6 (ffhh-sued only)
- 0.8.2: v2016.2.5
- 0.8.1: v2016.2.4 (ffhh-sued only)
- 0.8: v2016.1.4
- 0.7.1: v2015.1.2 - 0.7.1: v2015.1.2
- 0.7: v2015.1 - 0.7: v2015.1
- 0.6: v2014.4 - 0.6: v2014.4
- 0.5.1: v2014.3.1
- 0.5: v2014.3 - 0.5: v2014.3
- 0.4.2: v2014.2 - 0.4.2: v2014.2
- note: no gluon fork used anymore - note: no gluon fork used anymore

5
build.conf Normal file
View file

@ -0,0 +1,5 @@
GLUON_RELEASE="v2023.2.4.0"
targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-filogic mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
)

138
build.sh Executable file
View file

@ -0,0 +1,138 @@
#!/usr/bin/env bash
set -e
function announce () {
echo '############################' "$@" >&2
}
function usage () {
echo "Usage: $0 -g GLUON_PATH" >&2
echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2
echo " -t TARGETS Comma separated list of gluon targets to build" >&2
echo " -a Automatically detect and build all targets." >&2
echo " -o OUT_PATH Path to the firmware output directory. Default: ${gluon_out}" >&2
echo " -s SIGNATURE Sign firmware with signature" >&2
echo " -stable Set GLUON_AUTOUPDATER_BRANCH=stable" >&2
echo " -b BROKEN=1" >&2
echo " -v verbose" >&2
echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2
}
proc=$(nproc)
gluon_out="${HOME}/firmware"
while [ $# -gt 0 ]; do
case "$1" in
-a)
auto_targets=1
;;
-g)
gluon_path="$2"
shift
;;
-t)
build_targets="$2"
shift
;;
-o)
gluon_out="$2"
shift
;;
-s)
signature="$2"
shift
;;
-stable)
export GLUON_AUTOUPDATER_BRANCH=stable
;;
-b)
export BROKEN=1
;;
-j)
proc="$2"
shift
;;
-v)
verbose=V=s
;;
*)
echo ERROR: Failed to parse: "${1}" >&2
usage
exit 1
;;
esac
shift
done
if [ -z "$gluon_path" ]; then
usage
exit 1
fi
gluon_path=$(realpath "$gluon_path")
gluon_out=$(realpath "$gluon_out")
site_path=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
announce GLUON: "$gluon_path" >&2
announce FFHH SITE PATH: "$site_path" >&2
pushd "$site_path"
# shellcheck source=/dev/null
. ./build.conf
GLUON_AUTOUPDATER_BRANCH="${GLUON_AUTOUPDATER_BRANCH:-experimental}"
[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp${BUILD_DATE:-$(date +%Y%m%d)}"
export GLUON_RELEASE
export GLUON_AUTOUPDATER_BRANCH
export GLUON_SITEDIR="${site_path}"
export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
popd
announce GLUON Variables:
env | egrep '^GLUON' | sort
pushd "${gluon_path}"
announce Starting make update...
mkdir -p "${GLUON_OUTPUTDIR}"
make update
# Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
for p in "${site_path}"/patches/*.patch; do
if [ -e "$p" ] && [ ! -f "${gluon_path}/${p##*/}" ]; then
announce "Installing patch $p"
patch -p1 < "$p"
touch "${gluon_path}/${p##*/}"
fi
done
if [ "$auto_targets" = "1" ]; then
# detect available targets
targets="$(make list-targets | sort | xargs)"
else
# if a list of build targets has been supplied, only build those
targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
fi
announce "The following targets will be generated: $targets" >&2
for t in $targets; do
announce "Starting build for $t..." >&2
make "-j$(nproc)" "GLUON_TARGET=$t" $verbose
done
# Remove known-broken images
# shellcheck disable=SC2154
for broken_image in "${broken_images[@]}"; do
announce "Removing broken image ${broken_image}..."
find "${GLUON_OUTPUTDIR}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \;
done
# Generate the images.list
# shellcheck disable=SC2094
( cd "${GLUON_OUTPUTDIR}/images" && ( echo "RELEASE=${GLUON_RELEASE}"; find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
announce Building manifest...
make manifest
if [ -n "${signature}" ]; then
if [ "$GLUON_AUTOUPDATER_BRANCH" == "experimental" ]; then
announce Signing...
"${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest"
else
echo ERROR: can only sign experimental branch >&2
exit 1
fi
fi
popd

75
domains/ffhh_nowe.conf Normal file
View file

@ -0,0 +1,75 @@
{
domain_names = {
ffhh_nowe = "Hamburg Nordwest",
},
domain_seed = '666668682D6E6F776548616D6275726748616D6275726748616D627572674861',
prefix4 = '10.112.192.0/19',
prefix6 = '2a03:2267:3::/64',
next_node = {
ip4 = '10.112.192.1',
ip6 = '2a03:2267:3::1',
mac = '16:41:95:40:f7:dc',
},
wifi24 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '6668682D6E6F7765',
},
},
wifi5 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '6668682D6E6F7765',
},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = "BATMAN_IV",
},
},
mesh_vpn = {
fastd = {
groups = {
backbone = {
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10007' },
key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
remotes = { '"gw02-new.hamburg.freifunk.net" port 10007' },
key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10007' },
key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10008' },
key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10008' },
key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
remotes = { '"gw06-new.hamburg.freifunk.net" port 10008' },
key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
},
},
},
},
},
},
}

75
domains/ffhh_ost.conf Normal file
View file

@ -0,0 +1,75 @@
{
domain_names = {
ffhh_ost = "Hamburg Ost",
},
domain_seed = '666668682D6F737448616D6275726748616D6275726748616D6275726748616D',
prefix4 = '10.112.224.0/19',
prefix6 = '2a03:2267:4::/64',
next_node = {
ip4 = '10.112.224.1',
ip6 = '2a03:2267:4::1',
mac = '16:41:95:40:f7:dc',
},
wifi24 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '666668682D6F7374',
},
},
wifi5 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '666668682D6F7374',
},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = "BATMAN_IV",
},
},
mesh_vpn = {
fastd = {
groups = {
backbone = {
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10009' },
key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
remotes = { '"gw02-new.hamburg.freifunk.net" port 10009' },
key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10009' },
key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10010' },
key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10010' },
key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
remotes = { '"gw06-new.hamburg.freifunk.net" port 10010' },
},
},
},
},
},
},
}

75
domains/ffhh_sued.conf Normal file
View file

@ -0,0 +1,75 @@
{
domain_names = {
ffhh_sued = "Hamburg Süd",
},
domain_seed = '666668682D7375656448616D6275726748616D6275726748616D627572674861',
prefix4 = '10.112.64.0/19',
prefix6 = '2a03:2267:1::/64',
next_node = {
ip4 = '10.112.64.1',
ip6 = '2a03:2267:1::1',
mac = '16:41:95:40:f7:dc',
},
wifi24 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '6668682D73756564',
},
},
wifi5 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '6668682D73756564',
},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = "BATMAN_IV",
},
},
mesh_vpn = {
fastd = {
groups = {
backbone = {
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10003' },
key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
remotes = { '"gw02-new.hamburg.freifunk.net" port 10003' },
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10003' },
key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10004' },
key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10004' },
key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
remotes = { '"gw06-new.hamburg.freifunk.net" port 10004' },
key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
},
},
},
},
},
},
}

75
domains/ffhh_west.conf Normal file
View file

@ -0,0 +1,75 @@
{
domain_names = {
ffhh_west = "Hamburg West",
},
domain_seed = '666668682D7765737448616D6275726748616D6275726748616D627572674861',
prefix4 = '10.112.96.0/19',
prefix6 = '2a03:2267:2::/64',
next_node = {
ip4 = '10.112.96.1',
ip6 = '2a03:2267:2::1',
mac = '16:41:95:40:f7:dc',
},
wifi24 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '6668682D77657374',
},
},
wifi5 = {
ap = {
ssid = "hamburg.freifunk.net",
},
mesh = {
id = '6668682D77657374',
},
},
mesh = {
vxlan = false,
batman_adv = {
routing_algo = "BATMAN_IV",
},
},
mesh_vpn = {
fastd = {
groups = {
backbone = {
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10005' },
key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
remotes = { '"gw02-new.hamburg.freifunk.net" port 10005' },
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10005' },
key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10006' },
key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10006' },
key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
remotes = { '"gw06-new.hamburg.freifunk.net" port 10006' },
key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
},
},
},
},
},
},
}

View file

@ -17,13 +17,26 @@ msgstr ""
"entsprechend aus und sende es ab. " "entsprechend aus und sende es ab. "
"Den unten anzugebenden Knotennamen kannst du beliebig wählen. Denke Dir also etwas schönes aus. Er ist der Name des Knotens im Netzwerk und hat nichts mit dem ausgestrahlten Netzwerknamen (SSID) zu tun. Letzterer ist immer hamburg.freifunk.net." "Den unten anzugebenden Knotennamen kannst du beliebig wählen. Denke Dir also etwas schönes aus. Er ist der Name des Knotens im Netzwerk und hat nichts mit dem ausgestrahlten Netzwerknamen (SSID) zu tun. Letzterer ist immer hamburg.freifunk.net."
msgid "gluon-config-mode:domain"
msgstr "Domäne"
msgid "gluon-config-mode:domain-select"
msgstr ""
"Hier kannst du Domäne auswählen, in dem sich dein Knoten befindet. "
"Bitte bedenke, dass sich dein Knoten nur mit Routern in der gleichen Domäne verbinden kann."
msgid "gluon-config-mode:pubkey" msgid "gluon-config-mode:pubkey"
msgstr "" msgstr ""
"Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " "<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem "
"er auf den Servern des Hamburger Freifunk-Projektes eingetragen wurde, " "er auf den Servern des Hamburger Freifunk-Projektes eingetragen wurde, "
"kann sich dein Knoten mit dem Hamburger Mesh-VPN verbinden. " "kann sich dein Knoten mit dem Hamburger Mesh-VPN verbinden. "
"Bitte trage dazu diesen Schlüssel, den Namen deines Knotens (<em><%=hostname%></em>) und ein paar andere Informationen unter " "Bitte trage dazu diesen Schlüssel, den Namen deines Knotens (<em><%=pcdata(hostname)%></em>) und ein paar andere Informationen unter "
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> ein." "<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&amp;key=<%=pubkey%>&amp;mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> ein.</p>"
"<div class=\"the-key\">"
" # <%= pcdata(hostname) %>"
" <br/>"
"<%= pubkey %>"
"</div>"
msgid "gluon-config-mode:reboot" msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""
@ -34,10 +47,9 @@ msgstr ""
"<a href=\"https://hamburg.freifunk.net/\">unserer Webseite</a>.</p>" "<a href=\"https://hamburg.freifunk.net/\">unserer Webseite</a>.</p>"
"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>" "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
msgid "gluon-config-mode:nopubkey" msgid "gluon-config-mode:novpn"
msgstr "" msgstr ""
"Bitte trage nun den Namen deines Knotens " "Bitte trage nun den Namen deines Knotens "
"(<em><%=hostname%></em>) und ein paar andere Informationen unter " "(<em><%=pcdata(hostname)%></em>) und ein paar andere Informationen unter "
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=hostname%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> " "<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&amp;mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> "
"ein." "ein."

View file

@ -19,14 +19,27 @@ msgstr ""
"the network and has nothing to do with the broadcast network name (SSID). " "the network and has nothing to do with the broadcast network name (SSID). "
"The latter is always hamburg.freifunk.net." "The latter is always hamburg.freifunk.net."
msgid "gluon-config-mode:domain"
msgstr "Domain"
msgid "gluon-config-mode:domain-select"
msgstr ""
"Here you have the possibility of selecting the mesh domain in which your node "
"is placed. Please keep in mind that your router only connects with the nodes "
"of the selected domain"
msgid "gluon-config-mode:pubkey" msgid "gluon-config-mode:pubkey"
msgstr "" msgstr ""
"This is the public key for your Freifunk node. You can only " "<p>This is the public key for your Freifunk node. You can only "
"connect the node to the Hamburg mesh VPN after the key has been registered on " "connect the node to the Hamburg mesh VPN after the key has been registered on "
"the Freifunk Hamburg servers. " "the Freifunk Hamburg servers. "
"Please register your key, the name of your node (<em><%=hostname%></em>), and a bit of additional info at " "Please register your key, the name of your node (<em><%=pcdata(hostname)%></em>), and a bit of additional info at "
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a>." "<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&amp;key=<%=pubkey%>&amp;mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a>.</p>"
"<div class=\"the-key\">"
" # <%= pcdata(hostname) %>"
" <br/>"
"<%= pubkey %>"
"</div>"
msgid "gluon-config-mode:reboot" msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""
@ -36,10 +49,9 @@ msgstr ""
"<a href=\"https://hamburg.freifunk.net/\">our homepage</a>.</p>" "<a href=\"https://hamburg.freifunk.net/\">our homepage</a>.</p>"
"<p>Have fun with your node and exploring the Freifunk network!</p>" "<p>Have fun with your node and exploring the Freifunk network!</p>"
msgid "gluon-config-mode:nopubkey" msgid "gluon-config-mode:novpn"
msgstr "" msgstr ""
"Please enter the name of your node " "Please enter the name of your node "
"(<em><%=hostname%></em>) and some additional information at " "(<em><%=hostname%></em>) and some additional information at "
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=hostname%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> " "<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&amp;mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> "
"." "."

36
image-customization.lua Normal file
View file

@ -0,0 +1,36 @@
features({
'autoupdater',
'config-mode-domain-select',
'ebtables-filter-multicast',
'ebtables-filter-ra-dhcp',
'mesh-batman-adv-15',
'mesh-vpn-fastd',
'web-private-wifi',
'radv-filterd',
'respondd',
'status-page',
'web-advanced',
'web-wizard',
})
if not device_class('tiny') then
features({
'wireless-encryption-wpa3',
})
end
packages({
'-gluon-config-mode-geo-location',
'-gluon-config-mode-contact-info',
'gluon-ebtables-source-filter',
'gluon-web-mesh-vpn-fastd',
'iwinfo',
})
if target('x86') then
packages({
'nano',
'htop',
'ethtool',
})
end

View file

@ -1,4 +1,5 @@
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=https://github.com/freifunkhamburg/ffhh-packages.git
PACKAGES_FFHH_PACKAGES_COMMIT=0a70ceb1c636a5a21ce47e39513031e3794daea2 PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c

154
site.conf
View file

@ -1,142 +1,102 @@
{ {
hostname_prefix = 'GibMirEinenNamen', hostname_prefix = 'GibMirEinenNamen',
config_mode = {
hostname = {
optional = false,
prefill = false,
},
},
site_name = 'Freifunk Hamburg', site_name = 'Freifunk Hamburg',
site_code = 'ffhh', site_code = 'ffhh',
opkg_repo = 'http://opkg.services.ffhh/barrier_breaker/14.07/%S/packages', default_domain = 'ffhh_nowe',
prefix4 = '10.112.0.0/18', opkg = {
prefix6 = '2a03:2267::/64', extra = {
modules = 'http://updates.hamburg.freifunk.net/multi/archive/%GR/packages/gluon-%GS-%GR/%S',
},
},
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'}, ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh','3.ntp.services.ffhh'},
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
ssid = 'hamburg.freifunk.net',
channel = 1, channel = 1,
htmode = 'HT20',
mesh_ssid = 'f8:d1:11:87:52:2e', mesh = {
mesh_bssid = 'f8:d1:11:87:52:2e', mcast_rate = 12000,
mesh_mcast_rate = 12000, },
}, },
wifi5 = { wifi5 = {
ssid = 'hamburg.freifunk.net',
channel = 44, channel = 44,
htmode = 'HT40+', outdoor_chanlist = "100-140",
mesh_ssid = 'f8:d1:11:87:52:2e', mesh = {
mesh_bssid = 'f8:d1:11:87:52:2e', mcast_rate = 12000,
mesh_mcast_rate = 12000, },
}, },
next_node = { mesh_vpn = {
ip4 = '10.112.0.1',
ip6 = '2a03:2267::1',
mac = '16:41:95:40:f7:dc',
},
fastd_mesh_vpn = {
enabled = true, enabled = true,
methods = {'salsa2012+umac'}, fastd = {
mtu = 1280, configurable = true,
groups = { mtu = 1312,
backbone = { methods = {'salsa2012+umac'},
limit = 1, groups = {
peers = { backbone = {
gateway01 = { limit = 1,
key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58',
remotes = {'"gw01.hamburg.freifunk.net" port 10001'},
},
gateway02 = {
key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
remotes = {'"gw02.hamburg.freifunk.net" port 10001'},
},
gateway03 = {
key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
remotes = {'"gw03.hamburg.freifunk.net" port 10001'},
},
gateway04 = {
key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf',
remotes = {'"gw04.hamburg.freifunk.net" port 10000'},
},
gateway05 = {
key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5',
remotes = {'"gw05.hamburg.freifunk.net" port 10001'},
},
gateway06 = {
key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6',
remotes = {'"gw06.hamburg.freifunk.net" port 10000'},
},
gateway08 = {
key = '67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4',
remotes = {'"gw08.hamburg.freifunk.net" port 10001'},
},
gateway09 = {
key = '5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc',
remotes = {'"gw09.hamburg.freifunk.net" port 10001'},
},
gateway12 = {
key = 'facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524',
remotes = {'"gw12.hamburg.freifunk.net" port 10001'},
},
}, },
}, },
}, },
bandwidth_limit = {
enabled = false,
ingress = 8096,
egress = 1024,
},
}, },
autoupdater = { autoupdater = {
branch = 'experimental', branch = 'stable',
branches = { branches = {
stable = { stable = {
name = 'stable', name = 'stable',
mirrors = {'http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'}, mirrors = {'http://updates-a.hamburg.freifunk.net/multi/stable/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/stable/images/sysupgrade'},
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
}, },
}, },
beta = { beta = {
name = 'beta', name = 'beta',
mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'}, mirrors = {'http://updates-a.hamburg.freifunk.net/multi/stable/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/stable/images/sysupgrade'},
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
}, 'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
}, 'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
},
},
experimental = { experimental = {
name = 'experimental', name = 'experimental',
mirrors = {'http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'}, mirrors = {'http://updates-a.hamburg.freifunk.net/multi/experimental/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/experimental/images/sysupgrade'},
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder '1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- builder1/2
}, },
}, },
}, },
}, },
simple_tc = { poe_passthrough = false,
mesh_vpn = {
ifname = 'mesh-vpn',
enabled = false,
limit_egress = 500,
limit_ingress = 8000,
},
},
legacy = {
version_files = {'/etc/.freifunk_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/freifunk'},
config_mode_configs = {'config_mode.@wizard{0}', 'freifunk.@wizard{0}'},
fastd_configs = {'mesh_vpn'},
mesh_ifname = 'freifunk',
tc_configs = {'freifunk.@bandwidth{0}'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
},
} }

38
site.mk
View file

@ -1,37 +1,11 @@
GLUON_SITE_PACKAGES := \ GLUON_MULTIDOMAIN := 1
gluon-mesh-batman-adv-14 \ GLUON_DEPRECATED := upgrade
gluon-alfred \
gluon-announced \
gluon-autoupdater \
gluon-config-mode-autoupdater \
gluon-config-mode-core \
gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \
gluon-config-mode-reboot-ffhh \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-multicast-ffhh \
gluon-ebtables-filter-ra-dhcp \
gluon-legacy \
gluon-luci-admin \
gluon-luci-autoupdater \
gluon-luci-portconfig \
gluon-luci-private-wifi \
gluon-next-node \
gluon-mesh-vpn-fastd \
gluon-radvd \
gluon-setup-mode \
gluon-status-page \
fastd-traffic-status \
iwinfo \
iptables \
haveged
GLUON_AUTOUPDATER_ENABLED ?= 1
DEFAULT_GLUON_RELEASE := 0.7.1 GLUON_PRIORITY ?= 7
# Allow overriding the release number from the command line # Region code required for some images; supported values: us eu
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_REGION ?= eu
GLUON_PRIORITY ?= 0
GLUON_LANGS ?= en de GLUON_LANGS ?= en de