Compare commits

..

91 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
22 changed files with 565 additions and 508 deletions

View file

@ -1,31 +0,0 @@
sites: clean info sites/ffhh-nowe sites/ffhh-ost sites/ffhh-sued sites/ffhh-west
info: config/defaults.erb template/info.erb
erb -T- config/defaults.erb template/$@.erb >$@
.PHONY: clean
clean:
rm -rf sites
rm -f info
sites/%: config/%.erb
mkdir -p $@
cd $@ && $(MAKE) -f ../../Makefile site SITE=$(@F)
site: siteclean site.mk site.conf modules i18n
.PHONY: siteclean
siteclean:
rm -f site.mk site.conf modules
modules:
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
site.conf:
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
site.mk:
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
i18n:
ln -s ../../i18n

View file

@ -2,15 +2,11 @@
In the next two commands replace GLUON_VERSION and SITE_VERSION with the actual version numbers. In the next two commands replace GLUON_VERSION and SITE_VERSION with the actual version numbers.
$ git clone -b GLUON_VERSION https://github.com/freifunk-gluon/gluon.git $ git clone -b GLUON_VERSION https://github.com/freifunk-gluon/gluon.git
$ git clone -b SITE_VERSION https://github.com/freifunkhamburg/site-ffhh.git $ git clone -b SITE_VERSION https://git.hamburg.ccc.de/freifunk/site-ffhh.git
$ cd site-ffhh $ cd site-ffhh
To build all domains into the subdirectory firmware: To build the firmware into the subdirectory firmware:
$ ./build.sh -g ../gluon -o firmware $ ./build.sh -g ../gluon -o firmware
To build a specific domain (for example ffhh-nowe) into the subdirectory firmware:
$ ./build.sh -g ../gluon -l ffhh-nowe -o firmware
To build two specific domains (for example ffhh-nowe and ffhh-sued) into the subdirectory firmware:
$ ./build.sh -g ../gluon -l ffhh-nowe,ffhh-sued -o firmware
The build.sh supports the argument -b if you wish to also build firmware images marked as broken in gluon. The build.sh supports the argument -b if you wish to also build firmware images marked as broken in gluon.
@ -19,6 +15,27 @@ 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
- 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.2: site-ffhh: v0.9.2, gluon: v2017.1.8
- 0.9.1: site-ffhh: v0.9.1, gluon: v2017.1.5 - 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.9.0: site-ffhh: 60f30382209ffc050baa82be9bad3622a1d88d5b, gluon: v2017.1.x (9295abcea7b016b0fe4b05c534ea0731b48ef593) (never rolled out due to 0.9.1)

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*'
)

106
build.sh
View file

