freifunk/Firmware-building Changeset - fa159b5b9447 · Chaos Computer Club Lëtzebuerg Projects

Changeset - fa159b5b9447

Parent rev.

Child rev.

[Not reviewed]

0 6 0

x - 5 months ago 2025-01-07 01:12:55
xbr@c3l.lu

Revert "Add new xbr signing keys // 2023.1.0 20240714"

This reverts commit 228ce089848887a8525d78e83798182ac128ffcb.
Signing keys were found.

6 files changed with 12 insertions and 12 deletions:

site_config/beta/site/site.conf

site_config/beta/site/site.mk

site_config/experimental/site/site.conf

site_config/experimental/site/site.mk

site_config/stable/site/site.conf

site_config/stable/site/site.mk

0 comments (0 inline, 0 general)

site_config/beta/site/site.conf

➞

Show inline comments

@@ @@ -99,135 +99,135 @@ @@
         -- List of peers.
         peers = {
           gw1 = {
             key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6',
             remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'},
           },
           gw2 = {
             key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b',
             remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'},
           },
           test = {
             key = '95b22943135927cc1da6800ba152819ae5ee26cbb83d6354bc81a5ce632fcb5a',
             remotes = {'ipv4 "fflux-test.freifunk.lu" port 10000'},
           },
         },
       },
     },
    },
   },
   autoupdater = {
     enabled = true,
     -- Default branch. Don't forget to set GLUON_BRANCH when building!
     branch = 'stable',
     -- List of branches. You may define multiple branches.
     branches = {
       stable = {
         name = 'stable',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 	        'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade',
                 'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/stable/sysupgrade',
 	        'http://firmware.freifunk.lu/stable/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+	    '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/beta/sysupgrade',
 		'http://firmware.freifunk.lu/beta/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/experimental/sysupgrade',
 		'http://firmware.freifunk.lu/experimental/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
     },
   },
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,
       -- Default upload limit (kbit/s).
       egress = 200,
       -- Default download limit (kbit/s).
       ingress = 3000,
     },
   ssid_changer = {
   switch_timeframe = 5,  -- only once every timeframe (in minutes) the SSID will change to the Offline-SSID
                           -- set to 1440 to change once a day
                           -- set to 1 minute to change every time the router gets offline
   first = 5,              -- the first few minutes directly after reboot within which an Offline-SSID always may be activated (must be <= switch_timeframe)
   prefix = 'FF_Offline_', -- use something short to leave space for the nodename (no '~' allowed!)
   suffix = 'nodename',    -- generate the SSID with either 'nodename', 'mac' or to use only the prefix: 'none'
   tq_limit_enabled = false,   -- if false, the offline SSID will only be set if there is no gateway reacheable
                           -- upper and lower limit to turn the offline_ssid on and off
                           -- in-between these two values the SSID will never be changed to prevent it from toggeling every minute.
   tq_limit_max = '45',    -- upper limit, above that the online SSID will be used
   tq_limit_min = '30'     -- lower limit, below that the offline SSID will be used
 },
+}

site_config/beta/site/site.mk

➞

Show inline comments

@@ @@ -13,97 +13,97 @@ GLUON_FEATURES := \ @@
         mesh-batman-adv-15 \
         mesh-vpn-fastd \
         respondd \
         status-page \
         web-advanced \
 	wireless-encryption-wpa3 \
         web-wizard
 ##	GLUON_SITE_PACKAGES
 #		specify gluon/openwrt packages to include here
 #               The gluon-mesh-batman-adv-* package must come first because of the dependency resolution
 GLUON_SITE_PACKAGES := \
 		gluon-mesh-batman-adv-15 \
 		gluon-autoupdater \
 		gluon-config-mode-autoupdater \
 		gluon-config-mode-hostname \
 		gluon-config-mode-mesh-vpn \
 		gluon-config-mode-geo-location \
 		gluon-config-mode-contact-info \
 		gluon-config-mode-core \
 		gluon-ebtables-filter-multicast \
 		gluon-ebtables-filter-ra-dhcp \
 		gluon-web-admin \
 		gluon-web-autoupdater \
 		gluon-web-wifi-config \
 		gluon-web-private-wifi \
 		gluon-mesh-vpn-fastd \
 		gluon-radvd \
 		gluon-respondd \
 	        gluon-setup-mode \
 		gluon-status-page \
 		gluon-ssid-changer \
 		respondd-module-airtime \
 		iwinfo \
 		# freifunk-gluon/gluon #2046 - Builds fail with iptables in GLUON_SITE_PACKAGES
 		# Note that iptables is an OpenWrt core package that is included by default (which is what triggered this bug).
 		#iptables \
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
 # Naming after gluon: v2023.1 = 2023.1.0, as they might release v2023.1.1 = 2023.1.1
