From 0c410b36988ed28da7ac22586b6a5b1ae854d486 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Wed, 31 Aug 2016 11:04:15 +0200 Subject: [PATCH 01/11] Beta-Branch initialisiert --- README | 2 + i18n/de.po | 29 ++++++- i18n/en.po | 29 ++++++- site.conf | 244 ++++++++++++++++++++++++++++++----------------------- site.mk | 132 +++++++++++++++++++++++------ 5 files changed, 296 insertions(+), 140 deletions(-) diff --git a/README b/README index 9433d78..c1263ae 100644 --- a/README +++ b/README @@ -1,2 +1,4 @@ Freifunk Community Pinneberg Site-Konfiguration "site-ffpi" + +Dieses ist der Beta-Brach. diff --git a/i18n/de.po b/i18n/de.po index 2975966..5933035 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2015-05-29 11:20+0100\n" +"Project-Id-Version: FFPI 1.0\n" +"PO-Revision-Date: 2016-05-02 08:41+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: German\n" "Language: de\n" @@ -18,13 +18,19 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" -"Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " +"

Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " "er auf den Servern des Pinneberger Freifunk-Projektes eingetragen wurde, " "kann sich dein Knoten mit dem Pinneberger Mesh-VPN zu verbinden. Bitte " "schicke dazu diesen Schlüssel und den Namen deines Knotens " "(<%=hostname%>) an " "keys@freifunk-pinneberg.de." -"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein Knoten sich verbindet." +"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein " +"Knoten sich verbindet.

" +"
" +" # <%= hostname %>" +"
" +"<%= pubkey %>" +"
" msgid "gluon-config-mode:reboot" msgstr "" @@ -34,3 +40,18 @@ msgstr "" "Pinneberger Freifunk-Community findest du auf " "unserer Webseite.

" "

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

" + +msgid "gluon-luci-node-role:role:node" +msgstr "Normaler Knoten" + +msgid "gluon-luci-node-role:role:mobile" +msgstr "Mobiler Knoten" + +msgid "gluon-luci-node-role:role:offloader" +msgstr "VPN Offloader" + +msgid "gluon-luci-node-role:role:service" +msgstr "Knoten für Dienste" + +msgid "gluon-luci-node-role:role:test" +msgstr "Knoten für Tests" diff --git a/i18n/en.po b/i18n/en.po index bb833ae..70534fa 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2015-05-29 11:20+0100\n" +"Project-Id-Version: FFPI 1.0\n" +"PO-Revision-Date: 2016-05-02 08:41+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: English\n" "Language: en\n" @@ -17,16 +17,37 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" -"This is your Freifunk node's public key. The node won't be able to " +"

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 " "Pinneberg servers. " "To register the key send it together with your node's name (<%=hostname%>) to " "keys@freifunk-pinneberg.de." +"After sending the mail it can take a few hours until your node gets connected.

" +"
" +" # <%= hostname %>" +"
" +"<%= pubkey %>" +"
" msgid "gluon-config-mode:reboot" msgstr "" "

The node is currently rebooting and will try to connect to other " "nearby Freifunk nodes after that. " "Your can find lots of information on the Freifunk Pinneberg community on " -"our homepage.

" +"our homepage.

" "

Have fun with your node and exploring the Freifunk network!

