From a8a7797831c1e124974f289fe1c4e774d207e659 Mon Sep 17 00:00:00 2001 From: bdobe Date: Fri, 15 Sep 2017 21:56:46 +0200 Subject: [PATCH] Add site ffhh-sued config --- sites/ffhh-sued/modules | 5 ++ sites/ffhh-sued/site.conf | 134 ++++++++++++++++++++++++++++++++++++++ sites/ffhh-sued/site.mk | 40 ++++++++++++ 3 files changed, 179 insertions(+) create mode 100644 sites/ffhh-sued/modules create mode 100644 sites/ffhh-sued/site.conf create mode 100644 sites/ffhh-sued/site.mk diff --git a/sites/ffhh-sued/modules b/sites/ffhh-sued/modules new file mode 100644 index 0000000..6416262 --- /dev/null +++ b/sites/ffhh-sued/modules @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000..42f6c0d --- /dev/null +++ b/sites/ffhh-sued/site.conf @@ -0,0 +1,134 @@ +{ + 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/%GR/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 + }, + }, + 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 + }, + }, + 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 new file mode 100644 index 0000000..3a57deb --- /dev/null +++ b/sites/ffhh-sued/site.mk @@ -0,0 +1,40 @@ +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.3 + +# 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