-DEFAULT_GLUON_RELEASE := 2023.1.0.0~beta20240714
+DEFAULT_GLUON_RELEASE := 2023.1.0.0~beta20240711
 ##	GLUON_RELEASE
 #		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
 #		e.g.:
 #			$ make images GLUON_RELEASE=23.42+5
 #		would generate images named like this:
 #			gluon-ff%site_code%-23.42+5-%router_model%.bin
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 # Default priority for updates.
 GLUON_PRIORITY ?= 0
 # Firmware branch and autoupdater config
 GLUON_AUTOUPDATER_BRANCH ?= beta
 GLUON_AUTOUPDATER_ENABLED ?= 1
 # set mesh mode for ath10k to 802.11s
 GLUON_ATH10K_MESH ?= 11s
 # Languages to include
 GLUON_LANGS ?= de en
 # define a region for specific devices like TP-Link Archer C7
 GLUON_REGION := eu
 USB_X86_GENERIC_NETWORK_MODULES := \
 		kmod-usb-ohci-pci \
 		kmod-sky2 \
 		kmod-atl2 \
 		kmod-igb \
 		kmod-3c59x \
 		kmod-e100 \
 		kmod-e1000 \
 		kmod-e1000e \
 		kmod-natsemi \
 		kmod-ne2k-pci \
 		kmod-pcnet32 \
 		kmod-8139too \
 		kmod-r8169 \
 		kmod-sis900 \
 		kmod-tg3 \
 		kmod-via-rhine \
 		kmod-via-velocity \
 		kmod-forcedeth \

site_config/experimental/site/site.conf

➞

Show inline comments

@@ @@ -99,135 +99,135 @@ @@
         -- List of peers.
         peers = {
           gw1 = {
             key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6',
             remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'},
           },
           gw2 = {
             key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b',
             remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'},
           },
           test = {
             key = '95b22943135927cc1da6800ba152819ae5ee26cbb83d6354bc81a5ce632fcb5a',
             remotes = {'ipv4 "fflux-test.freifunk.lu" port 10000'},
           },
         },
       },
     },
    },
   },
   autoupdater = {
     enabled = true,
     -- Default branch. Don't forget to set GLUON_BRANCH when building!
     branch = 'stable',
     -- List of branches. You may define multiple branches.
     branches = {
       stable = {
         name = 'stable',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 	        'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade',
                 'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/stable/sysupgrade',
 	        'http://firmware.freifunk.lu/stable/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+	    '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/beta/sysupgrade',
 		'http://firmware.freifunk.lu/beta/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/experimental/sysupgrade',
 		'http://firmware.freifunk.lu/experimental/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
     },
   },
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,
       -- Default upload limit (kbit/s).
       egress = 200,
       -- Default download limit (kbit/s).
       ingress = 3000,
     },
   ssid_changer = {
   switch_timeframe = 5,  -- only once every timeframe (in minutes) the SSID will change to the Offline-SSID
                           -- set to 1440 to change once a day
                           -- set to 1 minute to change every time the router gets offline
   first = 5,              -- the first few minutes directly after reboot within which an Offline-SSID always may be activated (must be <= switch_timeframe)
   prefix = 'FF_Offline_', -- use something short to leave space for the nodename (no '~' allowed!)
   suffix = 'nodename',    -- generate the SSID with either 'nodename', 'mac' or to use only the prefix: 'none'
   tq_limit_enabled = false,   -- if false, the offline SSID will only be set if there is no gateway reacheable
                           -- upper and lower limit to turn the offline_ssid on and off
                           -- in-between these two values the SSID will never be changed to prevent it from toggeling every minute.
   tq_limit_max = '45',    -- upper limit, above that the online SSID will be used
   tq_limit_min = '30'     -- lower limit, below that the offline SSID will be used
 },
+}

site_config/experimental/site/site.mk

➞

Show inline comments

