Commit 7fe0252c authored by Jan Schnurpfeil's avatar Jan Schnurpfeil
Browse files

Merge branch 'Lemocin/site-ffwp_multidomain' into ffwp_multidomain

parents f5468434 6529f3d3
...@@ -4,7 +4,7 @@ Freifunk Westpfalz Firmware ...@@ -4,7 +4,7 @@ Freifunk Westpfalz Firmware
How To Build How To Build
------------ ------------
This is building FFKA firmware in a nutshell. For more on options or building specific branches please refer to the build script, [the official Gluon repository](https://github.com/freifunk-gluon/gluon) at GitHub, or [the official Gluon documentation](http://gluon.readthedocs.org/). This is building FFWP firmware in a nutshell. For more on options or building specific branches please refer to the build script, [the official Gluon repository](https://github.com/freifunk-gluon/gluon) at GitHub, or [the official Gluon documentation](http://gluon.readthedocs.org/).
To compile the firmware you need a working build environment and packages for git, subversion, gawk, unzip, ncurses headers and zlib headers. To compile the firmware you need a working build environment and packages for git, subversion, gawk, unzip, ncurses headers and zlib headers.
...@@ -16,7 +16,7 @@ Then download and build as follows: ...@@ -16,7 +16,7 @@ Then download and build as follows:
git clone git://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository git clone git://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository
cd gluon cd gluon
git clone https://github.com/ffka/site-ffka site # Get the Freifunk Karlsruhe site repository git clone https://gitlab.karlsruhe.freifunk.net/ffwp/firmware/site.git site # Get the Freifunk Westpfalz site repository
make update # Fetch all repositories make update # Fetch all repositories
./site/build.sh ./site/build.sh
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom00', id = 'ffwp-dom00',
...@@ -29,6 +31,8 @@ ...@@ -29,6 +31,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom00', id = 'ffwp-dom00',
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom01', id = 'ffwp-dom01',
...@@ -29,6 +31,8 @@ ...@@ -29,6 +31,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom01', id = 'ffwp-dom01',
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom02', id = 'ffwp-dom02',
...@@ -33,6 +35,8 @@ ...@@ -33,6 +35,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom02', id = 'ffwp-dom02',
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom03', id = 'ffwp-dom03',
...@@ -28,6 +30,8 @@ ...@@ -28,6 +30,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom03', id = 'ffwp-dom03',
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom04', id = 'ffwp-dom04',
...@@ -28,6 +30,8 @@ ...@@ -28,6 +30,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom04', id = 'ffwp-dom04',
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom05', id = 'ffwp-dom05',
...@@ -32,6 +34,8 @@ ...@@ -32,6 +34,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom05', id = 'ffwp-dom05',
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom06', id = 'ffwp-dom06',
...@@ -31,6 +33,8 @@ ...@@ -31,6 +33,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom06', id = 'ffwp-dom06',
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom07', id = 'ffwp-dom07',
...@@ -36,6 +38,8 @@ ...@@ -36,6 +38,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom07', id = 'ffwp-dom07',
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom08', id = 'ffwp-dom08',
...@@ -28,6 +30,8 @@ ...@@ -28,6 +30,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom08', id = 'ffwp-dom08',
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom09', id = 'ffwp-dom09',
...@@ -30,6 +32,8 @@ ...@@ -30,6 +32,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom09', id = 'ffwp-dom09',
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0a', id = 'ffwp-dom0a',
...@@ -41,6 +43,8 @@ ...@@ -41,6 +43,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0a', id = 'ffwp-dom0a',
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0b', id = 'ffwp-dom0b',
...@@ -28,6 +30,8 @@ ...@@ -28,6 +30,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0b', id = 'ffwp-dom0b',
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0c', id = 'ffwp-dom0c',
...@@ -39,6 +41,8 @@ ...@@ -39,6 +41,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0c', id = 'ffwp-dom0c',
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0d', id = 'ffwp-dom0d',
...@@ -33,6 +35,8 @@ ...@@ -33,6 +35,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0d', id = 'ffwp-dom0d',
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0e', id = 'ffwp-dom0e',
...@@ -32,6 +34,8 @@ ...@@ -32,6 +34,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0e', id = 'ffwp-dom0e',
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
wifi24 = { wifi24 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0f', id = 'ffwp-dom0f',
...@@ -31,6 +33,8 @@ ...@@ -31,6 +33,8 @@
wifi5 = { wifi5 = {
ap = { ap = {
ssid = "westpfalz.freifunk.net", ssid = "westpfalz.freifunk.net",
owe_ssid = "owe.westpfalz.freifunk.net",
owe_transition_mode = false,
}, },
mesh = { mesh = {
id = 'ffwp-dom0f', id = 'ffwp-dom0f',
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
outdoor_chanlist = '96-140', outdoor_chanlist = '96-140',
mesh = { mesh = {
mcast_rate = 12000, mcast_rate = 12000,
}, },
}, },
dns = { dns = {
servers = { servers = {
......
...@@ -19,13 +19,15 @@ GLUON_FEATURES := \ ...@@ -19,13 +19,15 @@ GLUON_FEATURES := \
# ebtables-segment-mld \ # ebtables-segment-mld \
# ebtables-limit-arp \ # ebtables-limit-arp \
# Gluon Device Class specific features
GLUON_FEATURES_standard := wireless-encryption-wpa3
# Additional packages to install on every image # Additional packages to install on every image
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
iwinfo \ iwinfo \
gluon-config-mode-domain-select \ gluon-config-mode-domain-select \
gluon-config-mode-geo-location-osm \ gluon-config-mode-geo-location-osm \
gluon-config-mode-outdoor \ gluon-config-mode-outdoor \
haveged \
ffda-domain-director \ ffda-domain-director \
ffka-domain-migrator \ ffka-domain-migrator \
respondd-module-airtime respondd-module-airtime
...@@ -230,7 +232,7 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_P ...@@ -230,7 +232,7 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_P
#Allow overriding some variables from the command line #Allow overriding some variables from the command line
DEFAULT_GLUON_CHECKOUT := v2020.1.3 DEFAULT_GLUON_CHECKOUT := v2020.2.2
GLUON_CHECKOUT ?= $(DEFAULT_GLUON_CHECKOUT) GLUON_CHECKOUT ?= $(DEFAULT_GLUON_CHECKOUT)
ifndef GLUON_SITEDIR ifndef GLUON_SITEDIR
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment