Update site.conf

site.conf

@@ -9,13 +9,15 @@
     ntp_servers = {
         '0.de.pool.ntp.org',
         '1.de.pool.ntp.org',
+        'ntp1.infra.fftdf',
+        'ntp2.infra.fftdf',
     },
     regdom = 'DE',
     wifi24 = {
         ssid = 'Freifunk',
-        channel = 5,
-        htmode = 'HT40-',
-        mesh_ssid = 'troisdorf-ff-mesh',
+        channel = 11,
+        htmode = 'HT20',
+        mesh_ssid = 'troisdorf-freifunk-mesh',
         mesh_bssid = '02:74:05:d0:4f:00',
         mesh_mcast_rate = 12000,
     },
@@ -23,7 +25,7 @@
         ssid = 'Freifunk',
         channel = 44,
         htmode = 'HT40+',
-        mesh_ssid = 'troisdorf-ff-mesh',
+        mesh_ssid = 'troisdorf-freifunk-mesh',
         mesh_bssid = '02:74:05:d0:4f:00',
         mesh_mcast_rate = 12000,
     },
@@ -33,14 +35,16 @@
         mac = '04:74:05:d0:4f:aa',
     },
     fastd_mesh_vpn = {
+        enabled = true,
         methods = {
+            'null',
             'salsa2012+umac',
             'salsa2012+gmac'
         },
         mtu = 1312,
         groups = {
             backbone = {
-                limit = 1,
+                limit = 3,
                 peers = {
                     wupper0 = {
                         key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
@@ -65,7 +69,7 @@
                 },
             },
             troisdorf = {
-                limit = 1,
+                limit = 3,
                 peers = {
                     troisdorf1 = {
                         key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
@@ -89,7 +93,7 @@
     },
         autoupdater = {
         enabled = true,
-        branch = 'stable',
+        branch = 'futro',
         branches = {
             stable = {
                 name = 'stable',
@@ -143,15 +147,48 @@
                     'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
                 },
             },
+            event = {
+                name = 'event',
+                mirrors = {
+                    'http://update1.infra.fftdf/event/sysupgrade',
+                    'http://update2.infra.fftdf/event/sysupgrade',
+                    'http://update3.infra.fftdf/event/sysupgrade'
+                },
+                probability = 1.00,
+                good_signatures = 1,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                    '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',  -- Thorsten
+                    'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
+                },
+            },
+            futro = {
+                name = 'futro',
+                mirrors = {
+                    'http://update1.infra.fftdf/futro/sysupgrade',
+                    'http://update2.infra.fftdf/futro/sysupgrade',
+                    'http://update3.infra.fftdf/futro/sysupgrade'
+                },
+                probability = 1.00,
+                good_signatures = 1,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                    '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',  -- Thorsten
+                    'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
+                },
+            },
         },
     },
     roles = {
-        default = 'node',
+        default = 'offloader',
         list = {
             'node',
-            'test',
-            'backbone',
-            'service',
+            'offloader',
+            'event',
         },
     },
     simple_tc = {
@@ -162,13 +199,4 @@
             limit_ingress = 5000,
         },
     },
-    legacy = {
-        version_files = {'/etc/.freifunk_version_keep', '/etc/.fftro_version_keep'},
-        old_files = {'/etc/config/config_mode', '/etc/config/fftro', '/etc/config/freifunk'},
-        config_mode_configs = {'config_mode', 'fftro', 'freifunk'},
-        fastd_configs = {'fftro_mesh_vpn', 'mesh_vpn'},
-        mesh_ifname = 'freifunk',
-        tc_configs = {'fftro', 'freifunk'},
-        wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
-    },
     }

site.mk

@@ -13,7 +13,6 @@ GLUON_SITE_PACKAGES := \
     gluon-config-mode-contact-info \
     gluon-ebtables-filter-multicast \
     gluon-ebtables-filter-ra-dhcp \
-    gluon-legacy \
     gluon-luci-admin \
     gluon-luci-autoupdater \
     gluon-luci-portconfig \
@@ -26,7 +25,13 @@ GLUON_SITE_PACKAGES := \
     iwinfo \
     iptables \
     haveged \
-    tro-netwatch
+    tro-netwatch \
+    tro-offline_ssid \
+    kmod-usb-core \
+    kmod-usb2 \
+    kmod-usb-hid \
+    kmod-usb-net \
+    kmod-usb-net-asix \
 
 DEFAULT_GLUON_RELEASE := 2014.4-stable-2.1
 # Allow overriding the release number from the command line