@@ @@ -13,97 +13,97 @@ GLUON_FEATURES := \ @@
         mesh-batman-adv-15 \
         mesh-vpn-fastd \
         respondd \
         status-page \
         web-advanced \
 	wireless-encryption-wpa3 \
         web-wizard
 ##	GLUON_SITE_PACKAGES
 #		specify gluon/openwrt packages to include here
 #               The gluon-mesh-batman-adv-* package must come first because of the dependency resolution
 GLUON_SITE_PACKAGES := \
 		gluon-mesh-batman-adv-15 \
 		gluon-autoupdater \
 		gluon-config-mode-autoupdater \
 		gluon-config-mode-hostname \
 		gluon-config-mode-mesh-vpn \
 		gluon-config-mode-geo-location \
 		gluon-config-mode-contact-info \
 		gluon-config-mode-core \
 		gluon-ebtables-filter-multicast \
 		gluon-ebtables-filter-ra-dhcp \
 		gluon-web-admin \
 		gluon-web-autoupdater \
 		gluon-web-wifi-config \
 		gluon-web-private-wifi \
 		gluon-mesh-vpn-fastd \
 		gluon-radvd \
 		gluon-respondd \
 	        gluon-setup-mode \
 		gluon-status-page \
 		gluon-ssid-changer \
 		respondd-module-airtime \
 		iwinfo \
 		# freifunk-gluon/gluon #2046 - Builds fail with iptables in GLUON_SITE_PACKAGES
 		# Note that iptables is an OpenWrt core package that is included by default (which is what triggered this bug).
 		#iptables \
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
 # Naming after gluon: v2023.1 = 2023.1.0, as they might release v2023.1.1 = 2023.1.1
-DEFAULT_GLUON_RELEASE := 2023.1.0.0~exp20240714
+DEFAULT_GLUON_RELEASE := 2023.1.0.0~exp20240710
 ##	GLUON_RELEASE
 #		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
 #		e.g.:
 #			$ make images GLUON_RELEASE=23.42+5
 #		would generate images named like this:
 #			gluon-ff%site_code%-23.42+5-%router_model%.bin
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 # Default priority for updates.
 GLUON_PRIORITY ?= 0
 # Firmware branch and autoupdater config
 GLUON_AUTOUPDATER_BRANCH ?= experimental
 GLUON_AUTOUPDATER_ENABLED ?= 1
 # set mesh mode for ath10k to 802.11s
 GLUON_ATH10K_MESH ?= 11s
 # Languages to include
 GLUON_LANGS ?= de en
 # define a region for specific devices like TP-Link Archer C7
 GLUON_REGION := eu
 USB_X86_GENERIC_NETWORK_MODULES := \
 		kmod-usb-ohci-pci \
 		kmod-sky2 \
 		kmod-atl2 \
 		kmod-igb \
 		kmod-3c59x \
 		kmod-e100 \
 		kmod-e1000 \
 		kmod-e1000e \
 		kmod-natsemi \
 		kmod-ne2k-pci \
 		kmod-pcnet32 \
 		kmod-8139too \
 		kmod-r8169 \
 		kmod-sis900 \
 		kmod-tg3 \
 		kmod-via-rhine \
 		kmod-via-velocity \
 		kmod-forcedeth \

site_config/stable/site/site.conf

➞

Show inline comments

@@ @@ -99,135 +99,135 @@ @@
         -- List of peers.
         peers = {
           gw1 = {
             key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6',
             remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'},
           },
           gw2 = {
             key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b',
             remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'},
           },
           test = {
             key = '95b22943135927cc1da6800ba152819ae5ee26cbb83d6354bc81a5ce632fcb5a',
             remotes = {'ipv4 "fflux-test.freifunk.lu" port 10000'},
           },
         },
       },
     },
    },
   },
   autoupdater = {
     enabled = true,
     -- Default branch. Don't forget to set GLUON_BRANCH when building!
     branch = 'stable',
     -- List of branches. You may define multiple branches.
     branches = {
       stable = {
         name = 'stable',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 	        'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade',
                 'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/stable/sysupgrade',
 	        'http://firmware.freifunk.lu/stable/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+	    '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/beta/sysupgrade',
 		'http://firmware.freifunk.lu/beta/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::19]/experimental/sysupgrade',
 		'http://firmware.freifunk.lu/experimental/sysupgrade',
         },
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
         good_signatures = 1,
         -- List of public keys of maintainers.
         pubkeys = {
             '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
     },
   },
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,
       -- Default upload limit (kbit/s).
       egress = 200,
       -- Default download limit (kbit/s).
       ingress = 3000,
     },
   ssid_changer = {
   switch_timeframe = 5,  -- only once every timeframe (in minutes) the SSID will change to the Offline-SSID
                           -- set to 1440 to change once a day
                           -- set to 1 minute to change every time the router gets offline
   first = 5,              -- the first few minutes directly after reboot within which an Offline-SSID always may be activated (must be <= switch_timeframe)
   prefix = 'FF_Offline_', -- use something short to leave space for the nodename (no '~' allowed!)
   suffix = 'nodename',    -- generate the SSID with either 'nodename', 'mac' or to use only the prefix: 'none'
   tq_limit_enabled = false,   -- if false, the offline SSID will only be set if there is no gateway reacheable
                           -- upper and lower limit to turn the offline_ssid on and off
                           -- in-between these two values the SSID will never be changed to prevent it from toggeling every minute.
   tq_limit_max = '45',    -- upper limit, above that the online SSID will be used
   tq_limit_min = '30'     -- lower limit, below that the offline SSID will be used
 },
