Merge pull request #22 from ffslfl/tunneldigger

2017.1.1-0.4.1
ffslfl · Aug 29, 2017 · d69fd0e · d69fd0e
2 parents 5c591f5 + b22256a
commit d69fd0e
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,15 @@
 # site-slfl
 Site Dateien für Freifunk Kreis Schleswig-Flensburg
+
+## Changelog
+
+### 2017.1.1-0.4.1
+- Fastd funktioniert wieder
+- Software in lua umgesetzt
+- Tunneldigger aktualisiert
+- Alfred packet entfernt, da wir respondd nutzen
+- USB Support hinzugefügt
+- Teilkompatiblität von fastd und tunneldigger mit offiziellen gluon paketen hergestellt
+- Verbindungszeit der Router minimiert
+- Dropdown um zwischen fastd, tunneldigger oder kein mesh-vpn zu wählen
+- Interface der tunnel von l2tp0 auf mesh-vpn gewechselt (REBOOT required!)
diff --git a/i18n/de.po b/i18n/de.po
@@ -17,20 +17,7 @@ msgstr ""
 "entsprechend aus und sende es ab."
 
 msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
-"er auf den Servern des Schleswig-Flensburger Freifunk-Projekt eingetragen wurde, "
-"kann sich dein Knoten mit dem Mesh-VPN dort verbinden. Bitte "
-"schicke dazu diesen Schlüssel und den Namen deines Knotens "
-"(<em><%=pcdata(hostname)%></em>) an "
-"<a href=\"mailto:keys@ffslfl.net?subject=<%= urlencode('Anmeldung: ' .. hostname) %>&amp;"
-"body=<%= urlencode('# ' .. hostname .. '\n' .. pubkey) %>\">keys@ffslfl.net</a>."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
+msgstr " "
 
 msgid "gluon-config-mode:novpn"
 msgstr ""
@@ -39,6 +26,9 @@ msgstr ""
 "aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
 "</p>"
 
+msgid "gluon-config-mode:tunneldigger"
+msgstr " "
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Dein Knoten <em><%= pcdata(hostname) %></em> startet gerade neu und wird "

diff --git a/i18n/en.po b/i18n/en.po
@@ -16,25 +16,17 @@ msgstr ""
 "Please fill out the following form and submit it."
 
 msgid "gluon-config-mode:pubkey"
-msgstr ""
-"<p>This is your Freifunk node's public key. The node won't be able to "
-"connect to the mesh VPN until the key has been registered on the Freifunk servers. "
-"To register, send the key together with your node's name (<em><%=pcdata(hostname)%></em>) to "
-"<a href=\"mailto:keys@ffslfl.net?subject=<%= urlencode('Registration: ' .. hostname) %>&amp;"
-"body=<%= urlencode('# ' .. hostname .. '\n' .. pubkey) %>\">keys@ffslfl.net</a>."
-"</p>"
-"<div class=\"the-key\">"
-" # <%= pcdata(hostname) %>"
-" <br />"
-"<%= pubkey %>"
-"</div>"
+msgstr " "
 
 msgid "gluon-config-mode:novpn"
 msgstr ""
 "<p>You have selected <strong>not</strong> to use the mesh VPN. "
 "Your node will only be able to connect to the Freifunk network if other nodes in reach "
 "already have a connection.</p>"
 
+msgid "gluon-config-mode:tunneldigger"
+msgstr " "
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "

diff --git a/modules b/modules
@@ -1,13 +1,22 @@
 # This file allows specifying additional repositories to use
 # when building gluon.
 
-GLUON_SITE_FEEDS='ffki'
+GLUON_SITE_FEEDS='ffki ffslfl'
 
 # the git repository from where to clone the package feed
 PACKAGES_FFKI_REPO=git://github.com/freifunk-kiel/ffki-packages.git
 
 # the version/commit of the git repository to clone
-PACKAGES_FFKI_COMMIT=a85172564fe6463bb8b900d53ede8d642433c3a7
+PACKAGES_FFKI_COMMIT=a3304d0736f0f0141b985a60ac5f55ec495ae908
 
 # the branch to check out
 PACKAGES_FFKI_BRANCH=lede
