Update release_state.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gluon"]
+	path = gluon
+	url = https://github.com/freifunk-gluon/gluon.git

.travis.yml

@@ -1,11 +0,0 @@
-
-language: bash
-sudo: false
-notifications:
-  slack: fftdf:mP5lP4wbjDppb54kckURGrkR
-install:
-  - git clone -b v2015.1.2 https://github.com/Freifunk-Troisdorf/gluon /home/travis/build/Freifunk-Troisdorf/gluon 
-  - git clone -b v2015.1 https://github.com/Freifunk-Troisdorf/site /home/travis/build/Freifunk-Troisdorf/gluon/site
-script: 
- - wget https://raw.githubusercontent.com/Freifunk-Troisdorf/build-fw/master/site_check.sh && chmod +x site_check.sh
- - ./site_check.sh

.woodpecker/build-stable.yml

@@ -0,0 +1,96 @@
+---
+platform: linux/arm64
+
+variables:
+  - &default
+    image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
+    pull: true
+    environment:
+      - input_version=${CI_COMMIT_TAG}
+      - GLUON_SITEDIR=..
+      - FORCE_UNSAFE_CONFIGURE=1
+      - GLUON_TARGET=${TARGET}
+      - GLUON_DEPRECATED=1
+
+workspace:
+  base: /build
+
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      recursive: true
+
+pipeline:
+  make_update:
+    <<: *default
+    commands:
+      - cd gluon
+      - make update
+
+  patch-iw-to-iw-full:
+    <<: *default
+    commands:
+      - sed -i 's/+iw /+iw-full /g' gluon/openwrt/package/kernel/mac80211/Makefile
+
+  build:
+    <<: *default
+    commands:
+      - cd gluon
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=beta GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
+
+  upload-stable:
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-key
+      strip_components: 2
+      target: /srv/fwuploads-tmp/troisdorf/multi/
+      source: gluon/output/stable/*
+    when:
+      event: tag
+
+  upload-beta:
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-key
+      strip_components: 2
+      target: /srv/fwuploads-tmp/troisdorf/multi/
+      source: gluon/output/beta/*
+    when:
+      event: tag
+
+matrix:
+  TARGET:
+    - ath79-generic
+    - ath79-mikrotik
+    - ath79-nand
+    - bcm27xx-bcm2708
+    - bcm27xx-bcm2709
+    - ipq40xx-generic
+    - ipq40xx-mikrotik
+    - ipq806x-generic
+    - lantiq-xrx200
+    - lantiq-xway
+    - mediatek-mt7622
+    - mpc85xx-p1010
+    - mpc85xx-p1020
+    - ramips-mt7620
+    - ramips-mt7621
+    - ramips-mt76x8
+    - realtek-rtl838x
+    - rockchip-armv8
+    - sunxi-cortexa7
+    - x86-64
+    - x86-generic
+    - x86-geode
+    - x86-legacy
+
+depends_on:
+  - prepare

.woodpecker/next.yml

@@ -0,0 +1,74 @@
+---
+platform: linux/arm64
+
+variables:
+  - &default
+    image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
+    pull: true
+    environment:
+      - input_version=next
+      - GLUON_SITEDIR=..
+      - FORCE_UNSAFE_CONFIGURE=1
+      - GLUON_TARGET=${TARGET}
+      - GLUON_DEPRECATED=1
+    when:
+      event: push
+      branch: next
+
+workspace:
+  base: /build
+
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      recursive: true
+    when:
+      event: push
+      branch: next
+
+pipeline:
+  make_update:
+    <<: *default
+    commands:
+      - cd gluon
+      - make update
+
+  patch-iw-to-iw-full:
+    <<: *default
+    commands:
+      - sed -i 's/+iw /+iw-full /g' gluon/openwrt/package/kernel/mac80211/Makefile
+
+  build:
+    <<: *default
+    commands:
+      - cd gluon
+      - make -j$(nproc) GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/next
+
+  list_images:
+    <<: *default
+    commands:
+      - mkdir -p gluon/output/${CI_COMMIT_BRANCH}/images/factory
+      - echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET}
+      - ls -alh gluon/output/${CI_COMMIT_BRANCH}/images/factory
+
+  upload:
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-key
+      strip_components: 2
+      target: /srv/fwuploads-tmp/troisdorf/testing/
+      source: gluon/output/next/*
+    when:
+      event: push
+      branch: next
+
+matrix:
+  TARGET:
+    - ramips-mt7621
+
+depends_on:
+  - prepare_next

.woodpecker/prepare.yml

@@ -0,0 +1,22 @@
+---
+platform: linux/arm64
+
+skip_clone: true
+
+pipeline:
+  prepare:
+    image: appleboy/drone-ssh
+    settings:
+      host: 46.4.138.183
+      username: fwupload
+      key:
+        from_secret: ssh-key
+      port: 22
+      command_timeout: 120m
+      script:
+        - rm -rf /srv/fwuploads-tmp/troisdorf/multi/*
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/stable
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/beta
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/experimental
+    when:
+      event: tag

.woodpecker/prepare_next.yml

@@ -0,0 +1,20 @@
+---
+platform: linux/arm64
+
+skip_clone: true
+
+pipeline:
+  prepare:
+    image: appleboy/drone-ssh
+    settings:
+      host: 46.4.138.183
+      username: fwupload
+      key:
+        from_secret: ssh-key
+      port: 22
+      command_timeout: 120m
+      script:
+        - rm -rf /srv/fwuploads-tmp/troisdorf/testing/*
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/testing/
+    when:
+      branch: next

.woodpecker/publish.yml

@@ -0,0 +1,39 @@
+---
+platform: linux/arm64
+
+workspace:
+  base: /build
+
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+
+pipeline:
+  upload-version:
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-key
+      target: /srv/fwuploads-tmp/bin/
+      source: release_state.json
+    when:
+      path: "release_state.json"
+
+  publish-firmware:
+    image: appleboy/drone-ssh
+    settings:
+      host: 46.4.138.183
+      username: fwupload
+      key:
+        from_secret: ssh-key
+      port: 22
+      command_timeout: 120m
+      script:
+        - /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b stable
+        - /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b beta
+        #- /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b experimental -d
+    when:
+      path: "release_state.json"
+      event: "push"

README.md

@@ -1,4 +1 @@
-[![Build Status](http://build.freifunk-troisdorf.de/buildStatus/icon?job=Gluon-test)](http://build.freifunk-troisdorf.de/job/Gluon-test)
-====
 repo for site configuration
-

domains/evt.conf

@@ -0,0 +1,40 @@
+{
+  domain_names = {
+    evt = 'Troisdorf Events',
+  },
+  domain_seed = '9a38c49fc5069254c7588a851e6b781691400055fce54797c31e051c3ff84352',
+  prefix4 = '10.188.96.0/19',
+  prefix6 = 'fda0:747e:ab29:7405::/64',
+  next_node = {
+    ip4 = '10.188.96.1',
+    ip6 = 'fda0:747e:ab29:7405::1',
+    mac = '04:74:05:d0:4f:aa',
+  },
+  wifi24 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-evt-mesh',    
+    },        
+  },
+  wifi5 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-evt-mesh',    
+    },
+  },
+  mesh = {
+    vxlan = false,
+  },
+  mesh_vpn = {
+    tunneldigger = {
+      brokers = {
+        'evt1.freifunk-troisdorf.de:53842',
+        'evt2.freifunk-troisdorf.de:53840',
+      },
+    },
+  },
+}

domains/flu.conf

@@ -0,0 +1,40 @@
+{
+  domain_names = {
+    flu = 'Soziale Netze',
+  },
+  domain_seed = '6e54bb395470ed41f6e3866d1c856714847d3eb37282251a0b4121b153e3ccc4',
+  prefix4 = '10.188.64.0/19',
+  prefix6 = 'fda0:747e:ab29:7405::/64',
+  next_node = {
+    ip4 = '10.188.64.1',
+    ip6 = 'fda0:747e:ab29:7405::1',
+    mac = '04:74:05:d0:4f:aa',
+  },
+  wifi24 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-flu-mesh',    
+    },        
+  },
+  wifi5 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-flu-mesh',    
+    },
+  },
+  mesh = {
+    vxlan = false,
+  },
+  mesh_vpn = {
+    tunneldigger = {
+      brokers = {
+        'flu1.freifunk-troisdorf.de:53842',
+        'flu2.freifunk-troisdorf.de:53840',
+      },
+    },
+  },
+}

domains/inn.conf

@@ -0,0 +1,40 @@
+{
+  domain_names = {
+    inn = 'Innenstadt',
+  },
+  domain_seed = '884f7f15965ec522dfd4c74195798eabf5bd3734406d80d7c5af7521d441fb4a',
+  prefix4 = '10.188.32.0/19',
+  prefix6 = 'fda0:747e:ab29:7405::/64',
+  next_node = {
+    ip4 = '10.188.32.1',
+    ip6 = 'fda0:747e:ab29:7405::1',
+    mac = '04:74:05:d0:4f:aa',
+  },
+  wifi24 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-inn-mesh',    
+    },        
+  },
+  wifi5 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-inn-mesh',    
+    },
+  },
+  mesh = {
+    vxlan = false,
+  },
+  mesh_vpn = {
+    tunneldigger = {
+      brokers = {
+        'inn1.freifunk-troisdorf.de:53842',
+        'inn2.freifunk-troisdorf.de:53840',
+      },
+    },
+  },
+}

domains/tdf.conf

@@ -0,0 +1,40 @@
+{
+  domain_names = {
+    tdf = 'Troisdorf Umland',
+  },
+  domain_seed = '9a38c49fc5069254c7588a551e6b781691600055fce54777c31e051c3ff84352',
+  prefix4 = '10.188.0.0/19',
+  prefix6 = 'fda0:747e:ab29:7405::/64',
+  next_node = {
+    ip4 = '10.188.0.1',
+    ip6 = 'fda0:747e:ab29:7405::1',
+    mac = '04:74:05:d0:4f:aa',
+  },
+  wifi24 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-tdf-mesh',    
+    },        
+  },
+  wifi5 = {
+    ap = {
+      ssid = 'Freifunk',
+    },
+    mesh = {        
+      id = 'troisdorf-tdf-mesh',    
+    },
+  },
+  mesh = {
+    vxlan = false,
+  },
+  mesh_vpn = {
+    tunneldigger = {
+      brokers = {
+        'tdf1.freifunk-troisdorf.de:53842',
+        'tdf2.freifunk-troisdorf.de:53840',
+      },
+    },
+  },
+}

gluon

@@ -0,0 +1 @@
+Subproject commit b9a621f68c909fc1de550ce165681ae14b75d915

i18n/de.po

@@ -19,10 +19,19 @@ msgstr ""
 "für Experten zu bearbeiten, da dies später nicht mehr möglich ist."
 "Bitte beachte, dass die unter Kontakt eingetragene E-Mail Adresse später öffentlich sichtbar ist!"
 
+msgid "gluon-config-mode:domain"
+msgstr "Domäne"
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "Die Konfiguration ist nun abgeschlossen. Das Registrieren des Nodes ist nicht mehr erforderlich. "
 
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
+"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
+"Knoten der ausgewählten Domäne verbinden kann."
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Der Knoten (Router) startet gerade neu und wird anschließend versuchen, "

i18n/en.po

@@ -18,6 +18,15 @@ msgstr ""
 "Please note, that the email address in the contact field will be"
 "publicly visible."
 
+msgid "gluon-config-mode:domain"
+msgstr "Domain"
+
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+"Here you have the possibility of selecting the mesh domain in which your node "
+"is placed. Please keep in mind that your router only connects with the nodes "
+"of the selected domain."
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "This is your Freifunk node's public key. The registration of the node "

modules

@@ -1,8 +1,5 @@
-GLUON_SITE_FEEDS='tro ffrl'
+GLUON_SITE_FEEDS='rsk'
 
-PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
+PACKAGES_RSK_REPO=https://github.com/Freifunk-Troisdorf/freifunk-packages.git
-PACKAGES_TRO_COMMIT=4149b51054551353b1bd58049f93015535c3424b
+PACKAGES_RSK_COMMIT=30b894a52806b84f364fe85189bd836ef2171104
-PACKAGES_TRO_BRANCH=v2016.1
+PACKAGES_RSK_BRANCH=master
-
-PACKAGES_FFRL_REPO=https://github.com/ffrl/ffrl-packages
-PACKAGES_FFRL_COMMIT=37618c0a3c33420f713080b3b66758b2fe533cbc

release_state.json

@@ -0,0 +1,5 @@
+{
+    "stable": "v2022.1.4",
+    "beta": "v2022.1.4",
+    "experimental": "v2022.1.4-z"
+}

site.conf

@@ -1,10 +1,8 @@
 {
   hostname_prefix = 'tdf',
   site_name = 'Freifunk Troisdorf',
-    site_code = 'tdf-',
+  site_code = 'tdf',
-    opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+  default_domain = 'tdf',
-    prefix4 = '10.188.0.0/19',
-    prefix6 = '2a03:2260:121:0001::/64',
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
   ntp_servers = {
     'ntp1.infra.fftdf',
@@ -13,36 +11,30 @@
     '1.de.pool.ntp.org',
   },
   regdom = 'DE',
+
+  mesh_vpn = {
+    tunneldigger = {
+      mtu = 1312,
+      bandwidth_limit = {
+        enabled = false,
+        egress = 2000,
+        ingress = 6000,
+      },
+    },
+  },
   wifi24 = {
     channel = 5,
-        ap = {
-            ssid = 'Freifunk',
-        },
     mesh = {
-            id = 'troisdorf-tdf-mesh',      
       mcast_rate = 12000,
     },
   },
   wifi5 = {
     channel = 44,
-        ap = {
+    outdoor_chanlist = "100-140",
-            ssid = 'Freifunk',
-        },
     mesh = {
-            id = 'troisdorf-tdf-mesh',      
       mcast_rate = 12000,
     },
   },
-    next_node = {
-        ip4 = '10.188.0.1',
-        ip6 = '2a03:2260:121:0001::1',
-        mac = '04:74:05:d0:4f:aa',
-    },
-    mesh = {
-        batman_adv = {
-            gw_sel_class = 3,
-        },
-    },
   autoupdater = {
     enabled = true,
     branch = 'stable',
@@ -50,11 +42,10 @@
       stable = {
         name = 'stable',
         mirrors = {
-                    'http://update1.infra.fftdf/tdf/stable/sysupgrade',
+          'http://images.freifunk-troisdorf.de/stable/sysupgrade',
-                    'http://update2.infra.fftdf/tdf/stable/sysupgrade',
+          'http://update2.infra.fftdf/multi/stable/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/stable/sysupgrade'
+          'http://images.freifunk-troisdorf.de/multi/stable/sysupgrade'
         },
-                probability = 1.00,
         good_signatures = 2,
         pubkeys = {
           '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
@@ -66,18 +57,16 @@
           'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880',      -- Nils
           '9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f',      -- Lars
           'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2'      -- Michael
-
         },
       },
       beta = {
         name = 'beta',
         mirrors = {
-                    'http://update1.infra.fftdf/tdf/beta/sysupgrade',
+          'http://images.freifunk-troisdorf.de/beta/sysupgrade',
-                    'http://update2.infra.fftdf/tdf/beta/sysupgrade',
+          'http://update2.infra.fftdf/multi/beta/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/beta/sysupgrade'
+          'http://images.freifunk-troisdorf.de/multi/beta/sysupgrade'
         },
-                probability = 1.00,
+        good_signatures = 2,
-                good_signatures = 1,
         pubkeys = {
           '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
           '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
@@ -93,12 +82,11 @@
       experimental = {
         name = 'experimental',
         mirrors = {
-                    'http://update1.infra.fftdf/tdf/experimental/sysupgrade',
+          'http://images.freifunk-troisdorf.de/experimental/sysupgrade',
-                    'http://update2.infra.fftdf/tdf/experimental/sysupgrade',
+          'http://update2.infra.fftdf/multi/experimental/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/experimental/sysupgrade'
+          'http://images.freifunk-troisdorf.de/multi/experimental/sysupgrade'
         },
-                probability = 1.00,
+        good_signatures = 2,
-                good_signatures = 1,
         pubkeys = {
           '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
           '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
@@ -113,21 +101,31 @@
       },
     },
    },
-    tunneldigger_mesh_vpn = {
+  mesh = {
-        mtu = 1312,
+    batman_adv = {
-        brokers = {
+      gw_sel_class = 3,
-            'tdf1.freifunk-troisdorf.de:53842',
+      routing_algo = 'BATMAN_IV',
-            'tdf2.freifunk-troisdorf.de:53840'
     },
   },
   roles = {
     default = 'node',
     list = {
-            node,
+      'node',
-            uplink,
+      'test',
-            test,
+      'backbone',
-            backbone,
+      'mesh',
-            service,
+      'meshanduplink',
+      'nightswitch',
+      'service',
+      'uplink',
     },
   },
-    }
+  config_mode = {
+    geo_location = {
+      show_altitude = false,
+    },
+    owner = {
+      obligatory = true
+    },
+  },
+}

site.mk

@@ -1,37 +1,47 @@
-GLUON_SITE_PACKAGES := \
+GLUON_FEATURES := \
-    gluon-mesh-batman-adv-15 \
+    mesh-batman-adv-15 \
-    gluon-respondd \
+    respondd \
-    gluon-neighbour-info \
+    neighbour-info \
-    gluon-autoupdater \
+    autoupdater \
-    gluon-setup-mode \
+    config-mode-autoupdater \
-    gluon-config-mode-core \
+    config-mode-hostname \
-    gluon-config-mode-autoupdater \
+    config-mode-geo-location \
-    gluon-config-mode-hostname \
+    config-mode-contact-info \
-    gluon-config-mode-geo-location \
+    config-mode-mesh-vpn \
-    gluon-config-mode-contact-info \
+    config-mode-domain-select \
-    gluon-config-mode-tunneldigger \
+    mesh-vpn-tunneldigger \
-    gluon-migrate-vpn \
+    ebtables-filter-multicast \
-    gluon-ebtables-filter-multicast \
+    ebtables-filter-ra-dhcp \
-    gluon-ebtables-filter-ra-dhcp \
+    web-admin \
-    gluon-luci-admin \
+    web-autoupdater \
-    gluon-luci-autoupdater \
+    web-network \
-    gluon-luci-portconfig \
+    web-private-wifi \
-    gluon-luci-private-wifi \
+    status-page-mesh-batman-adv \
-    gluon-luci-node-role \
+    web-node-role \
-    gluon-next-node \
+    status-page \
-    gluon-mesh-vpn-tunneldigger \
-    gluon-radvd \
-    gluon-status-page \
-    iwinfo \
-    iptables \
-    haveged \
-    tro-netwatch \
-    gluon-ssid-changer \
-    gluon-banner
 
+GLUON_SITE_PACKAGES := \
+    iwinfo \
+    iw-full \
+    gluon-ssid-changer \
+    gluon-banner \
+    gluon-check-client-mesh \
+    gluon-check-mesh \
+    rsk-nightswitch \
+    gluon-rsk-block-mesh \
+    gluon-rsk-config \
+    gluon-ping-check \
+    gluon-rsk-speedlimit \
+
+GLUON_MULTIDOMAIN=1
 DEFAULT_GLUON_RELEASE := 2014.4-stable-2.1
 # Allow overriding the release number from the command line
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 GLUON_PRIORITY ?= 0
 GLUON_LANGS ?= en de
+GLUON_REGION ?= eu
+GLUON_DEPRECATED ?= full
+
+# Build ATH10K images
+GLUON_ATH10K_MESH ?= 11s