Browse Source

Merge branch 'experimental' into stable

Michael Schwarz 4 months ago
parent
commit
8c33a515eb
5 changed files with 12 additions and 44 deletions
  1. 9 11
      extra/template.conf
  2. 0 15
      i18n/de.po
  3. 0 15
      i18n/en.po
  4. 1 1
      modules
  5. 2 2
      site.mk

+ 9 - 11
extra/template.conf

@@ -31,7 +31,7 @@
 
 	-- OpenWRT Package Repository (IPv6 capable)
 	opkg = {
-		lede = 'http://firmware.srv.in.ffho.net/lede/packages-%v/%A',
+		openwrt = 'http://firmware.srv.in.ffho.net/openwrt/packages-%v/%A',
 		extra = {
 			gluon = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
 		},
@@ -43,6 +43,9 @@
 	mesh = {
 		-- for now, we don't use vxlan on the mesh
 		vxlan = false,
+		batman_adv = {
+			routing_algo = 'BATMAN_IV',
+		},
 	},
 
 	-- wifi settings (2.4 GHz and 5 GHz)
@@ -50,8 +53,6 @@
 	-- mesh.id = 'ffho-mesh-${group-name}',
 	wifi24 = {
 		channel = 1,
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
 		ap = {
 			ssid = '%SS',
 		},
@@ -111,8 +112,8 @@
 							-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
 							remotes = {
 								'"gw01.ffho.net" port 100%ID',
-								'ipv6 "2001:830:c:9::12" port 100%ID',
-								'ipv4 "80.242.130.70" port 100%ID',
+								'ipv6 "2001:638:502:1884::ff15" port 100%ID',
+								'ipv4 "192.26.175.183" port 100%ID',
 							},
 						},
 						gw02 = {
@@ -182,7 +183,7 @@
 				-- where to get the manifest file (without the trailing /manifest)
 				-- It's wise to use an internal address here,
 				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/stable/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/stable/sysupgrade', 'http://firmware.ffho.net/stable/sysupgrade'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -192,31 +193,28 @@
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'88d25b1abafe262cd3653ed573b9917eee48a62ceb30e405c051b0ea320c382f', -- KnicklichtJedi
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/testing/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/testing/sysupgrade', 'http://firmware.ffho.net/testing/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'88d25b1abafe262cd3653ed573b9917eee48a62ceb30e405c051b0ea320c382f', -- KnicklichtJedi
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/experimental/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/experimental/sysupgrade', 'http://firmware.ffho.net/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'88d25b1abafe262cd3653ed573b9917eee48a62ceb30e405c051b0ea320c382f', -- KnicklichtJedi
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},

+ 0 - 15
i18n/de.po

@@ -24,21 +24,6 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
-"er auf den Servern des Freifunk Hochstift-Projektes eingetragen wurde, "
-"kann sich dein Knoten mit dem Mesh-VPN verbinden. Bitte "
-"schicke dazu diesen Schlüssel und den Namen deines Knotens "
-"an <a href=\"mailto:kontakt@hochstift.freifunk.net?subject=<%= urlencode('new node \'' .. hostname .. '\'') %>&amp;"
-"body=<%= urlencode(hostname .. '\n\n# Owner: ') %><%= urlencode(contact or '\n') %><%= urlencode('\n# MAC: ' .. sysconfig.primary_mac .. '\nkey \"' .. pubkey .. '\";\n\nDeine Nachricht:\n') %>\">kontakt@hochstift.freifunk.net</a> oder benutze das "
-"<a href=\"https://hochstift.freifunk.net/neuen-knoten-eintragen/?key=<%= pubkey %>&amp;nname=<%= urlencode(hostname) %>&amp;mac=<%= urlencode(sysconfig.primary_mac) %>&amp;email=<%= urlencode(contact or '') %>\"> "
-"vorausgefüllte Formular auf unserer Webseite</a>."
-"</p>"
-"<div class=\"the-key\">"
-"<%= pcdata(hostname) %><br/><br/>"
-"# Owner: <%= pcdata(contact) %><br/>"
-"# MAC: <%= pcdata(sysconfig.primary_mac) %><br/>"
-"key \"<%= pubkey %>\";"
-"</div>"
 
 msgid "gluon-config-mode:novpn"
 msgstr ""

+ 0 - 15
i18n/en.po

@@ -23,21 +23,6 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"<p>This is your Freifunk node's public key. The node won't be able to "
-"connect to the mesh VPN until the key has been registered on the Freifunk "
-"Hochstift servers. "
-"To register, send the key together with your node's name to "
-"<a href=\"mailto:kontakt@hochstift.freifunk.net?subject=<%= urlencode('new node \'' .. hostname .. '\'') %>&amp;"
-"body=<%= urlencode(hostname .. '\n\n# Owner: ') %><%= urlencode(contact or '\n') %><%= urlencode('\n# MAC: ' .. sysconfig.primary_mac .. '\nkey \"' .. pubkey .. '\";\n\nYour message:\n') %>\">kontakt@hochstift.freifunk.net</a> or use the "
-"<a href=\"https://hochstift.freifunk.net/neuen-knoten-eintragen/?key=<%= pubkey %>&amp;nname=<%= urlencode(hostname) %>&amp;mac=<%= urlencode(sysconfig.primary_mac) %>&amp;email=<%= urlencode(contact or '') %>\"> "
-"formular filled in beforehand on our website</a>."
-"</p>"
-"<div class=\"the-key\">"
-"<%= pcdata(hostname) %><br/><br/>"
-"# Owner: <%= pcdata(contact) %><br/>"
-"# MAC: <%= pcdata(sysconfig.primary_mac) %><br/>"
-"key \"<%= pubkey %>\";"
-"</div>"
 
 msgid "gluon-config-mode:novpn"
 msgstr ""

+ 1 - 1
modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=master
-PACKAGES_FFHO_COMMIT=a2521ef8cd6774a0470a7b2568d0240e679e95e7
+PACKAGES_FFHO_COMMIT=cf2dc9b8d512fcfc6148805b1766b398ca2c4183

+ 2 - 2
site.mk

@@ -6,7 +6,6 @@ GLUON_FEATURES := \
 	config-mode-geo-location-osm \
         mesh-batman-adv-15 \
         mesh-vpn-fastd \
-        radvd \
         respondd \
         status-page \
         web-advanced \
@@ -55,7 +54,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.2.2~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.3.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
@@ -63,3 +62,4 @@ GLUON_PRIORITY ?= $(DEFAULT_GLUON_PRIORITY)
 GLUON_REGION ?= eu
 GLUON_LANGS ?= en de
 GLUON_ATH10K_MESH ?= 11s
+GLUON_DEPRECATED ?= full