From f85c8f579559fb53961b32891ac8df58c9740123 Mon Sep 17 00:00:00 2001 From: Cyrus Fox Date: Sun, 11 Feb 2018 14:36:00 +0100 Subject: [PATCH] v1.5.6 (Gluon 2017.1.5) -------------------------------- - Update config to new Gluon release - Set autoreboot to weekly interval --- Changelog.md | 7 ++++ i18n/de.po | 34 +++++++++++++++ i18n/en.po | 30 ++++++++++++++ modules | 11 +++++ site.conf | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++ site.mk | 84 +++++++++++++++++++++++++++++++++++++ 6 files changed, 281 insertions(+) create mode 100644 Changelog.md create mode 100644 i18n/de.po create mode 100644 i18n/en.po create mode 100644 modules create mode 100644 site.conf create mode 100644 site.mk diff --git a/Changelog.md b/Changelog.md new file mode 100644 index 0000000..ed70166 --- /dev/null +++ b/Changelog.md @@ -0,0 +1,7 @@ +Changelog for Freifunk Düsseldorf gluon firmware + +v1.5.6 (Gluon 2017.1.5) +-------------------------------- +- Update config to new Gluon release +- Set autoreboot to weekly interval + diff --git a/i18n/de.po b/i18n/de.po new file mode 100644 index 0000000..bac376e --- /dev/null +++ b/i18n/de.po @@ -0,0 +1,34 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: PACKAGE VERSION\n" +"PO-Revision-Date: 2015-05-17 21:50+0100\n" +"Last-Translator: Linus Broich \n" +"Language-Team: German\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "gluon-config-mode:welcome" +msgstr "" +"Willkommen zum Einrichtungsassistenten für deinen neuen Freifunk Düsseldorf" +"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." +"Der Schlüssel wird nicht mehr für die Registrierung verwendet." +"Du kannst nach dem Neustart direkt loslegen. Vergiss nicht" +"den WAN-Port zu verwenden um den Freifunk-Knoten an deinem" +"Internetanschluss anzuschließen." + +msgid "gluon-config-mode:reboot" +msgstr "" +"

Dein Knoten startet gerade neu und wird anschließend versuchen," +"sich mit anderen Freifunkknoten in seiner Nähe zu" +"verbinden. Weitere Informationen zu" +"Freifunk Düsseldorf findest du auf" +"unserem Forum.

" +"

Viel Spaß bei der Erkundung von Freifunk!

" diff --git a/i18n/en.po b/i18n/en.po new file mode 100644 index 0000000..6cd311d --- /dev/null +++ b/i18n/en.po @@ -0,0 +1,30 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: PACKAGE VERSION\n" +"PO-Revision-Date: 2015-05-17 21:50+0100\n" +"Last-Translator: Linus Broich \n" +"Language-Team: English\n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "gluon-config-mode:welcome" +msgstr "" +"Welcome the the setup wizard of your new Freifunk Düsseldorf node. " +"Please fill out the following form and transmit it." + +msgid "gluon-config-mode:pubkey" +msgstr "" +"This is your Freifunk node's public key. Freifunk Düsseldorf" +"doesn't require any registration for the VPN access." +"The node will automatically connect after reboot." + +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 about Freifunk Düsseldorf on " +"our forums.

" +"

Have fun with your node and exploring the Freifunk network!