+
+# the git repository from where to clone the package feed
+PACKAGES_FFSLFL_REPO=git://github.com/ffslfl/slfl-packages.git
+
+# the version/commit of the git repository to clone
+PACKAGES_FFSLFL_COMMIT=a97f370fbf90b301ca0227bc6bce65f952b11ec0
+
+# the branch to check out
+PACKAGES_FFSLFL_BRANCH=master
diff --git a/site.conf b/site.conf
@@ -1,12 +1,15 @@
 {
-  -- hostname_prefix = 'freifunk-',
+  hostname_prefix = 'Gib mir einen Namen ',
 
   -- Name of the community.
   site_name = 'Freifunk Kreis Schleswig-Flensburg',
 
   -- Shorthand of the community.
   site_code = 'slfl',
 
+  -- Must be the same of all nodes in one mesh domain
+  site_seed = 'eb993149e5fccee8879b8ae36bb3668ef93c052919e03fe52049117e46308703',
+
   prefix4 = '10.24.32.0/19',
   prefix6 = 'fd07:96ae:572e:1000::/64',
 
@@ -16,7 +19,7 @@
 
   -- List of NTP servers in your community.
   -- Must be reachable using IPv6!
-  ntp_servers = {'2.de.pool.ntp.org'},
+  ntp_servers = {'fd07:96ae:572e:1000::ff01', '10.24.36.11', 'fd07:96ae:572e:3000::ff01', '10.24.44.11', 'fd07:96ae:572e:5000::ff01', '10.24.52.11', '2.de.pool.ntp.org'},
 
   -- Wireless regulatory domain of your community.
   regdom = 'DE',
@@ -54,6 +57,7 @@
   },
 
   next_node = {
+    name = 'node.slfl',
     -- anycast IPs of all nodes
     ip4 = '10.24.32.254',
     ip6 = 'fd07:96ae:572e::ffff',
@@ -63,34 +67,15 @@
   },
 
   mesh_vpn = {
-    mtu = 1426,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      enabled = true,
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            slfl1 = {
-              key = 'ab259a9c0ad279d7640270f458f7081c492512235a911770a95e6c0e1aaecf7a',
-              remotes = {'"slflgw1.ffslfl.net" port 10050'},
-            },
-            -- slfl2 = {
-            --   key = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
-            --   remotes = {'"slflgw2.ffslfl.net" port 10050'},
-            -- },
-          },
-        },
-      },
-    },
+    mtu = 1280,
     bandwidth_limit = {
       enabled = false,
       -- Default upload limit (kbit/s).
       egress = 800,
       -- Default download limit (kbit/s).
-      ingress = 400,
+      ingress = 4000,
     },
-  },
+},
 
   autoupdater = {
     branch = 'stable',
@@ -105,7 +90,9 @@
         -- List of public keys of maintainers.
         pubkeys = {
                 '359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- Sven
-                'f96fd55709cdbe6f5b3cc22f534ea0d4c05fdf9cd572906d0d01889a3bed87e6', -- Marcel
+                '0ffa26f4740586089a4178569a38fea6e13a22e0f3bb3605fb2c46ed44215f85', -- Marcel
+                '9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
+                '786c7349bc494ca172ed774c5cdf55b304685e25c68aa93a8aaf362676a33ada', -- Frank
         },
       },
       experimental = {
@@ -114,7 +101,9 @@
         good_signatures = 1,
         pubkeys = {
                '359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- Sven
-               'f96fd55709cdbe6f5b3cc22f534ea0d4c05fdf9cd572906d0d01889a3bed87e6', -- Marcel
+               '0ffa26f4740586089a4178569a38fea6e13a22e0f3bb3605fb2c46ed44215f85', -- Marcel
+               '9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
+               '786c7349bc494ca172ed774c5cdf55b304685e25c68aa93a8aaf362676a33ada', -- Frank
         },
       },
     },

diff --git a/site.mk b/site.mk
@@ -6,41 +6,57 @@ GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
 	gluon-respondd \
 	respondd-module-airtime \
-	gluon-alfred \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-core \
 	gluon-config-mode-geo-location \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-web-admin \
 	gluon-web-autoupdater \
 	gluon-web-network \
 	gluon-web-wifi-config \
 	gluon-web-private-wifi \
-	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-setup-mode \
 	gluon-status-page \
 	haveged \
 	iptables \
-	iwinfo
+	iwinfo \
+	gluon-config-mode-contact-info \
+	gluon-mesh-vpn-core
+
+# from ffslfl-packages:
+GLUON_SITE_PACKAGES += \
+	fff-random \
+	ffslfl-fastd \
+	ffslfl-tunneldigger \
+	ffslfl-vpn-select \
+	tunneldigger \
+	gluon-config-mode-mesh-vpn-vpn-select
 
 # from ffki-packages:
 GLUON_SITE_PACKAGES += \