" + +msgid "gluon-luci-node-role:role:node" +msgstr "Normal Node" + +msgid "gluon-luci-node-role:role:mobile" +msgstr "Mobile Node" + +msgid "gluon-luci-node-role:role:offloader" +msgstr "VPN Offloader" + +msgid "gluon-luci-node-role:role:service" +msgstr "Service Node" + +msgid "gluon-luci-node-role:role:test" +msgstr "Test Node" diff --git a/site.conf b/site.conf index d13e63b..6422fd0 100644 --- a/site.conf +++ b/site.conf @@ -1,108 +1,140 @@ { - hostname_prefix = 'ffpi-', - site_name = 'Freifunk Pinneberg', - site_code = 'ffpi', - opkg_repo = 'http://1.download.services.ffpi/openwrt/barrier_breaker/14.07/%S/packages', - prefix4 = '10.137.0.0/16', - prefix6 = 'fde8:21c6:9d82::/64', - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - ntp_servers = {'1.ntp.services.ffpi'}, - regdom = 'DE', - wifi24 = { - ssid = 'pinneberg.freifunk.net', - channel = 9, - htmode = 'HT20', - mesh_ssid = '0a:00:ba:dc:ab:1e', - mesh_bssid = '0a:00:ba:dc:ab:1e', - mesh_mcast_rate = 12000, - }, - wifi5 = { - ssid = 'pinneberg.freifunk.net', - channel = 40, - htmode = 'HT40+', - mesh_ssid = '0a:00:ba:dc:ab:1e', - mesh_bssid = '0a:00:ba:dc:ab:1e', - mesh_mcast_rate = 12000, - }, - next_node = { - ip4 = '10.137.0.1', - ip6 = 'fde8:21c6:9d82::1', - mac = '16:41:95:40:f7:dc', - }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, - mtu = 1426, - groups = { - backbone = { - limit = 1, - peers = { - gate01 = { - key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', - remotes = {'ipv4 "gate01.hoogi.de" port 10000'}, - }, - gate03 = { - key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', - remotes = {'ipv4 "gate03.hoogi.de" port 10000'}, - }, - gate04 = { - key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', - remotes = {'ipv4 "gate04.freifunk-pinneberg.de" port 10000'}, - }, - gate05 = { - key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', - remotes = {'ipv4 "gate05.freifunk-pinneberg.de" port 10000'}, - }, - }, - }, - }, - }, - autoupdater = { - enabled = 'true', - branch = 'stable', - branches = { - stable = { - name = 'stable', - mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, - good_signatures = 3, - pubkeys = { - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'e3315d3b6a98884b6621d9152b276c80abe7439cf517ec831b50e25d17f947fa', -- Martin - }, - }, - beta = { - name = 'beta', - mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, - good_signatures = 2, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'e3315d3b6a98884b6621d9152b276c80abe7439cf517ec831b50e25d17f947fa', -- Martin - }, - }, - experimental = { - name = 'experimental', - mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, - good_signatures = 1, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'e3315d3b6a98884b6621d9152b276c80abe7439cf517ec831b50e25d17f947fa', -- Martin - }, - }, - }, - }, - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 200, - limit_ingress = 3000, - }, - }, + hostname_prefix = 'ffpi-', + site_name = 'Freifunk Pinneberg', + site_code = 'ffpi', + opkg = { + openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', + extra = { + modules = 'http://1.download.services.ffpi/beta/modules/gluon-%GS-%GR/%S', + }, + }, + prefix4 = '10.137.0.0/16', + prefix6 = 'fde8:21c6:9d82::/64', + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin + ntp_servers = {'1.ntp.services.ffpi'}, + regdom = 'DE', + wifi24 = { + channel = 9, + htmode = 'HT20', + ap = { + ssid = 'pinneberg.freifunk.net' + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000 + }, + }, + wifi5 = { + channel = 40, + htmode = 'HT40+', + master = { + ssid = 'pinneberg.freifunk.net', + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000, + }, + }, + next_node = { + ip4 = '10.137.0.1', + ip6 = 'fde8:21c6:9d82::1', + mac = '16:41:95:40:f7:dc', + }, + fastd_mesh_vpn = { + methods = {'salsa2012+umac'}, + mtu = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gate01 = { + key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', + remotes = { + 'ipv4 "gate01.hoogi.de" port 10000', + 'ipv4 "gate01.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate01.freifunk-pinneberg.de" port 10000' + }, + }, + gate03 = { + key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', + remotes = { + 'ipv4 "gate03.hoogi.de" port 10000', + 'ipv4 "gate03.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate03.freifunk-pinneberg.de" port 10000' + + }, + }, + gate04 = { + key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', + remotes = { + 'ipv4 "gate04.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate04.freifunk-pinneberg.de" port 10000' + }, + }, + gate05 = { + key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', + remotes = { + 'ipv4 "gate05.hoogi.de" port 10000', + 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' + }, + }, + }, + }, + }, + bandwidth_limit = { + enabled = false, + limit_ingress = 3000, + limit_egress = 200, + } + }, + autoupdater = { + branch = 'beta', + branches = { + stable = { + name = 'stable', + mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, + good_signatures = 3, + pubkeys = { + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + }, + }, + beta = { + name = 'beta', + mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, + good_signatures = 2, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + }, + }, + experimental = { + name = 'experimental', + mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, + good_signatures = 1, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + }, + }, + }, + }, + roles = { + default = 'node', + list = { + 'node', + 'mobile', + 'offloader', + 'service', + 'test', + }, + }, } diff --git a/site.mk b/site.mk index 5a1b3e2..fdaea9b 100644 --- a/site.mk +++ b/site.mk @@ -1,31 +1,108 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ - gluon-alfred \ - gluon-announced \ - gluon-autoupdater \ - gluon-config-mode-autoupdater \ - gluon-config-mode-contact-info \ - 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-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-portconfig \ - gluon-luci-wifi-config \ - gluon-luci-private-wifi \ - gluon-next-node \ - gluon-mesh-vpn-fastd \ - gluon-radvd \ - gluon-setup-mode \ - gluon-status-page \ - iwinfo \ - iptables \ - haveged + gluon-mesh-batman-adv-15 \ + gluon-alfred \ + gluon-respondd \ + gluon-autoupdater \ + gluon-config-mode-autoupdater \ + gluon-config-mode-contact-info \ + 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-luci-admin \ + gluon-luci-autoupdater \ + gluon-luci-portconfig \ + gluon-luci-wifi-config \ + gluon-luci-private-wifi \ + gluon-luci-node-role \ + gluon-next-node \ + gluon-mesh-vpn-fastd \ + gluon-radvd \ + gluon-setup-mode \ + gluon-status-page \ + iwinfo \ + iptables \ + haveged -DEFAULT_GLUON_RELEASE := 0.7.1 +# basic support for 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 + +# storage support for USB devices +USB_PACKAGES_STORAGE := \ + block-mount \ + blkid \ + kmod-fs-ext4 \ + kmod-fs-vfat \ + kmod-usb-storage \ + kmod-usb-storage-extras \ + 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 \ + swap-utils + +# ar71xx-generic +GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC) +GLUON_WRT160NL_SITE_PACKAGE := $(USB_PACKAGES_BASIC) +GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) + +# mpc85xx-generic +GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) + +# x86-generic +ifeq ($(GLUON_TARGET),x86-generic) +GLUON_SITE_PACKAGES += \ + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) +endif + +# x86-64 +ifeq ($(GLUON_TARGET),x86-64) +GLUON_SITE_PACKAGES += \ + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) +endif +DEFAULT_GLUON_RELEASE := 0.8-beta1 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) @@ -33,3 +110,6 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_PRIORITY ?= 0 GLUON_LANGS ?= en de + +# Enable autoupdater +GLUON_BRANCH := beta From 5c49cc9d8cf5f53f471477bbaf20a3fe1e2f5e48 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Wed, 31 Aug 2016 11:31:22 +0200 Subject: [PATCH 02/11] Experimental-Branch initialisiert --- README | 7 +- i18n/de.po | 14 +-- i18n/en.po | 4 +- site.conf | 275 ++++++++++++++++++++++++++--------------------------- site.mk | 146 ++++++++++++++-------------- 5 files changed, 224 insertions(+), 222 deletions(-) diff --git a/README b/README index c1263ae..4f34ac8 100644 --- a/README +++ b/README @@ -1,4 +1,9 @@ Freifunk Community Pinneberg Site-Konfiguration "site-ffpi" -Dieses ist der Beta-Brach. +Dieses ist der Experimental-Brach. + +Bitte nicht im Produktivbetrieb nutzen. +Es kann sich alles jederzeit unerwartet ändern. + +Betrieb auf eigenes Risiko! diff --git a/i18n/de.po b/i18n/de.po index 5933035..5e73f87 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: FFPI 1.0\n" -"PO-Revision-Date: 2016-05-02 08:41+0100\n" +"PO-Revision-Date: 2015-11-04 20:23+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: German\n" "Language: de\n" @@ -12,19 +12,19 @@ msgstr "" msgid "gluon-config-mode:welcome" msgstr "" -"Willkommen zum Einrichtungsassistenten für deinen neuen Pinneberger " -"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen " +"Willkommen zum Einrichtungsassistenten für Deinen neuen Pinneberger " +"Freifunk-Knoten. Fülle das folgende Formular Deinen Vorstellungen " "entsprechend aus und sende es ab." msgid "gluon-config-mode:pubkey" msgstr "" "

Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " "er auf den Servern des Pinneberger Freifunk-Projektes eingetragen wurde, " -"kann sich dein Knoten mit dem Pinneberger Mesh-VPN zu verbinden. Bitte " -"schicke dazu diesen Schlüssel und den Namen deines Knotens " +"kann sich Dein Knoten mit dem Pinneberger Mesh-VPN zu verbinden. Bitte " +"schicke dazu diesen Schlüssel und den Namen Deines Knotens " "(<%=hostname%>) an " "keys@freifunk-pinneberg.de." -"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein " +"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis Dein " "Knoten sich verbindet.

