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