@ -2,17 +2,17 @@
set -e set -e
function announce () { function announce () {
echo '############################' $* >&2 echo '############################' "$@" >&2
} }
function usage () { function usage () {
echo "Usage: $0 -g GLUON_PATH" >&2 echo "Usage: $0 -g GLUON_PATH" >&2
echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2 echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2
echo " -l SITES Comma separated list of sites to build" >&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 " -o OUT_PATH Path to the firmware output directory. Default: ${gluon_out}" >&2
echo " -s SIGNATURE Sign firmware with signature" >&2 echo " -s SIGNATURE Sign firmware with signature" >&2
echo " -u UPLOADSCRIPT Run UPLOADSCRIPT after building. Will be run with one argument: $gluon_out/<GLUON_RELEASE>" >&2 echo " -stable Set GLUON_AUTOUPDATER_BRANCH=stable" >&2
echo " -b BROKEN=1" >&2 echo " -b BROKEN=1" >&2
echo " -m Do not regenerate the sites" >&2
echo " -v verbose" >&2 echo " -v verbose" >&2
echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2 echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2
} }
@ -22,12 +22,15 @@ gluon_out="${HOME}/firmware"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
-a)
auto_targets=1
;;
-g) -g)
gluon_path="$2" gluon_path="$2"
shift shift
;; ;;
-l) -t)
sites="$2" build_targets="$2"
shift shift
;; ;;
-o) -o)
@ -38,16 +41,12 @@ while [ $# -gt 0 ]; do
signature="$2" signature="$2"
shift shift
;; ;;
-u) -stable)
uploadscript="$2" export GLUON_AUTOUPDATER_BRANCH=stable
shift
;; ;;
-b) -b)
export BROKEN=1 export BROKEN=1
;; ;;
-m)
dont_make_sites=1
;;
-j) -j)
proc="$2" proc="$2"
shift shift
@ -56,6 +55,7 @@ while [ $# -gt 0 ]; do
verbose=V=s verbose=V=s
;; ;;
*) *)
echo ERROR: Failed to parse: "${1}" >&2
usage usage
exit 1 exit 1
;; ;;
@ -68,67 +68,71 @@ if [ -z "$gluon_path" ]; then
exit 1 exit 1
fi fi
gluon_path=$(realpath $gluon_path) gluon_path=$(realpath "$gluon_path")
gluon_out=$(realpath $gluon_out) gluon_out=$(realpath "$gluon_out")
site_path=$(realpath $(dirname $BASH_SOURCE)) site_path=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
announce GLUON: $gluon_path >&2 announce GLUON: "$gluon_path" >&2
announce FFHH SITE PATH: $site_path >&2 announce FFHH SITE PATH: "$site_path" >&2
pushd $site_path pushd "$site_path"
if [ "$dont_make_sites" == "" ]; then # shellcheck source=/dev/null
# Build the site repo and generate all site configs . ./build.conf
announce Building site repo and reading data >&2 GLUON_AUTOUPDATER_BRANCH="${GLUON_AUTOUPDATER_BRANCH:-experimental}"
make [ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp${BUILD_DATE:-$(date +%Y%m%d)}"
fi
. ./info
export GLUON_RELEASE export GLUON_RELEASE
export GLUON_BRANCH export GLUON_AUTOUPDATER_BRANCH
# get the available sites... export GLUON_SITEDIR="${site_path}"
sites="$(echo "$sites" | sed -e 's_,_ _g')" export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
if [ "$sites" == "" ]; then
for s in sites/*; do sites="${sites} ${s##*/}"; done
fi
announce Gluon will be built for the following sites:$sites >&2
announce The following targets will be generated: $targets >&2
popd popd
announce GLUON Variables:
env | egrep '^GLUON' | sort
pushd "${gluon_path}" pushd "${gluon_path}"
announce Starting make update... announce Starting make update...
for s in $sites; do
export GLUON_SITEDIR="${site_path}/sites/${s}"
export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}/${s}"
rm -rf "${GLUON_OUTPUTDIR}"
mkdir -p "${GLUON_OUTPUTDIR}" mkdir -p "${GLUON_OUTPUTDIR}"
make update make update
# Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work. # 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 for p in "${site_path}"/patches/*.patch; do
if [ -e "$p" -a ! -f "${gluon_path}/${p##*/}" ]; then if [ -e "$p" ] && [ ! -f "${gluon_path}/${p##*/}" ]; then
announce Installing patch $p announce "Installing patch $p"
patch -p1 < $p patch -p1 < "$p"
touch "${gluon_path}/${p##*/}" touch "${gluon_path}/${p##*/}"
fi fi
done 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 for t in $targets; do
announce make clean for $s/$t... >&2 announce "Starting build for $t..." >&2
make -j1 clean GLUON_TARGET=$t make "-j$(nproc)" "GLUON_TARGET=$t" $verbose
announce Starting build for $s/$t... >&2
make -j$(nproc) GLUON_TARGET=$t $verbose
done 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... announce Building manifest...
make manifest make manifest
if [ -n "${signature}" ]; then if [ -n "${signature}" ]; then
if [ "$GLUON_BRANCH" == "experimental" ]; then if [ "$GLUON_AUTOUPDATER_BRANCH" == "experimental" ]; then
announce Signing announce Signing...
"${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest" "${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest"
else else
echo ERROR: can only sign experimental branch >&2 echo ERROR: can only sign experimental branch >&2
exit 1 exit 1
fi fi
fi fi
done
popd popd
if [ -n "$uploadscript" ]; then
announce Starting upload. Executing: $uploadscript $gluon_out/$GLUON_RELEASE
"$uploadscript" "$gluon_out/$GLUON_RELEASE"
fi

View file

@ -1,62 +0,0 @@
<%
gluon_branch = "stable"
#gluon_branch = "experimental"
gluon_release = "0.9.2"
# Add the +exp and current date if this is an experimental release
gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"
gluon_targets = %w(
ar71xx-generic
ar71xx-tiny
ar71xx-nand
brcm2708-bcm2708
brcm2708-bcm2709
mpc85xx-generic
ramips-mt7621
x86-generic
x86-geode
x86-64
)
gluon_site_packages = %w(
gluon-autoupdater
gluon-config-mode-autoupdater
gluon-config-mode-core
gluon-config-mode-hostname
gluon-config-mode-mesh-vpn
gluon-ebtables-filter-multicast
gluon-ebtables-filter-ra-dhcp
gluon-ebtables-segment-mld
gluon-ebtables-source-filter
gluon-mesh-vpn-fastd
gluon-radvd
gluon-respondd
gluon-setup-mode
gluon-status-page
gluon-web-admin
gluon-web-autoupdater
gluon-web-network
gluon-web-private-wifi
gluon-web-wifi-config
haveged
iptables
iwinfo
)
gluon_ath10k_mesh = "11s"
signing_keys = [
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', # bjoern
'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', # daniel
'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', # alexander
'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', # olli
]
signing_keys_experimental = [
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', # 1.builder
]
-%>

