Changeset - bd32a0a44cb1
Parent rev.
Child rev.
[Not reviewed]
0 4 0
x - 11 months ago 2024-06-05 00:05:36
xbr@c3l.lu
Propagate fixes to stable and beta + update release names
4 files changed with 12 insertions and 6 deletions:
site_config/beta/site/site.conf
1
1
site_config/beta/site/site.mk
5
2
site_config/stable/site/site.conf
1
1
site_config/stable/site/site.mk
5
2
0 comments (0 inline, 0 general)
site_config/beta/site/site.conf
➞
Show inline comments
 
@@ -78,26 +78,26 @@
 
    -- anycast IPs of all nodes
 
    ip4 = '10.24.128.1',
 
    ip6 = 'fd4e:f2d7:88d2:fffe::1',
 

			




	
	
	
		
 
    -- anycast MAC of all nodes

			




	
	
	
		
 
    mac = '32:3d:f9:8f:01:53',

			




	
	
	
		
 
  },

			




	
	
	
		
 

			




	
	
	
		
 
  -- Refer to http://fastd.readthedocs.org/en/latest/ to better understand

			




	
	
	
		
 
  -- what these options do.

			




	
	
	
		
 
  mesh_vpn = {

			




	
	
	
		
 
    enabled = true,

			




	
	
	
		
 
    mtu = 1406,

			




	
	
	
		
 
   fastd = {

			




	
	
	
		
 
    mtu = 1406,

			




	
	
	
		
 
    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',

			




        

    


    
    

    

        

                

                    site_config/beta/site/site.mk
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -38,33 +38,36 @@ GLUON_SITE_PACKAGES := \

			




	
	
	
		
 
		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 \

			




	
	
	
		
 
		# 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')

			




	
	
	
		
 
DEFAULT_GLUON_RELEASE := 2021.1.2.1~beta20220507

			




	
	
	
		
 
# 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~beta20240603

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
##	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)

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    site_config/stable/site/site.conf
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -78,26 +78,26 @@

			




	
	
	
		
 
    -- anycast IPs of all nodes

			




	
	
	
		
 
    ip4 = '10.24.128.1',

			




	
	
	
		
 
    ip6 = 'fd4e:f2d7:88d2:fffe::1',

			




	
	
	
		
 

			




	
	
	
		
 
    -- anycast MAC of all nodes

			




	
	
	
		
 
    mac = '32:3d:f9:8f:01:53',

			




	
	
	
		
 
  },

			




	
	
	
		
 

			




	
	
	
		
 
  -- Refer to http://fastd.readthedocs.org/en/latest/ to better understand

			




	
	
	
		
 
  -- what these options do.

			




	
	
	
		
 
  mesh_vpn = {

			




	
	
	
		
 
    enabled = true,

			




	
	
	
		
 
    mtu = 1406,

			




	
	
	
		
 
   fastd = {

			




	
	
	
		
 
    mtu = 1406,

			




	
	
	
		
 
    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',

			




        

    


    
    

    

        

                

                    site_config/stable/site/site.mk
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -38,33 +38,36 @@ GLUON_SITE_PACKAGES := \

			




	
	
	
		
 
		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 \

			




	
	
	
		
 
		# 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')

			




	
	
	
		
 
DEFAULT_GLUON_RELEASE := 2021.1.2~stable202205

			




	
	
	
		
 
# Naming after gluon: v2023.1 = 2023.1.0, as they might release v2023.1.1 = 2023.1.1

			




	
	
	
		
 
DEFAULT_GLUON_RELEASE := 2023.1.0~stable20240604

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
##	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)

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: saturn-2626454
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support