" "
" " # <%= hostname %>" @@ -37,7 +37,7 @@ msgstr "" "

Dein Knoten startet gerade neu und wird anschließend versuchen, " "sich mit anderen Freifunkknoten in seiner Nähe zu " "verbinden. Weitere Informationen zur " -"Pinneberger Freifunk-Community findest du auf " +"Pinneberger Freifunk-Community findest Du auf " "unserer Webseite.

" "

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

" diff --git a/i18n/en.po b/i18n/en.po index 70534fa..957a04e 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: FFPI 1.0\n" -"PO-Revision-Date: 2016-05-02 08:41+0100\n" +"PO-Revision-Date: 2015-11-04 20:23+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: English\n" "Language: en\n" @@ -34,7 +34,7 @@ msgstr "" "

The node is currently rebooting and will try to connect to other " "nearby Freifunk nodes after that. " "Your can find lots of information on the Freifunk Pinneberg community on " -"our homepage.

" +"our homepage.

" "

Have fun with your node and exploring the Freifunk network!

" msgid "gluon-luci-node-role:role:node" diff --git a/site.conf b/site.conf index 6422fd0..4b5a3f8 100644 --- a/site.conf +++ b/site.conf @@ -1,140 +1,139 @@ { - hostname_prefix = 'ffpi-', - site_name = 'Freifunk Pinneberg', - site_code = 'ffpi', - opkg = { - openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', - extra = { - modules = 'http://1.download.services.ffpi/beta/modules/gluon-%GS-%GR/%S', - }, - }, - prefix4 = '10.137.0.0/16', - prefix6 = 'fde8:21c6:9d82::/64', - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - ntp_servers = {'1.ntp.services.ffpi'}, - regdom = 'DE', - wifi24 = { - channel = 9, - htmode = 'HT20', - ap = { - ssid = 'pinneberg.freifunk.net' - }, - ibss = { - ssid = '0a:00:ba:dc:ab:1e', - bssid = '0a:00:ba:dc:ab:1e', - mcast_rate = 12000 - }, - }, - wifi5 = { - channel = 40, - htmode = 'HT40+', - master = { - ssid = 'pinneberg.freifunk.net', - }, - ibss = { - ssid = '0a:00:ba:dc:ab:1e', - bssid = '0a:00:ba:dc:ab:1e', - mcast_rate = 12000, - }, - }, - next_node = { - ip4 = '10.137.0.1', - ip6 = 'fde8:21c6:9d82::1', - mac = '16:41:95:40:f7:dc', - }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, - mtu = 1426, - groups = { - backbone = { - limit = 1, - peers = { - gate01 = { - key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', - remotes = { - 'ipv4 "gate01.hoogi.de" port 10000', - 'ipv4 "gate01.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate01.freifunk-pinneberg.de" port 10000' - }, - }, - gate03 = { - key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', - remotes = { - 'ipv4 "gate03.hoogi.de" port 10000', - 'ipv4 "gate03.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate03.freifunk-pinneberg.de" port 10000' - - }, - }, - gate04 = { - key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', - remotes = { - 'ipv4 "gate04.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate04.freifunk-pinneberg.de" port 10000' - }, - }, - gate05 = { - key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', - remotes = { - 'ipv4 "gate05.hoogi.de" port 10000', - 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' - }, - }, - }, - }, - }, - bandwidth_limit = { - enabled = false, - limit_ingress = 3000, - limit_egress = 200, - } - }, - autoupdater = { - branch = 'beta', - branches = { - stable = { - name = 'stable', - mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, - good_signatures = 3, - pubkeys = { - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - }, - }, - beta = { - name = 'beta', - mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, - good_signatures = 2, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - }, - }, - experimental = { - name = 'experimental', - mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, - good_signatures = 1, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - }, - }, - }, - }, - roles = { - default = 'node', - list = { - 'node', - 'mobile', - 'offloader', - 'service', - 'test', - }, - }, + hostname_prefix = 'ffpi-', + site_name = 'Freifunk Pinneberg', + site_code = 'ffpi', + opkg = { + openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', + extra = { + modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S', + }, + }, + prefix4 = '10.137.0.0/16', + prefix6 = 'fde8:21c6:9d82::/64', + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin + ntp_servers = {'1.ntp.services.ffpi'}, + regdom = 'DE', + wifi24 = { + channel = 9, + htmode = 'HT20', + ap = { + ssid = 'pinneberg.freifunk.net' + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000 + }, + }, + wifi5 = { + channel = 40, + htmode = 'HT40+', + master = { + ssid = 'pinneberg.freifunk.net', + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000, + }, + }, + next_node = { + ip4 = '10.137.0.1', + ip6 = 'fde8:21c6:9d82::1', + mac = '16:41:95:40:f7:dc', + }, + fastd_mesh_vpn = { + methods = {'salsa2012+umac'}, + mtu = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gate01 = { + key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', + remotes = { + 'ipv4 "gate01.hoogi.de" port 10000', + 'ipv4 "gate01.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate01.freifunk-pinneberg.de" port 10000' + }, + }, + gate03 = { + key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', + remotes = { + 'ipv4 "gate03.hoogi.de" port 10000', + 'ipv4 "gate03.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate03.freifunk-pinneberg.de" port 10000' + }, + }, + gate04 = { + key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', + remotes = { + 'ipv4 "gate04.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate04.freifunk-pinneberg.de" port 10000' + }, + }, + gate05 = { + key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', + remotes = { + 'ipv4 "gate05.hoogi.de" port 10000', + 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' + }, + }, + }, + }, + }, + bandwidth_limit = { + enabled = false, + limit_ingress = 3000, + limit_egress = 200, + } + }, + autoupdater = { + branch = 'experimental', + branches = { + stable = { + name = 'stable', + mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, + good_signatures = 3, + pubkeys = { + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + }, + }, + beta = { + name = 'beta', + mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, + good_signatures = 2, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + }, + }, + experimental = { + name = 'experimental', + mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, + good_signatures = 1, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + }, + }, + }, + }, + roles = { + default = 'node', + list = { + 'node', + 'mobile', + 'offloader', + 'service', + 'test', + }, + }, } diff --git a/site.mk b/site.mk index fdaea9b..a3699fc 100644 --- a/site.mk +++ b/site.mk @@ -1,88 +1,88 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ - gluon-alfred \ - gluon-respondd \ - gluon-autoupdater \ - gluon-config-mode-autoupdater \ - gluon-config-mode-contact-info \ - 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-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-portconfig \ - gluon-luci-wifi-config \ - gluon-luci-private-wifi \ - gluon-luci-node-role \ - gluon-next-node \ - gluon-mesh-vpn-fastd \ - gluon-radvd \ - gluon-setup-mode \ - gluon-status-page \ - iwinfo \ - iptables \ - haveged + gluon-mesh-batman-adv-15 \ + gluon-alfred \ + gluon-respondd \ + gluon-autoupdater \ + gluon-config-mode-autoupdater \ + gluon-config-mode-contact-info \ + 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-luci-admin \ + gluon-luci-autoupdater \ + gluon-luci-portconfig \ + gluon-luci-wifi-config \ + gluon-luci-private-wifi \ + gluon-luci-node-role \ + gluon-next-node \ + gluon-mesh-vpn-fastd \ + gluon-radvd \ + gluon-setup-mode \ + gluon-status-page \ + iwinfo \ + iptables \ + haveged # basic support for USB stack USB_PACKAGES_BASIC := \ - kmod-usb-core \ - kmod-usb2 + kmod-usb-core \ + kmod-usb2 -# support for USB UMTS/3G devices +# support for USB UMTS/3G devices USB_PACKAGES_3G := \ - kmod-usb-serial \ - kmod-usb-serial-wwan \ - kmod-usb-serial-option \ - chat \ - ppp + 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 + kmod-usb-acm \ + ugps # support for HID devices (keyboard, mouse, ...) USB_PACKAGES_HID := \ - kmod-usb-hid \ - kmod-hid-generic + kmod-usb-hid \ + kmod-hid-generic # storage support for USB devices USB_PACKAGES_STORAGE := \ - block-mount \ - blkid \ - kmod-fs-ext4 \ - kmod-fs-vfat \ - kmod-usb-storage \ - kmod-usb-storage-extras \ - 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 \ - swap-utils + block-mount \ + blkid \ + kmod-fs-ext4 \ + kmod-fs-vfat \ + kmod-usb-storage \ + kmod-usb-storage-extras \ + 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 \ + swap-utils # ar71xx-generic GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC) +GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC) GLUON_WRT160NL_SITE_PACKAGE := $(USB_PACKAGES_BASIC) GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) # mpc85xx-generic GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) @@ -90,19 +90,20 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) # x86-generic ifeq ($(GLUON_TARGET),x86-generic) GLUON_SITE_PACKAGES += \ - $(USB_PACKAGES_HID) \ - $(USB_PACKAGES_BASIC) \ - $(USB_PACKAGES_STORAGE) + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) endif # x86-64 ifeq ($(GLUON_TARGET),x86-64) GLUON_SITE_PACKAGES += \ - $(USB_PACKAGES_HID) \ - $(USB_PACKAGES_BASIC) \ - $(USB_PACKAGES_STORAGE) + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) endif -DEFAULT_GLUON_RELEASE := 0.8-beta1 + +DEFAULT_GLUON_RELEASE := 0.8+exp$(shell date '+%Y%m%d') # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) @@ -110,6 +111,3 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_PRIORITY ?= 0 GLUON_LANGS ?= en de - -# Enable autoupdater -GLUON_BRANCH := beta From 5be5d1f155a3761bd6ef940065e441662914d704 Mon Sep 17 00:00:00 2001 From: thooge Date: Wed, 31 Aug 2016 11:32:47 +0200 Subject: [PATCH 03/11] Tippfehler korrigiert --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 4f34ac8..434e591 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Freifunk Community Pinneberg Site-Konfiguration "site-ffpi" -Dieses ist der Experimental-Brach. +Dieses ist der Experimental-Branch. Bitte nicht im Produktivbetrieb nutzen. Es kann sich alles jederzeit unerwartet ändern. From 1202bab64549c4e6ef63135319dfbd5f28497e83 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Oct 2016 15:19:08 +0200 Subject: [PATCH 04/11] =?UTF-8?q?UMTS/3G=20Pakete=20f=C3=BCr=20einige=20Ro?= =?UTF-8?q?uter=20aktiviert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.conf | 4 ++-- site.mk | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/site.conf b/site.conf index 4b5a3f8..a146c74 100644 --- a/site.conf +++ b/site.conf @@ -6,8 +6,8 @@ openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', extra = { modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S', - }, - }, + }, + }, prefix4 = '10.137.0.0/16', prefix6 = 'fde8:21c6:9d82::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin diff --git a/site.mk b/site.mk index a3699fc..eacc91c 100644 --- a/site.mk +++ b/site.mk @@ -74,15 +74,15 @@ USB_PACKAGES_STORAGE := \ # ar71xx-generic GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC) +GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G) +GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G) +GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC) GLUON_WRT160NL_SITE_PACKAGE := $(USB_PACKAGES_BASIC) GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) # mpc85xx-generic GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) From d0089e3d31559852a5630437a83429d986f2678f Mon Sep 17 00:00:00 2001 From: thooge Date: Mon, 3 Oct 2016 17:26:21 +0200 Subject: [PATCH 05/11] =?UTF-8?q?Neuen=20Signierschl=C3=BCssel=20integrier?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site.conf b/site.conf index a146c74..84bf4ec 100644 --- a/site.conf +++ b/site.conf @@ -100,6 +100,7 @@ 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel }, }, beta = { @@ -111,6 +112,7 @@ 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel }, }, experimental = { @@ -122,6 +124,7 @@ 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel }, }, }, From 1f47243deaf43fe342f43d48dc5fb75d7250651a Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Mon, 17 Oct 2016 09:29:26 +0200 Subject: [PATCH 06/11] =?UTF-8?q?Neue=20Rolle=20f=C3=BCr=20tempor=C3=A4re?= =?UTF-8?q?=20Knoten,=20die=20z.B.=20nicht=2024/7=20verf=C3=BCgbar=20sind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/de.po | 3 +++ i18n/en.po | 3 +++ site.conf | 1 + 3 files changed, 7 insertions(+) diff --git a/i18n/de.po b/i18n/de.po index 5e73f87..e16096c 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -44,6 +44,9 @@ msgstr "" msgid "gluon-luci-node-role:role:node" msgstr "Normaler Knoten" +msgid "gluon-luci-node-role:role:temp" +msgstr "Knoten nicht 24/7 verfügbar" + msgid "gluon-luci-node-role:role:mobile" msgstr "Mobiler Knoten" diff --git a/i18n/en.po b/i18n/en.po index 957a04e..b47f06b 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -40,6 +40,9 @@ msgstr "" msgid "gluon-luci-node-role:role:node" msgstr "Normal Node" +msgid "gluon-luci-node-role:role:temp" +msgstr "Node not available 24/7" + msgid "gluon-luci-node-role:role:mobile" msgstr "Mobile Node" diff --git a/site.conf b/site.conf index 84bf4ec..5af61ec 100644 --- a/site.conf +++ b/site.conf @@ -133,6 +133,7 @@ default = 'node', list = { 'node', + 'temp', 'mobile', 'offloader', 'service', From 04d70e068d26b35edb701a7deadfc177b97b3409 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Thu, 20 Oct 2016 19:23:10 +0200 Subject: [PATCH 07/11] =?UTF-8?q?Gro=C3=9F-=20Kleinschreibung=20angegliche?= =?UTF-8?q?n,=203G=20f=C3=BCr=20842er=20=20aktiviert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/de.po | 14 +++++++------- i18n/en.po | 4 ++-- site.mk | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/i18n/de.po b/i18n/de.po index e16096c..23e25b0 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: FFPI 1.0\n" -"PO-Revision-Date: 2015-11-04 20:23+0100\n" +"PO-Revision-Date: 2016-10-20 19:18+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: German\n" "Language: de\n" @@ -12,19 +12,19 @@ msgstr "" msgid "gluon-config-mode:welcome" msgstr "" -"Willkommen zum Einrichtungsassistenten für Deinen neuen Pinneberger " -"Freifunk-Knoten. Fülle das folgende Formular Deinen Vorstellungen " +"Willkommen zum Einrichtungsassistenten für deinen neuen Pinneberger " +"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen " "entsprechend aus und sende es ab." msgid "gluon-config-mode:pubkey" msgstr "" "

Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " "er auf den Servern des Pinneberger Freifunk-Projektes eingetragen wurde, " -"kann sich Dein Knoten mit dem Pinneberger Mesh-VPN zu verbinden. Bitte " -"schicke dazu diesen Schlüssel und den Namen Deines Knotens " +"kann sich dein Knoten mit dem Pinneberger Mesh-VPN zu verbinden. Bitte " +"schicke dazu diesen Schlüssel und den Namen deines Knotens " "(<%=hostname%>) an " "keys@freifunk-pinneberg.de." -"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis Dein " +"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein " "Knoten sich verbindet.