View file

@ -1,42 +0,0 @@
<%
site_name = 'Freifunk Hamburg Nordwest'
site_code = 'ffhh-nowe'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.192.0/19'
prefix6 = '2a03:2267:3::/64'
next_node_ipv4 = '10.112.192.1'
next_node_ipv6 = '2a03:2267:3::1'
mtu = 1312
gateways = {
"gateway01" => {
"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10007' ]
},
"gateway02" => {
"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10007' ]
},
"gateway03" => {
"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10007' ]
},
"gateway04" => {
"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10008' ]
},
"gateway05" => {
"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10008' ]
},
"gateway06" => {
"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10008' ]
},
}
-%>

View file

@ -1,42 +0,0 @@
<%
site_name = 'Freifunk Hamburg Ost'
site_code = 'ffhh-ost'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.224.0/19'
prefix6 = '2a03:2267:4::/64'
next_node_ipv4 = '10.112.224.1'
next_node_ipv6 = '2a03:2267:4::1'
mtu = 1312
gateways = {
"gateway01" => {
"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10009' ]
},
"gateway02" => {
"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10009' ]
},
"gateway03" => {
"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10009' ]
},
"gateway04" => {
"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10010' ]
},
"gateway05" => {
"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10010' ]
},
"gateway06" => {
"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10010' ]
},
}
-%>

View file

@ -1,42 +0,0 @@
<%
site_name = 'Freifunk Hamburg Sued'
site_code = 'ffhh-sued'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.64.0/19'
prefix6 = '2a03:2267:1::/64'
next_node_ipv4 = '10.112.64.1'
next_node_ipv6 = '2a03:2267:1::1'
mtu = 1312
gateways = {
"gateway01" => {
"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10003' ]
},
"gateway02" => {
"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10003' ]
},
"gateway03" => {
"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10003' ]
},
"gateway04" => {
"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10004' ]
},
"gateway05" => {
"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10004' ]
},
"gateway06" => {
"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10004' ]
},
}
-%>

View file

@ -1,42 +0,0 @@
<%
site_name = 'Freifunk Hamburg West'
site_code = 'ffhh-west'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.96.0/19'
prefix6 = '2a03:2267:2::/64'
next_node_ipv4 = '10.112.96.1'
next_node_ipv6 = '2a03:2267:2::1'
mtu = 1312
gateways = {
"gateway01" => {
"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10005' ]
},
"gateway02" => {
"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10005' ]
},
"gateway03" => {
"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10005' ]
},
"gateway04" => {
"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10006' ]
},
"gateway05" => {
"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10006' ]
},
"gateway06" => {
"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10006' ]
},
}
-%>

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,6 +17,14 @@ 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 ""
"<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " "<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem "

View file

@ -19,6 +19,15 @@ 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 ""
"<p>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 "

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,5 +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=ef9fcc1222f74c3c045b1450537a4b8b80efb56c PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c

102
site.conf Normal file
View file

@ -0,0 +1,102 @@
{
hostname_prefix = 'GibMirEinenNamen',
config_mode = {
hostname = {
optional = false,
prefill = false,
},
},
site_name = 'Freifunk Hamburg',
site_code = 'ffhh',
default_domain = 'ffhh_nowe',
opkg = {
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
ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh','3.ntp.services.ffhh'},
regdom = 'DE',
wifi24 = {
channel = 1,
mesh = {
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
outdoor_chanlist = "100-140",
mesh = {
mcast_rate = 12000,
},
},
mesh_vpn = {
enabled = true,
fastd = {
configurable = true,
mtu = 1312,
methods = {'salsa2012+umac'},
groups = {
backbone = {
limit = 1,
},
},
},
bandwidth_limit = {
enabled = false,
ingress = 8096,
egress = 1024,
},
},
autoupdater = {
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {'http://updates-a.hamburg.freifunk.net/multi/stable/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/stable/images/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
},
},
beta = {
name = 'beta',
mirrors = {'http://updates-a.hamburg.freifunk.net/multi/stable/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/stable/images/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
},
},
experimental = {
name = 'experimental',
mirrors = {'http://updates-a.hamburg.freifunk.net/multi/experimental/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/experimental/images/sysupgrade'},
good_signatures = 1,
pubkeys = {
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- builder1/2
},
},
},
},
poe_passthrough = false,
}

