update site.mk for v2017.1.x

README.md

@@ -1,3 +1,3 @@
 # freifunk-celle
 
-Site-Konfiguration für das Gluon Image (v2015.1.2) der Freifunk Celle Community.
+Site-Konfiguration für das Gluon Image (v2017.1.x) der Freifunk Celle Community.

i18n/de.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: 0.1\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
+"Project-Id-Version: 0.2\n"
+"PO-Revision-Date: 2017-05-06 20:00+0100\n"
 "Last-Translator: Freifunk Celle <info@freifunk-celle.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -23,7 +23,13 @@ msgstr ""
 "kann sich dein Knoten mit dem Celler Mesh-VPN verbinden. Bitte "
 "schicke dazu diesen Schlüssel und den Namen deines Knotens "
 "(<em><%=hostname%></em>) an "
-"<a href=\"mailto:keys@freifunk-celle.de\">keys@freifunk-celle.de</a>."
+"<a href=\"mailto:keys@freifunk-celle.de?subject=<%=urlescape(hostname)%>'s%20Schluessel&body=#<%=urlescape(hostname)%>%0A<%=pubkey%>\">keys@freifunk-celle.de</a>."
+"</p>"
+"<div class=\"the-key\">"
+" # <%=escape(hostname)%>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

i18n/en.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: 1.0\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
+"Project-Id-Version: 0.2\n"
+"PO-Revision-Date: 2017-05-06 20:00+0100\n"
 "Last-Translator: Freifunk Celle <info@freifunk-celle.de>\n"
 "Language-Team: English\n"
 "Language: en\n"
@@ -21,7 +21,13 @@ msgstr ""
 "connect to the mesh VPN until the key has been registered on the Freifunk "
 "Celle servers. "
 "To register the key send it together with your node's name (<em><%=hostname%></em>) to "
-"<a href=\"mailto:keys@freifunk-celle.de\">keys@freifunk-celle.de</a>."
+"<a href=\"mailto:keys@freifunk-celle.de?subject=<%=urlescape(hostname)%>'s%20key&body=#<%=urlescape(hostname)%>%0A<%=pubkey%>\">keys@freifunk-celle.de</a>."
+"</p>"
+"<div class=\"the-key\">"
+" # <%=escape(hostname)%>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 
 msgid "gluon-config-mode:reboot"

site.conf

@@ -17,27 +17,35 @@
   regdom = 'DE',
   wifi24 = {
     channel = 6,
-    ssid = 'freifunk-celle.de',
-    htmode = 'HT20',
-    mesh_ssid = 'mesh.freifunk-celle.de',
-    stamesh_ssid = 'stamesh.freifunk-celle.de',
-    mesh_bssid = 'de:00:00:00:ff:ce',
-    mesh_enc = 'psk',
-    stamesh_enc = 'psk-mixed+tkip+ccmp',
-    mesh_psk = 'Ich weiss, was ich tue.',
-    mesh_mcast_rate = 12000,
+--    htmode = 'HT20',
+    ap = {
+      ssid = 'freifunk-celle.de',
+    },
+    mesh = {
+      id = 'ffce-mesh',
+      mcast_rate = 12000,
+    },
+--    ibss = {
+--      ssid = 'stamesh.freifunk-celle.de',
+--      bssid = 'de:00:00:00:ff:ce',
+--      mcast_rate = 12000,
+--    },
   },
   wifi5 = {
     channel = 40,
-    ssid = 'freifunk-celle.de',
-    htmode = 'HT20',
-    mesh_ssid = 'mesh.freifunk-celle.de',
-    stamesh_ssid = 'stamesh.freifunk-celle.de',
-    mesh_bssid = 'de:00:00:00:ff:ce',
-    mesh_enc = 'psk',
-    stamesh_enc = 'psk-mixed+tkip+ccmp',
-    mesh_psk = 'Ich weiss, was ich tue.',
-    mesh_mcast_rate = 12000,
+--    htmode = 'HT20',
+    ap = {
+      ssid = 'freifunk-celle.de',
+    },
+    mesh = {
+      id = 'ffce-mesh',
+      mcast_rate = 12000,
+    },
+--    ibss = {
+--      ssid = 'stamesh.freifunk-celle.de',
+--      bssid = 'de:00:00:00:ff:ce',
+--      mcast_rate = 12000,
+--    },
   },
 
   -- Node finder for connecting to next local node.
