diff --git a/domains/dom0.conf b/domains/dom0.conf index 1e6eab781..65909c12a 100644 --- a/domains/dom0.conf +++ b/domains/dom0.conf @@ -20,6 +20,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom0', @@ -28,6 +30,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom0', @@ -100,4 +104,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom1.conf b/domains/dom1.conf index 267355c87..9ca2cabf4 100644 --- a/domains/dom1.conf +++ b/domains/dom1.conf @@ -20,6 +20,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom1', @@ -28,6 +30,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom1', @@ -100,4 +104,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom10.conf b/domains/dom10.conf index 8117c692f..0de2cc32b 100644 --- a/domains/dom10.conf +++ b/domains/dom10.conf @@ -25,6 +25,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom10', @@ -33,6 +35,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom10', @@ -105,4 +109,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom11.conf b/domains/dom11.conf index ba637ac9f..0fafd0e38 100644 --- a/domains/dom11.conf +++ b/domains/dom11.conf @@ -27,6 +27,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom11', @@ -35,6 +37,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom11', @@ -107,4 +111,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom12.conf b/domains/dom12.conf index 45d152cac..57d985f9c 100644 --- a/domains/dom12.conf +++ b/domains/dom12.conf @@ -33,6 +33,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom12', @@ -41,6 +43,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom12', @@ -113,4 +117,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom13.conf b/domains/dom13.conf index e5e71aa73..7ea3b5051 100644 --- a/domains/dom13.conf +++ b/domains/dom13.conf @@ -34,6 +34,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom13', @@ -42,6 +44,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom13', @@ -114,4 +118,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom14.conf b/domains/dom14.conf index 4b7486666..ffd7f51fe 100644 --- a/domains/dom14.conf +++ b/domains/dom14.conf @@ -23,6 +23,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom14', @@ -31,6 +33,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom14', @@ -103,4 +107,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom15.conf b/domains/dom15.conf index 22a9fb3ea..a4d32d8fd 100644 --- a/domains/dom15.conf +++ b/domains/dom15.conf @@ -35,6 +35,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom15', @@ -43,6 +45,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom15', @@ -115,4 +119,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom16.conf b/domains/dom16.conf index 1a4d64b64..4f1aa9bc2 100644 --- a/domains/dom16.conf +++ b/domains/dom16.conf @@ -20,6 +20,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom16', @@ -28,6 +30,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom16', @@ -100,4 +104,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom17.conf b/domains/dom17.conf index 39fd33a2c..90dd4ccd8 100644 --- a/domains/dom17.conf +++ b/domains/dom17.conf @@ -29,6 +29,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom17', @@ -37,6 +39,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom17', @@ -109,4 +113,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom2.conf b/domains/dom2.conf index e15a0b6a7..dd2129868 100644 --- a/domains/dom2.conf +++ b/domains/dom2.conf @@ -20,6 +20,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom2', @@ -28,6 +30,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom2', @@ -100,4 +104,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom3.conf b/domains/dom3.conf index 1f565834b..d961b6b25 100644 --- a/domains/dom3.conf +++ b/domains/dom3.conf @@ -41,6 +41,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom3', @@ -49,6 +51,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom3', @@ -121,4 +125,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom4.conf b/domains/dom4.conf index 2fc56f0fd..0b8f9810d 100644 --- a/domains/dom4.conf +++ b/domains/dom4.conf @@ -26,6 +26,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom4', @@ -34,6 +36,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom4', @@ -106,4 +110,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom5.conf b/domains/dom5.conf index c9722ebe7..b9ad513c6 100644 --- a/domains/dom5.conf +++ b/domains/dom5.conf @@ -22,6 +22,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom5', @@ -30,6 +32,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom5', @@ -102,4 +106,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom6.conf b/domains/dom6.conf index c9ef70f92..ffa1accf4 100644 --- a/domains/dom6.conf +++ b/domains/dom6.conf @@ -23,6 +23,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom6', @@ -31,6 +33,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom6', @@ -103,4 +107,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom7.conf b/domains/dom7.conf index f477ad1ab..fc15ffc1a 100644 --- a/domains/dom7.conf +++ b/domains/dom7.conf @@ -26,6 +26,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom7', @@ -34,6 +36,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom7', @@ -106,4 +110,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom8.conf b/domains/dom8.conf index 6af51693f..ea6fc6120 100644 --- a/domains/dom8.conf +++ b/domains/dom8.conf @@ -26,6 +26,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom8', @@ -34,6 +36,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom8', @@ -106,4 +110,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/domains/dom9.conf b/domains/dom9.conf index 1d369922a..d1255f81e 100644 --- a/domains/dom9.conf +++ b/domains/dom9.conf @@ -22,6 +22,8 @@ wifi24 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom9', @@ -30,6 +32,8 @@ wifi5 = { ap = { ssid = "ffm.freifunk.net", + owe_ssid = "owe.ffm.freifunk.net", + owe_transition_mode = false, }, mesh = { id = 'ffffm-mesh-dom9', @@ -102,4 +106,4 @@ }, }, }, -} \ No newline at end of file +} diff --git a/site.mk b/site.mk index 172e80818..b52b91405 100644 --- a/site.mk +++ b/site.mk @@ -17,7 +17,6 @@ GLUON_FEATURES := \ GLUON_SITE_PACKAGES := \ iwinfo \ - haveged \ ffffm-button-bind \ respondd-module-airtime \ ffda-domain-director \ @@ -115,6 +114,9 @@ GLUON_SITE_PACKAGES += \ ffffm-eol-ssid endif +# Gluon Device Class specific features +GLUON_FEATURES_standard := wireless-encryption-wpa3 + ### Specific Packages INCLUDE_USB := \ diff --git a/version.mk b/version.mk index cc23a722a..e43040ce0 100644 --- a/version.mk +++ b/version.mk @@ -1,2 +1,2 @@ -DEFAULT_GLUON_CHECKOUT := v2020.1.3 -DEFAULT_BASE_VERSION := v4.5 +DEFAULT_GLUON_CHECKOUT := v2020.2.x +DEFAULT_BASE_VERSION := v4.6