first l2tp tests on beta

.gitmodules

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

.travis.yml

@@ -0,0 +1,11 @@
+
+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

@@ -1,96 +0,0 @@
----
-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

@@ -1,74 +0,0 @@
----
-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

@@ -1,22 +0,0 @@
----
-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

@@ -1,20 +0,0 @@
----
-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

@@ -1,39 +0,0 @@
----
-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 +1,4 @@
-repo for site configuration
+site [![Build Status](https://travis-ci.org/Freifunk-Troisdorf/site.svg?branch=v2015.1)](https://travis-ci.org/Freifunk-Troisdorf/site)
+====
+repo for site configuration
+

domains/evt.conf

@@ -1,40 +0,0 @@
-{
-  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

@@ -1,40 +0,0 @@
-{
-  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

@@ -1,40 +0,0 @@
-{
-  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

@@ -1,40 +0,0 @@
-{
-  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

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

i18n/de.po

@@ -19,23 +19,15 @@ 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, "
 "sich mit anderen Freifunkknoten im Netz zu verbinden. "
 "Mehr zu Freifunk in Troisdorf findet sich online unter "
-"<a href="http://www.freifunk-troisdorf.de/">freifunk-troisdorf.de</a></p>"
+"<a href="http://www.freifunk-troisdorf.de/">freifunk-troisdorf.de</a> und dem "
+"<a href="https://wiki.freifunk-rheinland.net/Troisdorf">Wiki des Freifunk Rheinland e.V.</a> </p>"
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"

i18n/en.po

@@ -18,15 +18,6 @@ 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 "
@@ -37,5 +28,6 @@ msgstr ""
 "<p>The node is currently rebooting and will try to connect to other "
 "nearby Freifunk nodes after that. "
 "More information regarding Freifunk you will find on"
-"<a href="http://www.freifunk-troisdorf.de/">freifunk-troisdorf.de</a></p>"
+"<a href="http://www.freifunk-troisdorf.de/">freifunk-troisdorf.de</a>  or on the"
+"<a href="https://wiki.freifunk-rheinland.net/Troisdorf">wiki pages of the Freifunk Rheinland e.V.</a> </p>"
 "<p>Have fun with Freifunk!</p>"

modules

@@ -1,5 +1,8 @@
-GLUON_SITE_FEEDS='rsk'
+GLUON_SITE_FEEDS='tro ffrl'
+
+PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
+PACKAGES_TRO_COMMIT=e92ccaeebb53a8308bb2729721a77cebad0b3494
+
+PACKAGES_ffrl_REPO=https://github.com/ffrl/ffrl-packages.git
+PACKAGES_ffrl_COMMIT=0a8b47f6dbc175e61eb40a9a22b628a412b61599
 
-PACKAGES_RSK_REPO=https://github.com/Freifunk-Troisdorf/freifunk-packages.git
-PACKAGES_RSK_COMMIT=30b894a52806b84f364fe85189bd836ef2171104
-PACKAGES_RSK_BRANCH=master

release_state.json

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

site.conf

@@ -1,131 +1,127 @@
 {
-  hostname_prefix = 'tdf',
-  site_name = 'Freifunk Troisdorf',
-  site_code = 'tdf',
-  default_domain = 'tdf',
-  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-  ntp_servers = {
-    'ntp1.infra.fftdf',
-    'ntp2.infra.fftdf',
-    '0.de.pool.ntp.org',
-    '1.de.pool.ntp.org',
-  },
-  regdom = 'DE',
+    hostname_prefix = 'tdf',
+    site_name = 'Freifunk Troisdorf',
+    site_code = 'tdf',
+    opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+    prefix4 = '10.188.0.0/16',
+    prefix6 = 'fda0:747e:ab29:7405::/64',
+    timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+    ntp_servers = {
+        'ntp1.infra.fftdf',
+        'ntp2.infra.fftdf',
+        '0.de.pool.ntp.org',
+        '1.de.pool.ntp.org',
+    },
+    regdom = 'DE',
+    wifi24 = {
+        ssid = 'Freifunk',
+        channel = 5,
+        htmode = 'HT20',
+        mesh_ssid = 'troisdorf-ff-mesh',
+        mesh_bssid = '02:74:05:d0:4f:00',
+        mesh_mcast_rate = 12000,
+    },
+    wifi5 = {
+        ssid = 'Freifunk',
+        channel = 44,
+        htmode = 'HT40+',
+        mesh_ssid = 'troisdorf-ff-mesh',
+        mesh_bssid = '02:74:05:d0:4f:00',
+        mesh_mcast_rate = 12000,
+    },
+    next_node = {
+        ip4 = '10.188.0.1',
+        ip6 = 'fda0:747e:ab29:7405::1',
+        mac = '04:74:05:d0:4f:aa',
+    },
+    autoupdater = {
+        enabled = true,
+        branch = 'stable',
+        branches = {
+            stable = {
+                name = 'stable',
+                mirrors = {
+                    'http://update1.infra.fftdf/stable/sysupgrade',
+                    'http://update2.infra.fftdf/stable/sysupgrade',
+                    'http://update3.infra.fftdf/stable/sysupgrade'
+                },
+                probability = 0.08,
+                good_signatures = 2,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                    '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',  -- Thorsten
+                    'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
 
-  mesh_vpn = {
-    tunneldigger = {
-      mtu = 1312,
-      bandwidth_limit = {
-        enabled = false,
-        egress = 2000,
-        ingress = 6000,
-      },
-    },
-  },
-  wifi24 = {
-    channel = 5,
-    mesh = {
-      mcast_rate = 12000,
-    },
-  },
-  wifi5 = {
-    channel = 44,
-    outdoor_chanlist = "100-140",
-    mesh = {
-      mcast_rate = 12000,
-    },
-  },
-  autoupdater = {
-    enabled = true,
-    branch = 'stable',
-    branches = {
-      stable = {
-        name = 'stable',
-        mirrors = {
-          'http://images.freifunk-troisdorf.de/stable/sysupgrade',
-          'http://update2.infra.fftdf/multi/stable/sysupgrade',
-          'http://images.freifunk-troisdorf.de/multi/stable/sysupgrade'
+                },
+            },
+            beta = {
+                name = 'beta',
+                mirrors = {
+                    'http://update1.infra.fftdf/beta/sysupgrade',
+                    'http://update2.infra.fftdf/beta/sysupgrade',
+                    'http://update3.infra.fftdf/beta/sysupgrade'
+                },
+                probability = 0.08,
+                good_signatures = 1,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                    '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',  -- Thorsten
+                    'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
+                },
+            },
+            experimental = {
+                name = 'experimental',
+                mirrors = {
+                    'http://update1.infra.fftdf/experimental/sysupgrade',
+                    'http://update2.infra.fftdf/experimental/sysupgrade',
+                    'http://update3.infra.fftdf/experimental/sysupgrade'
+                },
+                probability = 1.00,
+                good_signatures = 1,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                    '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',  -- Thorsten
+                    'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
+                },
+            },
         },
-        good_signatures = 2,
-        pubkeys = {
-          '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
-          '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
-          '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0',     -- Reka
-          '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',     -- Thorsten
-          'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0',     -- Marconi
-          'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792',     -- Roman
-          'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880',      -- Nils
-          '9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f',      -- Lars
-          'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2'      -- Michael
-        },
-      },
-      beta = {
-        name = 'beta',
-        mirrors = {
-          'http://images.freifunk-troisdorf.de/beta/sysupgrade',
-          'http://update2.infra.fftdf/multi/beta/sysupgrade',
-          'http://images.freifunk-troisdorf.de/multi/beta/sysupgrade'
-        },
-        good_signatures = 2,
-        pubkeys = {
-          '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
-          '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
-          '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0',     -- Reka
-          '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',     -- Thorsten
-          'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0',     -- Marconi
-          'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792',     -- Roman
-          'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880',      -- Nils
-          '9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f',      -- Lars
-          'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2'      -- Michael
-        },
-      },
-      experimental = {
-        name = 'experimental',
-        mirrors = {
-          'http://images.freifunk-troisdorf.de/experimental/sysupgrade',
-          'http://update2.infra.fftdf/multi/experimental/sysupgrade',
-          'http://images.freifunk-troisdorf.de/multi/experimental/sysupgrade'
-        },
-        good_signatures = 2,
-        pubkeys = {
-          '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
-          '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
-          '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0',     -- Reka
-          '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',     -- Thorsten
-          'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0',     -- Marconi
-          'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792',     -- Roman
-          'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880',      -- Nils
-          '9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f',      -- Lars
-          'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2'      -- Michael
-        },
-      },
     },
-   },
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-      routing_algo = 'BATMAN_IV',
+    roles = {
+        default = 'node',
+        list = {
+            'node',
+            'uplink',
+            'test',
+            'backbone',
+            'service',
+        },
     },
-  },
-  roles = {
-    default = 'node',
-    list = {
-      'node',
-      'test',
-      'backbone',
-      'mesh',
-      'meshanduplink',
-      'nightswitch',
-      'service',
-      'uplink',
+    roguenets_filter = {
+        allowed_prefix4 = '10.188.0.0/16',
+        allowed_prefix6 = 'fda0:747e:ab29:7405::/64',
     },
-  },
-  config_mode = {
-    geo_location = {
-      show_altitude = false,
+    tunneldigger_mesh_vpn = {
+        mtu = 1312,
+        brokers = {
+        	'troisdorf1.freifunk-troisdorf.de:53844',
+        	'troisdorf2.freifunk-troisdorf.de:53844',
+        	'troisdorf3.freifunk-troisdorf.de:53844',
+        	'troisdorf4.freifunk-troisdorf.de:53844',
+        	'troisdorf5.freifunk-troisdorf.de:53844',
+        	'troisdorf6.freifunk-troisdorf.de:53844'},
     },
-    owner = {
-      obligatory = true
+    simple_tc = {
+        mesh_vpn = {
+            ifname = 'mesh-vpn',
+            enabled = false,
+            limit_egress = 300,
+            limit_ingress = 5000,
+        },
     },
-  },
-}
+    }

site.mk

@@ -1,47 +1,38 @@
-GLUON_FEATURES := \
-    mesh-batman-adv-15 \
-    respondd \
-    neighbour-info \
-    autoupdater \
-    config-mode-autoupdater \
-    config-mode-hostname \
-    config-mode-geo-location \
-    config-mode-contact-info \
-    config-mode-mesh-vpn \
-    config-mode-domain-select \
-    mesh-vpn-tunneldigger \
-    ebtables-filter-multicast \
-    ebtables-filter-ra-dhcp \
-    web-admin \
-    web-autoupdater \
-    web-network \
-    web-private-wifi \
-    status-page-mesh-batman-adv \
-    web-node-role \
-    status-page \
-
 GLUON_SITE_PACKAGES := \
+    gluon-mesh-batman-adv-15 \
+    gluon-alfred \
+    gluon-announced \
+    gluon-neighbour-info \
+    gluon-autoupdater \
+    gluon-setup-mode \
+    gluon-config-mode-core \
+    gluon-config-mode-autoupdater \
+    gluon-config-mode-hostname \
+    gluon-config-mode-tunneldigger \
+    gluon-config-mode-geo-location \
+    gluon-config-mode-contact-info \
+    gluon-migrate-vpn \
+    gluon-ebtables-filter-multicast \
+    gluon-ebtables-filter-ra-dhcp \
+    gluon-ebtables-filter-roguenets \
+    gluon-luci-admin \
+    gluon-luci-autoupdater \
+    gluon-luci-portconfig \
+    gluon-luci-private-wifi \
+    gluon-luci-node-role \
+    gluon-next-node \
+    gluon-mesh-vpn-tunneldigger \
+    gluon-radvd \
+    gluon-status-page \
     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 \
+    iptables \
+    haveged \
+    tro-netwatch \
+    tro-offline_ssid
 
-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