From 0c410b36988ed28da7ac22586b6a5b1ae854d486 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Wed, 31 Aug 2016 11:04:15 +0200 Subject: [PATCH] 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