" "
" " # <%= hostname %>" @@ -37,7 +37,7 @@ msgstr "" "

Dein Knoten startet gerade neu und wird anschließend versuchen, " "sich mit anderen Freifunkknoten in seiner Nähe zu " "verbinden. Weitere Informationen zur " -"Pinneberger Freifunk-Community findest Du auf " +"Pinneberger Freifunk-Community findest du auf " "unserer Webseite.

" "

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

" diff --git a/i18n/en.po b/i18n/en.po index b47f06b..5468b18 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: FFPI 1.0\n" -"PO-Revision-Date: 2015-11-04 20:23+0100\n" +"PO-Revision-Date: 2016-10-20 19:18+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: English\n" "Language: en\n" @@ -34,7 +34,7 @@ msgstr "" "

The node is currently rebooting and will try to connect to other " "nearby Freifunk nodes after that. " "Your can find lots of information on the Freifunk Pinneberg community on " -"our homepage.

" +"our homepage.

" "

Have fun with your node and exploring the Freifunk network!

" msgid "gluon-luci-node-role:role:node" diff --git a/site.mk b/site.mk index eacc91c..ad39aea 100644 --- a/site.mk +++ b/site.mk @@ -31,7 +31,7 @@ USB_PACKAGES_BASIC := \ kmod-usb-core \ kmod-usb2 -# support for USB UMTS/3G devices +# support for USB UMTS/3G devices USB_PACKAGES_3G := \ kmod-usb-serial \ kmod-usb-serial-wwan \ @@ -78,7 +78,7 @@ GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G) GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G) GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) -GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) +GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G) GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC) GLUON_WRT160NL_SITE_PACKAGE := $(USB_PACKAGES_BASIC) GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) From e048e2314b6015c91da6ab92579f4d5cfc3c93a9 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Fri, 3 Mar 2017 21:02:58 +0100 Subject: [PATCH 08/11] =?UTF-8?q?Neue=20Version=20basierend=20auf=20Gluon?= =?UTF-8?q?=202016.2.3;=20Unterst=C3=BCtzung=20f=C3=BCr=20u.a.=20EU-Versio?= =?UTF-8?q?n=20des=20841ND=20v11.=20Rolle=20f=C3=BCr=20versteckte=20Knoten?= =?UTF-8?q?=20eingebaut.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/de.po | 3 +++ i18n/en.po | 3 +++ site.conf | 29 +++++++++++++++-------------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/i18n/de.po b/i18n/de.po index 23e25b0..5b8f925 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -58,3 +58,6 @@ msgstr "Knoten für Dienste" msgid "gluon-luci-node-role:role:test" msgstr "Knoten für Tests" + +msgid "gluon-luci-node-role:role:hidden" +msgstr "Unsichtbarer Knoten" diff --git a/i18n/en.po b/i18n/en.po index 5468b18..f79c7b0 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -54,3 +54,6 @@ msgstr "Service Node" msgid "gluon-luci-node-role:role:test" msgstr "Test Node" + +msgid "gluon-luci-node-role:role:hidden" +msgstr "Hidden Node" diff --git a/site.conf b/site.conf index 5af61ec..952520e 100644 --- a/site.conf +++ b/site.conf @@ -23,24 +23,24 @@ ssid = '0a:00:ba:dc:ab:1e', bssid = '0a:00:ba:dc:ab:1e', mcast_rate = 12000 - }, + } }, wifi5 = { channel = 40, htmode = 'HT40+', - master = { + ap = { ssid = 'pinneberg.freifunk.net', }, ibss = { ssid = '0a:00:ba:dc:ab:1e', bssid = '0a:00:ba:dc:ab:1e', mcast_rate = 12000, - }, + } }, next_node = { ip4 = '10.137.0.1', ip6 = 'fde8:21c6:9d82::1', - mac = '16:41:95:40:f7:dc', + mac = '16:41:95:40:f7:dc' }, fastd_mesh_vpn = { methods = {'salsa2012+umac'}, @@ -78,15 +78,15 @@ 'ipv4 "gate05.hoogi.de" port 10000', 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' - }, - }, - }, - }, + } + } + } + } }, bandwidth_limit = { enabled = false, limit_ingress = 3000, - limit_egress = 200, + limit_egress = 200 } }, autoupdater = { @@ -101,7 +101,7 @@ '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - }, + } }, beta = { name = 'beta', @@ -113,7 +113,7 @@ '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - }, + } }, experimental = { name = 'experimental', @@ -125,9 +125,9 @@ '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - }, - }, - }, + } + } + } }, roles = { default = 'node', @@ -138,6 +138,7 @@ 'offloader', 'service', 'test', + 'hidden' }, }, } From f497c621086058c63b60a49f20a733639fd4c9af Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Fri, 3 Mar 2017 21:25:38 +0100 Subject: [PATCH 09/11] =?UTF-8?q?GLUON=5FREGION=20eingebaut=20f=C3=BCr=20E?= =?UTF-8?q?U-Ger=C3=A4te?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site.mk b/site.mk index ad39aea..a5b727a 100644 --- a/site.mk +++ b/site.mk @@ -103,11 +103,13 @@ GLUON_SITE_PACKAGES += \ $(USB_PACKAGES_STORAGE) endif -DEFAULT_GLUON_RELEASE := 0.8+exp$(shell date '+%Y%m%d') +DEFAULT_GLUON_RELEASE := 0.9+exp$(shell date '+%Y%m%d') # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_PRIORITY ?= 0 +GLUON_REGION ?= eu + GLUON_LANGS ?= en de From 62c0a512dc10fbf65004365ad5814b0722b31b54 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Sun, 23 Jul 2017 09:19:38 +0200 Subject: [PATCH 10/11] Tabs in Leerzeichen konvertiert --- site.conf | 284 +++++++++++++++++++++++++++--------------------------- site.mk | 126 ++++++++++++------------ 2 files changed, 205 insertions(+), 205 deletions(-) diff --git a/site.conf b/site.conf index 952520e..4a8a087 100644 --- a/site.conf +++ b/site.conf @@ -1,144 +1,144 @@ { - hostname_prefix = 'ffpi-', - site_name = 'Freifunk Pinneberg', - site_code = 'ffpi', - opkg = { - openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', - extra = { - modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S', - }, - }, - prefix4 = '10.137.0.0/16', - prefix6 = 'fde8:21c6:9d82::/64', - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - ntp_servers = {'1.ntp.services.ffpi'}, - regdom = 'DE', - wifi24 = { - channel = 9, - htmode = 'HT20', - ap = { - ssid = 'pinneberg.freifunk.net' - }, - ibss = { - ssid = '0a:00:ba:dc:ab:1e', - bssid = '0a:00:ba:dc:ab:1e', - mcast_rate = 12000 - } - }, - wifi5 = { - channel = 40, - htmode = 'HT40+', - ap = { - ssid = 'pinneberg.freifunk.net', - }, - ibss = { - ssid = '0a:00:ba:dc:ab:1e', - bssid = '0a:00:ba:dc:ab:1e', - mcast_rate = 12000, - } - }, - next_node = { - ip4 = '10.137.0.1', - ip6 = 'fde8:21c6:9d82::1', - mac = '16:41:95:40:f7:dc' - }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, - mtu = 1426, - groups = { - backbone = { - limit = 1, - peers = { - gate01 = { - key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', - remotes = { - 'ipv4 "gate01.hoogi.de" port 10000', - 'ipv4 "gate01.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate01.freifunk-pinneberg.de" port 10000' - }, - }, - gate03 = { - key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', - remotes = { - 'ipv4 "gate03.hoogi.de" port 10000', - 'ipv4 "gate03.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate03.freifunk-pinneberg.de" port 10000' - }, - }, - gate04 = { - key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', - remotes = { - 'ipv4 "gate04.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate04.freifunk-pinneberg.de" port 10000' - }, - }, - gate05 = { - key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', - remotes = { - 'ipv4 "gate05.hoogi.de" port 10000', - 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' - } - } - } - } - }, - bandwidth_limit = { - enabled = false, - limit_ingress = 3000, - limit_egress = 200 - } - }, - autoupdater = { - branch = 'experimental', - branches = { - stable = { - name = 'stable', - mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, - good_signatures = 3, - pubkeys = { - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - } - }, - beta = { - name = 'beta', - mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, - good_signatures = 2, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - } - }, - experimental = { - name = 'experimental', - mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, - good_signatures = 1, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - } - } - } - }, - roles = { - default = 'node', - list = { - 'node', - 'temp', - 'mobile', - 'offloader', - 'service', - 'test', - 'hidden' - }, - }, + hostname_prefix = 'ffpi-', + site_name = 'Freifunk Pinneberg', + site_code = 'ffpi', + opkg = { + openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', + extra = { + modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S', + }, + }, + prefix4 = '10.137.0.0/16', + prefix6 = 'fde8:21c6:9d82::/64', + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin + ntp_servers = {'1.ntp.services.ffpi'}, + regdom = 'DE', + wifi24 = { + channel = 9, + htmode = 'HT20', + ap = { + ssid = 'pinneberg.freifunk.net' + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000 + } + }, + wifi5 = { + channel = 40, + htmode = 'HT40+', + ap = { + ssid = 'pinneberg.freifunk.net', + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000, + } + }, + next_node = { + ip4 = '10.137.0.1', + ip6 = 'fde8:21c6:9d82::1', + mac = '16:41:95:40:f7:dc' + }, + fastd_mesh_vpn = { + methods = {'salsa2012+umac'}, + mtu = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gate01 = { + key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', + remotes = { + 'ipv4 "gate01.hoogi.de" port 10000', + 'ipv4 "gate01.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate01.freifunk-pinneberg.de" port 10000' + }, + }, + gate03 = { + key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', + remotes = { + 'ipv4 "gate03.hoogi.de" port 10000', + 'ipv4 "gate03.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate03.freifunk-pinneberg.de" port 10000' + }, + }, + gate04 = { + key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', + remotes = { + 'ipv4 "gate04.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate04.freifunk-pinneberg.de" port 10000' + }, + }, + gate05 = { + key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', + remotes = { + 'ipv4 "gate05.hoogi.de" port 10000', + 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' + } + } + } + } + }, + bandwidth_limit = { + enabled = false, + limit_ingress = 3000, + limit_egress = 200 + } + }, + autoupdater = { + branch = 'experimental', + branches = { + stable = { + name = 'stable', + mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, + good_signatures = 3, + pubkeys = { + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel + } + }, + beta = { + name = 'beta', + mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, + good_signatures = 2, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel + } + }, + experimental = { + name = 'experimental', + mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, + good_signatures = 1, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel + } + } + } + }, + roles = { + default = 'node', + list = { + 'node', + 'temp', + 'mobile', + 'offloader', + 'service', + 'test', + 'hidden' + }, + }, } diff --git a/site.mk b/site.mk index a5b727a..54333ac 100644 --- a/site.mk +++ b/site.mk @@ -1,76 +1,76 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ - gluon-alfred \ - gluon-respondd \ - gluon-autoupdater \ - gluon-config-mode-autoupdater \ - gluon-config-mode-contact-info \ - 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-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-portconfig \ - gluon-luci-wifi-config \ - gluon-luci-private-wifi \ - gluon-luci-node-role \ - gluon-next-node \ - gluon-mesh-vpn-fastd \ - gluon-radvd \ - gluon-setup-mode \ - gluon-status-page \ - iwinfo \ - iptables \ - haveged + gluon-mesh-batman-adv-15 \ + gluon-alfred \ + gluon-respondd \ + gluon-autoupdater \ + gluon-config-mode-autoupdater \ + gluon-config-mode-contact-info \ + 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-luci-admin \ + gluon-luci-autoupdater \ + gluon-luci-portconfig \ + gluon-luci-wifi-config \ + gluon-luci-private-wifi \ + gluon-luci-node-role \ + gluon-next-node \ + gluon-mesh-vpn-fastd \ + gluon-radvd \ + gluon-setup-mode \ + gluon-status-page \ + iwinfo \ + iptables \ + haveged # basic support for USB stack USB_PACKAGES_BASIC := \ - kmod-usb-core \ - kmod-usb2 + 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 + 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 + kmod-usb-acm \ + ugps # support for HID devices (keyboard, mouse, ...) USB_PACKAGES_HID := \ - kmod-usb-hid \ - kmod-hid-generic + kmod-usb-hid \ + kmod-hid-generic # storage support for USB devices USB_PACKAGES_STORAGE := \ - block-mount \ - blkid \ - kmod-fs-ext4 \ - kmod-fs-vfat \ - kmod-usb-storage \ - kmod-usb-storage-extras \ - 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 \ - swap-utils + block-mount \ + blkid \ + kmod-fs-ext4 \ + kmod-fs-vfat \ + kmod-usb-storage \ + kmod-usb-storage-extras \ + 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 \ + swap-utils # ar71xx-generic GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) @@ -90,17 +90,17 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) # x86-generic ifeq ($(GLUON_TARGET),x86-generic) GLUON_SITE_PACKAGES += \ - $(USB_PACKAGES_HID) \ - $(USB_PACKAGES_BASIC) \ - $(USB_PACKAGES_STORAGE) + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) endif # x86-64 ifeq ($(GLUON_TARGET),x86-64) GLUON_SITE_PACKAGES += \ - $(USB_PACKAGES_HID) \ - $(USB_PACKAGES_BASIC) \ - $(USB_PACKAGES_STORAGE) + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) endif DEFAULT_GLUON_RELEASE := 0.9+exp$(shell date '+%Y%m%d') From 1f3073a06a1c711df34f6069d8feee9d73fa499c Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Sun, 23 Jul 2017 10:16:38 +0200 Subject: [PATCH 11/11] =?UTF-8?q?Unterst=C3=BCtze=20Ger=C3=A4te=20mit=20at?= =?UTF-8?q?h10k=20Chipsatz=20durch=20Konfiguration=20von=20GLUON=5FATH10K?= =?UTF-8?q?=5FMESH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site.mk b/site.mk index 54333ac..c669d7b 100644 --- a/site.mk +++ b/site.mk @@ -112,4 +112,6 @@ GLUON_PRIORITY ?= 0 GLUON_REGION ?= eu +GLUON_ATH10K_MESH ?= ibss + GLUON_LANGS ?= en de