11
site.mk Normal file
View file

@ -0,0 +1,11 @@
GLUON_MULTIDOMAIN := 1
GLUON_DEPRECATED := upgrade
GLUON_AUTOUPDATER_ENABLED ?= 1
GLUON_PRIORITY ?= 7
# Region code required for some images; supported values: us eu
GLUON_REGION ?= eu
GLUON_LANGS ?= en de

View file

@ -1,3 +0,0 @@
GLUON_RELEASE="<%= gluon_release %>"
GLUON_BRANCH="<%= gluon_branch %>"
targets="<%= gluon_targets.join(" ") %>"

View file

@ -1,133 +0,0 @@
{
hostname_prefix = 'GibMirEinenNamen',
site_name = '<%= site_name %>',
site_code = '<%= site_code %>',
opkg = {
lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
extra = {
modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S',
},
},
prefix4 = '<%= prefix4 %>',
prefix6 = '<%= prefix6 %>',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh','3.ntp.services.ffhh'},
regdom = 'DE',
wifi24 = {
channel = 1,
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
basic_rate = {6000, 9000, 18000, 36000, 54000},
ap = {
ssid = 'hamburg.freifunk.net',
},
<% if gluon_ath10k_mesh == "11s" -%>
mesh = {
id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
mcast_rate = 12000,
},
<% else -%>
ibss = {
ssid = 'f8:d1:11:87:52:2e',
bssid = 'f8:d1:11:87:52:2e',
mcast_rate = 12000,
},
<% end -%>
},
wifi5 = {
channel = 44,
ap = {
ssid = 'hamburg.freifunk.net',
},
<% if gluon_ath10k_mesh == "11s" -%>
mesh = {
id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
mcast_rate = 12000,
},
<% else -%>
ibss = {
ssid = 'f8:d1:11:87:52:2e',
bssid = 'f8:d1:11:87:52:2e',
mcast_rate = 12000,
},
<% end -%>
},
next_node = {
ip4 = '<%= next_node_ipv4 %>',
ip6 = '<%= next_node_ipv6 %>',
mac = '16:41:95:40:f7:dc',
},
mesh_vpn = {
enabled = true,
mtu = <%= mtu %>,
fastd = {
configurable = true,
methods = {'salsa2012+umac'},
groups = {
backbone = {
limit = 1,
peers = {
<% gateways.each_pair do | name, gw_data | -%>
<%= name %> = {
key = '<%= gw_data['key'] %>',
remotes = { '<%= gw_data['remotes'].join("', '") %>' },
},
<% end -%>
},
},
},
},
bandwidth_limit = {
enabled = false,
ingress = 8096,
egress = 1024,
},
},
autoupdater = {
branch = '<%= gluon_branch %>',
branches = {
stable = {
name = 'stable',
mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/stable/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/stable/sysupgrade'},
good_signatures = 2,
pubkeys = {
<% signing_keys.each do | key | -%>
'<%= key %>',
<% end -%>
},
},
beta = {
name = 'beta',
mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/beta/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/beta/sysupgrade'},
good_signatures = 2,
pubkeys = {
<% signing_keys.each do | key | -%>
'<%= key %>',
<% end -%>
},
},
experimental = {
name = 'experimental',
mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade'},
good_signatures = 1,
pubkeys = {
<% signing_keys_experimental.each do | key | -%>
'<%= key %>',
<% end -%>
},
},
},
},
poe_passthrough = false,
}

View file

@ -1,38 +0,0 @@
GLUON_SITE_PACKAGES :=<% gluon_site_packages.each do | p | -%>
<%= " " + p -%>
<% end -%>
# EXTRA_SOFTWARE_TOOLS_01
EXTRA_SOFTWARE_TOOLS_01 := \
nano \
htop \
ethtool
# x86
ifeq ($(GLUON_TARGET),x86-generic)
GLUON_SITE_PACKAGES += \
$(EXTRA_SOFTWARE_TOOLS_01)
endif
# x86-64
ifeq ($(GLUON_TARGET),x86-64)
GLUON_SITE_PACKAGES += \
$(EXTRA_SOFTWARE_TOOLS_01)
endif
DEFAULT_GLUON_RELEASE := <%= gluon_release %>
# Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
GLUON_PRIORITY ?= 0
# Region code required for some images; supported values: us eu
GLUON_REGION ?= eu
GLUON_ATH10K_MESH ?= <%= gluon_ath10k_mesh %>
GLUON_LANGS ?= en de