+}

site_config/stable/site/site.mk

➞

Show inline comments

@@ @@ -13,97 +13,97 @@ GLUON_FEATURES := \ @@
         mesh-batman-adv-15 \
         mesh-vpn-fastd \
         respondd \
         status-page \
         web-advanced \
 	wireless-encryption-wpa3 \
         web-wizard
 ##	GLUON_SITE_PACKAGES
 #		specify gluon/openwrt packages to include here
 #               The gluon-mesh-batman-adv-* package must come first because of the dependency resolution
 GLUON_SITE_PACKAGES := \
 		gluon-mesh-batman-adv-15 \
 		gluon-autoupdater \
 		gluon-config-mode-autoupdater \
 		gluon-config-mode-hostname \
 		gluon-config-mode-mesh-vpn \
 		gluon-config-mode-geo-location \
 		gluon-config-mode-contact-info \
 		gluon-config-mode-core \
 		gluon-ebtables-filter-multicast \
 		gluon-ebtables-filter-ra-dhcp \
 		gluon-web-admin \
 		gluon-web-autoupdater \
 		gluon-web-wifi-config \
 		gluon-web-private-wifi \
 		gluon-mesh-vpn-fastd \
 		gluon-radvd \
 		gluon-respondd \
 	        gluon-setup-mode \
 		gluon-status-page \
 		gluon-ssid-changer \
 		respondd-module-airtime \
 		iwinfo \
 		# freifunk-gluon/gluon #2046 - Builds fail with iptables in GLUON_SITE_PACKAGES
 		# Note that iptables is an OpenWrt core package that is included by default (which is what triggered this bug).
 		#iptables \
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
 # Naming after gluon: v2023.1 = 2023.1.0, as they might release v2023.1.1 = 2023.1.1
-DEFAULT_GLUON_RELEASE := 2023.1.0~stable20240714
+DEFAULT_GLUON_RELEASE := 2023.1.0~stable20240711
 ##	GLUON_RELEASE
 #		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
 #		e.g.:
 #			$ make images GLUON_RELEASE=23.42+5
 #		would generate images named like this:
 #			gluon-ff%site_code%-23.42+5-%router_model%.bin
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 # Default priority for updates.
 GLUON_PRIORITY ?= 0
 # Firmware branch and autoupdater config
 GLUON_AUTOUPDATER_BRANCH ?= stable
 GLUON_AUTOUPDATER_ENABLED ?= 1
 # set mesh mode for ath10k to 802.11s
 GLUON_ATH10K_MESH ?= 11s
 # Languages to include
 GLUON_LANGS ?= de en
 # define a region for specific devices like TP-Link Archer C7
 GLUON_REGION := eu
 USB_X86_GENERIC_NETWORK_MODULES := \
 		kmod-usb-ohci-pci \
 		kmod-sky2 \
 		kmod-atl2 \
 		kmod-igb \
 		kmod-3c59x \
 		kmod-e100 \
 		kmod-e1000 \
 		kmod-e1000e \
 		kmod-natsemi \
 		kmod-ne2k-pci \
 		kmod-pcnet32 \
 		kmod-8139too \
 		kmod-r8169 \
 		kmod-sis900 \
 		kmod-tg3 \
 		kmod-via-rhine \
 		kmod-via-velocity \
 		kmod-forcedeth \

0 comments (0 inline, 0 general)