@@ -46,26 +54,62 @@
     ip6 = 'fd92:2dff:d232::ffff:ffff:ffff:fffe',
     mac = 'de:ff:ff:ff:ff:ce',
   },
+
+  mesh_vpn = {
+        -- enabled = true,
+    mtu = 1406,
 
-  -- VPN meshing with supernode.
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
-    configurable = true,
-    mtu = 1406, -- support both IPv4 and IPv6 links over PPPoE with the same MTU.
-    groups = {
-      backbone = {
-        limit = 2,
-        peers = {
-          gw1 = {
-            key = 'cbb4fc55af7247be151711259cce797e03f3e5c75b391fdeddb3113fce178653',
-            remotes = {'"1.gw.freifunk-celle.de" port 10000'},
-          },
-          gw2 = {
-            key = 'a24137786a5a3d12a91c459a39f87ba9245acf91f93779f50a96089016693e6e',
-            remotes = {'"2.gw.freifunk-celle.de" port 10000'},
+    fastd = {
+      -- Refer to http://fastd.readthedocs.org/en/latest/ to better understand
+      -- what these options do.
+
+      -- List of crypto-methods to use.
+      methods = {'salsa2012+umac'},
+      -- configurable = true,
+      -- syslog_level = 'warn',
+
+      groups = {
+        backbone = {
+          -- Limit number of connected peers to reduce bandwidth.
+          limit = 2,
+          -- List of peers.
+          peers = {
+            gw1 = {
+              key = 'cbb4fc55af7247be151711259cce797e03f3e5c75b391fdeddb3113fce178653',
+              -- This is a list, so you might add multiple entries.
+              remotes = {'"1.gw.freifunk-celle.de" port 10000'},
+            },
+            gw2 = {
+              key = 'a24137786a5a3d12a91c459a39f87ba9245acf91f93779f50a96089016693e6e',
+              -- You can also omit the ipv4 to allow both connection via ipv4 and ipv6
+              remotes = {'"2.gw.freifunk-celle.de" port 10000'},
+            },
+
+            -- Optional: nested peer groups
+            -- groups = {
+            --   backbone_sub = {
+            --     ...
+            --   },
+            --   ...
+            -- },
           },
+          -- Optional: additional peer groups, possibly with other limits
+          -- backbone2 = {
+          --   ...
+          -- },
         },
-      },
+       },
+     },
+
+    bandwidth_limit = {
+      -- The bandwidth limit can be enabled by default here.
+      enabled = false,
+
+      -- Default upload limit (kbit/s).
+      egress = 512,
+
+      -- Default download limit (kbit/s).
+      ingress = 4096,
     },
   },
 
@@ -94,13 +138,14 @@
     },
   },
 
-  -- Bandwidth limiting setup, configurable by user on setup.
-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 600,
-      limit_ingress = 6000,
+  config_mode = {
+    -- Show/hide the altitude field
+    geo_location = {
+      show_altitude = false,
     },
+    -- define if the contact field is obligatory (optional)
+      owner = {
+        obligatory = true
+      },
   },
 }

site.mk

@@ -5,9 +5,8 @@
 #		The gluon-mesh-batman-adv-* package must come first because of the dependency resolution
 
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
-	gluon-announced \
+	gluon-respondd \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-contact-info \
@@ -17,12 +16,11 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-wifi-config \
-	gluon-luci-private-wifi \
-	gluon-next-node \
+	gluon-web-admin \
+	gluon-web-autoupdater \
+	gluon-web-network \
+	gluon-web-wifi-config \
+	gluon-mesh-batman-adv-15 \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-setup-mode \
@@ -48,11 +46,18 @@ DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d')
 #			gluon-ff%site_code%-23.42+5-%router_model%.bin
 
 # Allow overriding the release number from the command line, same as gluon branch.
-GLUON_RELEASE ?= 1.0.13
+GLUON_RELEASE ?= 1.0.17
+# stable testing experimental
 GLUON_BRANCH ?= testing
 
 # Default priority for updates.
 GLUON_PRIORITY ?= 0
 
+# Region code required for some images; supported values: us eu
+GLUON_REGION = eu
+
 # Languages to include
 GLUON_LANGS ?= en de
+
+# Build ath10k support
+GLUON_ATH10K_MESH = 11s