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

Changeset - 4f156f6afe82

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Max Wahl (Fantawams) - 3 years ago 2022-02-19 11:10:06
fantawams@c3l.lu

Updated beta site.conf for new fflux-test gateway for Gluon 20212.1.1

2 files changed with 10 insertions and 3 deletions:

site_config/beta/site/site.conf

site_config/beta/site/site.mk

0 comments (0 inline, 0 general)

site_config/beta/site/site.conf

➞

Show inline comments

@@ @@ -10,49 +10,49 @@ @@
   hostname_prefix = 'fflux-',
   -- Name of the community.
   site_name = 'Freifunk Luxembourg',
   -- Shorthand of the community.
   site_code = 'fflux',
   -- 32 bytes of random data, encoded in hexadecimal
   -- This data must be unique among all sites and domains!
   -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
   domain_seed = '20d0d9c09a27d488c1291da65fe4dd4971ff8631dba0195be15805dbad01f78e',
   -- Prefixes used within the mesh. Both are required.
   prefix4 = '10.24.128.0/18',
   prefix6 = 'fd4e:f2d7:88d2:fffe::/64',
   -- Timezone of your community.
   -- See http://wiki.openwrt.org/doc/uci/system#time.zones
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   -- List of NTP servers in your community.
   -- Must be reachable using IPv6!
   ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12'},
+  ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12','fd4e:f2d7:88d2:fffe::19'},
   -- Wireless regulatory domain of your community.
   regdom = 'LU',
   -- Wireless configuratoin for 2.4 GHz interfaces.
   wifi24 = {
     -- Wireless channel.
     channel = 1,
 	ap = {
 	  ssid = 'luxembourg.freifunk.net',
 	},
 	mesh = {
 	  id = 'freifunk-mesh',
 	  mcast_rate = 12000,
 	},
   },
   -- Wireless configuration for 5 GHz interfaces.
   -- This should be equal to the 2.4 GHz variant, except
   -- for channel and htmode.
   wifi5 = {
     channel = 36;
@@ @@ -85,119 +85,126 @@ @@
   -- Refer to http://fastd.readthedocs.org/en/latest/ to better understand
   -- what these options do.
   mesh_vpn = {
     enabled = true,
     mtu = 1406,
    fastd = {
     configurable = true,
     -- List of crypto-methods to use.
     methods = {'salsa2012+umac'},
     groups = {
       backbone = {
         -- Limit number of connected peers to reduce bandwidth.
         limit = 1,
         -- 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
 	    '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
             '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
             '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
     },
   },
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,

site_config/beta/site/site.mk

➞

Show inline comments

@@ @@ -34,49 +34,49 @@ GLUON_SITE_PACKAGES := \ @@
 		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 \
 		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')
-DEFAULT_GLUON_RELEASE := 2021.1.1.0~beta20211017
+DEFAULT_GLUON_RELEASE := 2021.1.1.1~beta20220218
 ##	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

0 comments (0 inline, 0 general)