" diff --git a/modules b/modules new file mode 100644 index 0000000..335b5fa --- /dev/null +++ b/modules @@ -0,0 +1,11 @@ +GLUON_SITE_FEEDS='ffrl_packages ffddorf' + +#FFRL Packages +PACKAGES_FFRL_PACKAGES_REPO=https://github.com/ffrl/ffrl-packages.git +PACKAGES_FFRL_PACKAGES_COMMIT=464fa9c1f3190a7e6d82dba1adac1d5e9f8d1835 +PACKAGES_FFRL_PACKAGES_BRANCH=Branch_v2017.x + +#FFDORF Packages +PACKAGES_FFDDORF_REPO=https://github.com/ffddorf/ddorf-packages.git +PACKAGES_FFDDORF_COMMIT=92e2efaf21c80488051a00ca913205944f143379 +PACKAGES_FFDDORF_BRANCH=v2017.x diff --git a/site.conf b/site.conf new file mode 100644 index 0000000..526a4de --- /dev/null +++ b/site.conf @@ -0,0 +1,115 @@ +{ + hostname_prefix = 'ff-ddorf', + site_name = 'Freifunk Duesseldorf', + site_code = 'ddorf', + prefix4 = '10.25.0.0/16', + prefix6 = 'fd00:ffdd::/64', + extra_prefixes6 = {'2a03:2260:3004::/48','2a03:2260:3015::/48'}, + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', + ntp_servers = { + '2.pool.ntp.org', + }, + opkg = { + extra = { + modules = 'http://images.freifunk-duesseldorf.de/modules/gluon-%GS-%GR/%S', + }, + }, + regdom = 'DE', + + wifi24 = { + channel = 11, + supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, + basic_rate = {6000, 12000, 24000}, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'mesh-ddorf', + mcast_rate = 12000, + disabled = false, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'mesh-ddorf5', + mcast_rate = 12000, + disabled = false, + }, + }, + next_node = { + ip6 = 'fd00:ffdd::ffff', + mac = '16:41:95:40:f7:dc', + }, + mesh_vpn = { + enabled = true, + mtu = 1364, + tunneldigger = { + brokers = {'vpn01.freifunk-duesseldorf.de:10050','vpn02.freifunk-duesseldorf.de:10050'}, + }, + bandwidth_limit = { + enabled = false, + ingress = 3000, + egress = 200, + }, + }, + autoupdater = { + enabled = 1, + branch = 'beta', + branches = { + stable = { + name = 'stable', + mirrors = { + 'http://1.updates.freifunk-duesseldorf.de/stable/sysupgrade', + 'http://2.updates.freifunk-duesseldorf.de/stable/sysupgrade', + }, + probability = 0.08, + good_signatures = 2, + pubkeys = { + 'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf) + 'c1eb8c55dd21bc4882a67b2b1f3cb50c572288acc35e52b393212ebf2b40180b', -- nomaster (Freifunk Düsseldorf) + '39ab593be8ca0502138276a48a7c643e771736ad16d1891e76e4cd78160183f8', -- mraerino (Freifunk Düsseldorf) + '48fa47fffc4443820c8c1894b62cfff995524bd0fc9eab6a6ec2f591e4dcb268', -- Jenkins CI (Freifunk Düsseldorf, managed by CyrusFox) + }, + }, + beta = { + name = 'beta', + mirrors = { + 'http://1.updates.freifunk-duesseldorf.de/beta/sysupgrade', + 'http://2.updates.freifunk-duesseldorf.de/beta/sysupgrade', + }, + probability = 0.08, + good_signatures = 1, + pubkeys = { + 'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf) + 'c1eb8c55dd21bc4882a67b2b1f3cb50c572288acc35e52b393212ebf2b40180b', -- nomaster (Freifunk Düsseldorf) + '39ab593be8ca0502138276a48a7c643e771736ad16d1891e76e4cd78160183f8', -- mraerino (Freifunk Düsseldorf) + '48fa47fffc4443820c8c1894b62cfff995524bd0fc9eab6a6ec2f591e4dcb268', -- Jenkins CI (Freifunk Düsseldorf, managed by CyrusFox) + }, + }, + experimental = { + name = 'experimental', + mirrors = { + 'http://1.updates.freifunk-duesseldorf.de/experimental/sysupgrade', + 'http://2.updates.freifunk-duesseldorf.de/experimental/sysupgrade', + }, + probability = 0.08, + good_signatures = 1, + pubkeys = { + 'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf) + 'c1eb8c55dd21bc4882a67b2b1f3cb50c572288acc35e52b393212ebf2b40180b', -- nomaster (Freifunk Düsseldorf) + '39ab593be8ca0502138276a48a7c643e771736ad16d1891e76e4cd78160183f8', -- mraerino (Freifunk Düsseldorf) + '48fa47fffc4443820c8c1894b62cfff995524bd0fc9eab6a6ec2f591e4dcb268', -- Jenkins CI (Freifunk Düsseldorf, managed by CyrusFox) + }, + }, + }, + }, + autorestart = { + interval = 'weekly', + starthour = 5, + endhour = 6, + }, +} diff --git a/site.mk b/site.mk new file mode 100644 index 0000000..4966137 --- /dev/null +++ b/site.mk @@ -0,0 +1,84 @@ +GLUON_SITE_PACKAGES := \ + gluon-mesh-batman-adv-15 \ + gluon-alfred \ + gluon-respondd \ + gluon-autorestart \ + 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-ebtables-source-filter \ + gluon-web-admin \ + gluon-web-autoupdater \ + gluon-web-wifi-config \ + gluon-web-private-wifi \ + gluon-web-network \ + gluon-mesh-vpn-tunneldigger \ + gluon-tunneldigger-watchdog \ + gluon-radvd \ + gluon-setup-mode \ + gluon-status-page \ + iwinfo \ + haveged + +USB_BASIC := \ + kmod-usb-core \ + kmod-usb2 \ + kmod-usb-hid + +USB_NIC := \ + kmod-usb-net \ + kmod-usb-net-asix \ + kmod-usb-net-rtl8150 \ + kmod-usb-net-rtl8152 \ + kmod-usb-net-dm9601-ether + +USB_WIFI := \ + kmod-rtl8192cu + +ifeq ($(GLUON_TARGET),x86-generic) + GLUON_SITE_PACKAGES += \ + $(USB_BASIC) \ + kmod-usb-ohci-pci \ + $(USB_NIC) +endif + +ifeq ($(GLUON_TARGET),x86-64) + GLUON_SITE_PACKAGES += \ + $(USB_BASIC) \ + $(USB_NIC) \ + kmod-igb #APU2 +endif + +ifeq ($(GLUON_TARGET),brcm2708-bcm2708) + GLUON_SITE_PACKAGES += \ + $(USB_BASIC) \ + $(USB_NIC) \ + $(USB_WIFI) +endif + +ifeq ($(GLUON_TARGET),brcm2708-bcm2709) + GLUON_SITE_PACKAGES += \ + $(USB_BASIC) \ + $(USB_NIC) \ + $(USB_WIFI) +endif + +DEFAULT_GLUON_RELEASE := v1.5.X-exp-$(shell date '+%Y%m%d') + +# Allow overriding the release number from the command line +GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) + +# Default priority for updates. +GLUON_PRIORITY ?= 0 + +GLUON_LANGS ?= en de + +GLUON_ATH10K_MESH ?= 11s + +GLUON_REGION := eu