From 2a9efe03eb7a7ebdbeaf754d90936319b575cdde Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Fri, 12 Jan 2018 22:56:54 +0100 Subject: [PATCH] =?UTF-8?q?0.8.4.1=20f=C3=BCr=20das=20veraltete=20ffhh=20N?= =?UTF-8?q?etz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + sites/ffhh-sued/modules | 5 -- sites/ffhh-sued/site.conf | 136 -------------------------------------- sites/ffhh-sued/site.mk | 40 ----------- sites/ffhh/modules | 4 +- sites/ffhh/site.mk | 3 +- 6 files changed, 6 insertions(+), 183 deletions(-) delete mode 100644 sites/ffhh-sued/modules delete mode 100644 sites/ffhh-sued/site.conf delete mode 100644 sites/ffhh-sued/site.mk diff --git a/README.md b/README.md index 342364e..c0e8baf 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu #### Gluon versions used for specific Hamburg Freifunk Firmware builds +- 0.8.4.1: v2016.2.7 new package: ssid-changer - 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4) - 0.8.3: v2016.2.6 (ffhh-sued only) - 0.8.2: v2016.2.5 diff --git a/sites/ffhh-sued/modules b/sites/ffhh-sued/modules deleted file mode 100644 index 6416262..0000000 --- a/sites/ffhh-sued/modules +++ /dev/null @@ -1,5 +0,0 @@ -GLUON_SITE_FEEDS='ffhh_packages' - -PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git -PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c - diff --git a/sites/ffhh-sued/site.conf b/sites/ffhh-sued/site.conf deleted file mode 100644 index f4a189e..0000000 --- a/sites/ffhh-sued/site.conf +++ /dev/null @@ -1,136 +0,0 @@ -{ - hostname_prefix = 'GibMirEinenNamen', - site_name = 'Freifunk Hamburg Sued', - site_code = 'ffhh-sued', - - opkg = { - openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages', - extra = { - modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S', - }, - }, - - prefix4 = '10.112.64.0/19', - prefix6 = '2a03:2267:1::/64', - - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'}, - regdom = 'DE', - - wifi24 = { - channel = 1, - - supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, - basic_rate = {6000, 9000, 18000, 36000, 54000}, - - ap = { - ssid = 'hamburg.freifunk.net', - }, - mesh = { - id = '6668682D73756564', - mcast_rate = 12000, - }, - }, - - wifi5 = { - channel = 44, - ap = { - ssid = 'hamburg.freifunk.net', - }, - mesh = { - id = '6668682D73756564', - mcast_rate = 12000, - }, - }, - - next_node = { - ip4 = '10.112.64.1', - ip6 = '2a03:2267:1::1', - - mac = '16:41:95:40:f7:dc', - }, - - fastd_mesh_vpn = { - enabled = true, - methods = {'salsa2012+umac'}, - mtu = 1312, - groups = { - backbone = { - limit = 1, - peers = { - gateway01 = { - key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58', - remotes = {'"gw01-new.hamburg.freifunk.net" port 10003'}, - }, - gateway02 = { - key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', - remotes = {'"gw02-new.hamburg.freifunk.net" port 10003'}, - }, - gateway03 = { - key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546', - remotes = {'"gw03-new.hamburg.freifunk.net" port 10003'}, - }, - gateway04 = { - key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf', - remotes = {'"gw04-new.hamburg.freifunk.net" port 10004'}, - }, - gateway05 = { - key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5', - remotes = {'"gw05-new.hamburg.freifunk.net" port 10004'}, - }, - gateway06 = { - key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6', - remotes = {'"gw06-new.hamburg.freifunk.net" port 10004'}, - }, - }, - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 8096, - egress = 1024, - }, - }, - - autoupdater = { - branch = 'experimental', - branches = { - stable = { - name = 'stable', - mirrors = {'http://1.updates.services.ffhh/ffhh-sued/stable/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/stable/sysupgrade'}, - good_signatures = 2, - pubkeys = { - '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo - 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo - '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre - '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot - 'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern - 'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel - }, - }, - beta = { - name = 'beta', - mirrors = {'http://1.updates.services.ffhh/ffhh-sued/beta/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/beta/sysupgrade'}, - good_signatures = 2, - pubkeys = { - '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo - 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo - '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre - '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot - 'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern - 'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel - }, - }, - experimental = { - name = 'experimental', - mirrors = {'http://1.updates.services.ffhh/ffhh-sued/experimental/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/experimental/sysupgrade'}, - good_signatures = 1, - pubkeys = { - '1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder - }, - }, - }, - }, - - poe_passthrough = false, -} diff --git a/sites/ffhh-sued/site.mk b/sites/ffhh-sued/site.mk deleted file mode 100644 index 203f8a2..0000000 --- a/sites/ffhh-sued/site.mk +++ /dev/null @@ -1,40 +0,0 @@ -GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ - gluon-autoupdater \ - gluon-config-mode-autoupdater \ - gluon-config-mode-core \ - gluon-config-mode-hostname \ - gluon-config-mode-mesh-vpn \ - gluon-config-mode-reboot-ffhh \ - gluon-ebtables-filter-multicast \ - gluon-ebtables-filter-ra-dhcp \ - gluon-ebtables-segment-mld \ - gluon-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-portconfig \ - gluon-luci-private-wifi \ - gluon-luci-wifi-config \ - gluon-next-node \ - gluon-mesh-vpn-fastd \ - gluon-radvd \ - gluon-respondd \ - gluon-setup-mode \ - gluon-status-page \ - iwinfo \ - iptables \ - haveged - - -DEFAULT_GLUON_RELEASE := 0.8.4 - -# Allow overriding the release number from the command line -GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) - -GLUON_PRIORITY ?= 0 - -# Region code required for some images; supported values: us eu -GLUON_REGION ?= eu - -GLUON_ATH10K_MESH ?= 11s - -GLUON_LANGS ?= en de diff --git a/sites/ffhh/modules b/sites/ffhh/modules index 6416262..b00c4f5 100644 --- a/sites/ffhh/modules +++ b/sites/ffhh/modules @@ -1,5 +1,7 @@ -GLUON_SITE_FEEDS='ffhh_packages' +GLUON_SITE_FEEDS='ffhh_packages eulenfunk' PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c +PACKAGES_EULENFUNK_REPO=https://github.com/eulenfunk/packages.git +PACKAGES_EULENFUNK_COMMIT=1951b97db14ca7b098db76cd6c64363a14de3903 diff --git a/sites/ffhh/site.mk b/sites/ffhh/site.mk index 1607319..c95cc5c 100644 --- a/sites/ffhh/site.mk +++ b/sites/ffhh/site.mk @@ -20,13 +20,14 @@ GLUON_SITE_PACKAGES := \ gluon-radvd \ gluon-respondd \ gluon-setup-mode \ + gluon-ssid-changer \ gluon-status-page \ iwinfo \ iptables \ haveged -DEFAULT_GLUON_RELEASE := 0.8.4 +DEFAULT_GLUON_RELEASE := 0.8.4.1 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)