diff --git a/site_config/beta/site/i18n/en.po b/site_config/beta/site/i18n/en.po index 1cac7f70a76f6f828925d8e9cfcaf6a8b09e28aa..715bca076fc48f17f5d559f75d463b1dea9051d3 100644 --- a/site_config/beta/site/i18n/en.po +++ b/site_config/beta/site/i18n/en.po @@ -15,7 +15,27 @@ msgstr "" "Welcome the the setup wizard of your new Freifunk Luxembourg node. " "Please fill out the following form and transmit it." +msgid "gluon-config-mode:contact-help" +msgstr "" +"You may input your contact mail here. This is needed so we may contact you in case of an emergency." +"If you not wich to provide here an contact mail, please subscribe into our our user maillinf list." +"There we share all inportant information with our community." + +msgid "gluon-config-mode:hostname-help" +"Insert a hostname for your freifunk node. Please start with fflux-" + +msgid "gluon-config-mode:geo-location-help" +msgstr "" +"Insert here your coordinates, where your Freifunk is physcally installed. This is optional." + +msgid "gluon-config-mode:altitude-label" +msgstr "" +"altitude" + +msgstr "" +" Hostname Help" msgid "gluon-config-mode:pubkey" + msgstr "" "" diff --git a/site_config/beta/site/site.conf b/site_config/beta/site/site.conf index b2e7a27c259969c9099725dea93db42f8063051e..a044945a8f6e12a7d8b53d1bfe0c04717e1d8c00 100644 --- a/site_config/beta/site/site.conf +++ b/site_config/beta/site/site.conf @@ -31,7 +31,7 @@ -- 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::13'}, -- Wireless regulatory domain of your community. regdom = 'LU', @@ -67,10 +67,8 @@ mesh = { vxlan = true, - filter_membership_reports = false, batman_adv = { routing_algo = 'BATMAN_IV', - gw_sel_class = 1, }, }, @@ -101,9 +99,9 @@ -- List of peers. peers = { - gw2= { - key = '2797c078ab5176ec27951cbe9d685e3212320217042494a37d8252fcb1a3029c', - remotes = {'ipv4 "fflux-gw2.c3l.lu" port 10000'}, + gw1= { + key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6', + remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'}, }, gw3= { key = '8e15baeaca68163c60fe97292cb4268616e16710d51f9d4605cd70c00ad0c7eb', @@ -127,8 +125,8 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { - 'http://[fd4e:f2d7:88d2:fffe::12]/firmware/stable/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/firmware/stable/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::13]/stable/sysupgrade', 'http://firmware.freifunk.lu/stable/sysupgrade', }, @@ -151,8 +149,8 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { - 'http://[fd4e:f2d7:88d2:fffe::12]/firmware/beta/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/firmware/beta/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::13]/beta/sysupgrade', 'http://firmware.freifunk.lu/beta/sysupgrade', }, @@ -176,8 +174,8 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { - 'http://[fd4e:f2d7:88d2:fffe::12]/firmware/experimental/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/firmware/experimental/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::13]/experimental/sysupgrade', 'http://firmware.freifunk.lu/experimental/sysupgrade', }, diff --git a/site_config/beta/site/site.mk b/site_config/beta/site/site.mk index 05684546018f6cbf412e36556e55aac26dbcfa06..7205025cc55b601d49dc81ecad1a0df9c9552b55 100644 --- a/site_config/beta/site/site.mk +++ b/site_config/beta/site/site.mk @@ -47,7 +47,6 @@ GLUON_SITE_PACKAGES := \ respondd-module-airtime \ iwinfo \ iptables \ - haveged ## DEFAULT_GLUON_RELEASE # version string to use for images @@ -55,7 +54,7 @@ GLUON_SITE_PACKAGES := \ # 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 := 2020.1.4~beta20201118 +DEFAULT_GLUON_RELEASE := 2020.2.2.0~beta20201230 ## GLUON_RELEASE @@ -113,4 +112,3 @@ endif # Do not build images for deprecated devices GLUON_DEPRECATED ?= 0 - diff --git a/site_config/experimental/site/i18n/en.po b/site_config/experimental/site/i18n/en.po index 1cac7f70a76f6f828925d8e9cfcaf6a8b09e28aa..715bca076fc48f17f5d559f75d463b1dea9051d3 100644 --- a/site_config/experimental/site/i18n/en.po +++ b/site_config/experimental/site/i18n/en.po @@ -15,7 +15,27 @@ msgstr "" "Welcome the the setup wizard of your new Freifunk Luxembourg node. " "Please fill out the following form and transmit it." +msgid "gluon-config-mode:contact-help" +msgstr "" +"You may input your contact mail here. This is needed so we may contact you in case of an emergency." +"If you not wich to provide here an contact mail, please subscribe into our our user maillinf list." +"There we share all inportant information with our community." + +msgid "gluon-config-mode:hostname-help" +"Insert a hostname for your freifunk node. Please start with fflux-" + +msgid "gluon-config-mode:geo-location-help" +msgstr "" +"Insert here your coordinates, where your Freifunk is physcally installed. This is optional." + +msgid "gluon-config-mode:altitude-label" +msgstr "" +"altitude" + +msgstr "" +" Hostname Help" msgid "gluon-config-mode:pubkey" + msgstr "" "" diff --git a/site_config/experimental/site/site.conf b/site_config/experimental/site/site.conf index b2e7a27c259969c9099725dea93db42f8063051e..a044945a8f6e12a7d8b53d1bfe0c04717e1d8c00 100644 --- a/site_config/experimental/site/site.conf +++ b/site_config/experimental/site/site.conf @@ -31,7 +31,7 @@ -- 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::13'}, -- Wireless regulatory domain of your community. regdom = 'LU', @@ -67,10 +67,8 @@ mesh = { vxlan = true, - filter_membership_reports = false, batman_adv = { routing_algo = 'BATMAN_IV', - gw_sel_class = 1, }, }, @@ -101,9 +99,9 @@ -- List of peers. peers = { - gw2= { - key = '2797c078ab5176ec27951cbe9d685e3212320217042494a37d8252fcb1a3029c', - remotes = {'ipv4 "fflux-gw2.c3l.lu" port 10000'}, + gw1= { + key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6', + remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'}, }, gw3= { key = '8e15baeaca68163c60fe97292cb4268616e16710d51f9d4605cd70c00ad0c7eb', @@ -127,8 +125,8 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { - 'http://[fd4e:f2d7:88d2:fffe::12]/firmware/stable/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/firmware/stable/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::13]/stable/sysupgrade', 'http://firmware.freifunk.lu/stable/sysupgrade', }, @@ -151,8 +149,8 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { - 'http://[fd4e:f2d7:88d2:fffe::12]/firmware/beta/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/firmware/beta/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::13]/beta/sysupgrade', 'http://firmware.freifunk.lu/beta/sysupgrade', }, @@ -176,8 +174,8 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { - 'http://[fd4e:f2d7:88d2:fffe::12]/firmware/experimental/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/firmware/experimental/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::13]/experimental/sysupgrade', 'http://firmware.freifunk.lu/experimental/sysupgrade', }, diff --git a/site_config/experimental/site/site.mk b/site_config/experimental/site/site.mk index f724824cd882f98abf78d6b3546c42ea10f793f7..3082dc43a47dd39ddf4634e8b006d70a14d937a3 100644 --- a/site_config/experimental/site/site.mk +++ b/site_config/experimental/site/site.mk @@ -54,7 +54,7 @@ GLUON_SITE_PACKAGES := \ # 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 := 2020.2.0.0~exp20201118 +DEFAULT_GLUON_RELEASE := 2020.2.2.3~exp20201229 ## GLUON_RELEASE @@ -112,4 +112,3 @@ endif # Do not build images for deprecated devices GLUON_DEPRECATED ?= 0 -