-	gluon-config-mode-contact-info-anonymous-hint
+	gluon-config-mode-ppa \
+	gluon-config-mode-hostname-no-pretty
 
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 
-DEFAULT_GLUON_RELEASE := develop-2016.2.3-$(shell date '+%Y%m%d')
+# When building a self made Version use this syntax:
+DEFAULT_GLUON_RELEASE := 2017.1.1-0.4.1~dev$(shell date '+%y%m%d%H%M')
+
+# When building a experimental version use this syntax:
+#DEFAULT_GLUON_RELEASE := 2017.1.1-0.4.1~exp$(shell date '+%y%m%d%H%M')
 
-DEFAULT_GLUON_BRANCH=develop
+# When building a stable version use this syntax:
+#DEFAULT_GLUON_RELEASE := 2017.1.1-0.4.1
+
+# Routers should use stable. Use experimental autoupdate branch only when doing the autoupdate test. It should never be a router default in the main net.
+DEFAULT_GLUON_BRANCH=stable
 
 ##	GLUON_RELEASE
 #		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
@@ -51,6 +67,7 @@ DEFAULT_GLUON_BRANCH=develop
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
+GLUON_BRANCH ?= $(DEFAULT_GLUON_BRANCH)
 
 # Default priority for updates.
 GLUON_PRIORITY ?= 0
@@ -62,3 +79,111 @@ GLUON_REGION ?= eu
 GLUON_LANGS ?= en de
 
 GLUON_ATH10K_MESH ?= 11s
+
+# basic support the USB stack
+#USB_PACKAGES_BASIC := \
+#	kmod-usb-core \
+#	kmod-usb2
+
+# support for USB UMTS/3G devices
+USB_PACKAGES_3G := \
+	kmod-usb-serial \
+	kmod-usb-serial-wwan \
+	kmod-usb-serial-option \
+	chat \
+	ppp
+
+# support for USB GPS devices
+USB_PACKAGES_GPS := \
+	kmod-usb-acm \
+	ugps
+
+# support for HID devices (keyboard, mouse, ...)
+USB_PACKAGES_HID := \
+	kmod-usb-hid \
+	kmod-hid-generic
+
+# support for USB tethering
+USB_PACKAGES_TETHERING := \
+	kmod-usb-net \
+	kmod-usb-net-asix \
+	kmod-usb-net-dm9601-ether
+
+USB_X86_GENERIC_NETWORK_MODULES := \
+	kmod-usb-ohci-pci \
+	kmod-sky2 \
+	kmod-atl2 \
+	kmod-igb \
+	kmod-3c59x \
+	kmod-e100 \
+	kmod-e1000 \
+	kmod-e1000e \
+	kmod-natsemi \
+	kmod-ne2k-pci \
+	kmod-pcnet32 \
+	kmod-8139too \
+	kmod-r8169 \
+	kmod-sis900 \
+	kmod-tg3 \
+	kmod-via-rhine \
+	kmod-via-velocity \
+	kmod-forcedeth
+
+# storage support for USB
+USB_PACKAGES_STORAGE := \
+	block-mount \
+	kmod-fs-ext4 \
+	kmod-fs-vfat \
+	kmod-usb-storage \
+	kmod-usb-storage-extras \
+	blkid \
+	swap-utils \
+	kmod-nls-cp1250 \
+	kmod-nls-cp1251 \
+	kmod-nls-cp437 \
+	kmod-nls-cp775 \
+	kmod-nls-cp850 \
+	kmod-nls-cp852 \
+	kmod-nls-cp866 \
+	kmod-nls-iso8859-1 \
+	kmod-nls-iso8859-13 \
+	kmod-nls-iso8859-15 \
+	kmod-nls-iso8859-2 \
+	kmod-nls-koi8r \
+	kmod-nls-utf8
+# from ffki-packages:
+#USB_PACKAGES_STORAGE += \
+#	gluon-usb-media \
+#	gluon-config-mode-usb-media
+
+# add addition network drivers and usb stuff only to targes where disk space does not matter
+ifeq ($(GLUON_TARGET),x86-generic)
+	# support the USB stack on x86 devices
+	# and add a few common USB NICs
+	GLUON_SITE_PACKAGES += \
+#		$(USB_PACKAGES_STORAGE) \
+		$(USB_PACKAGES_HID) \
+		$(USB_PACKAGES_TETHERING) \
+		$(USB_PACKAGES_3G) \
+		$(USB_PACKAGES_GPS) \
+		$(USB_X86_GENERIC_NETWORK_MODULES)
+endif
+
+#ifeq ($(GLUON_TARGET),ar71xx-generic)
+#	GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_DIR825B1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_DIR505A1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#	GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#endif
+
+#ifeq ($(GLUON_TARGET),mpc85xx-generic)
+#	GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+#endif