aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--site.conf302
-rw-r--r--site.mk215
2 files changed, 2 insertions, 515 deletions
diff --git a/site.conf b/site.conf
index cd1b9ac..8390221 100644
--- a/site.conf
+++ b/site.conf
@@ -1,301 +1 @@
-{
- hostname_prefix = 'Gib mir einen Namen ',
- site_name = 'Freifunk Kiel',
- site_code = 'ffki',
-
- -- Must be the same of all nodes in one mesh domain
- site_seed = 'd6c58c17e655c52c12e9d8ad1b546a264124dd33dd8a00a39ee528778c2b1c47',
-
- opkg = {
- lede = 'http://opkg.services.ffki/%n/%v/%S/packages',
- extra = {
- gluon = 'http://opkg.services.ffki/modules/gluon-%GS-%GR/%S',
- },
- },
-
- prefix4 = '10.116.128.0/17',
- prefix6 = 'fda1:384a:74de:4242::/64',
-
- -- alt-esc example:
- -- extra_prefixes6 = {
- -- '2001:db8:9::/64',
- -- '2001:db8:100::/60',
- -- },
-
- timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
- ntp_servers = {'1.ntp.services.ffki'},
-
- -- Wireless regulatory domain of your community.
- regdom = 'DE',
-
- config_mode = {
- -- Show/hide the altitude field
- geo_location = {
- show_altitude = true,
- },
- -- define if the contact field is obligatory (optional)
- -- disabled in 2017.1.8
- -- owner = {
- -- obligatory = true
- -- },
- },
-
- ddhcpd = {
- range = "10.116.220.0/22",
- broadcast = "10.116.255.255"
- },
-
- -- Wireless configuration for 2.4 GHz interfaces.
- wifi24 = {
- channel = 11,
-
- -- List of supported wifi rates (optional)
- -- without 802.11b compatibility for better performance
- supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-
- -- List of basic wifi rates (optional, required if supported_rates is set)
- -- without 802.11b compatibility for better performance
- basic_rate = {6000, 9000, 18000, 36000, 54000},
-
- -- ESSID used for client network.
- ap = {
- ssid = 'http://kiel.freifunk.net/',
- -- disabled = true, (optional)
- },
- mesh = {
- id = '16:ca:ff:ee:ba:be',
- mcast_rate = 12000,
- disabled = false,
- },
- },
-
- -- Wireless configuration for 5 GHz interfaces.
- -- This should be equal to the 2.4 GHz variant, except
- -- for channel.
- wifi5 = {
- channel = 44,
- ap = {
- ssid = 'http://kiel.freifunk.net/',
- },
- mesh = {
- id = '16:ca:ff:ee:ba:be',
- mcast_rate = 12000,
- disabled = false,
- },
- },
-
- dns = {
- cacheentries = 5000,
- servers = {
- 'fda1:384a:74de:4242::ff00',
- 'fda1:384a:74de:4242::ff01',
- 'fda1:384a:74de:4242::ff02',
- 'fda1:384a:74de:4242::ff03',
- 'fda1:384a:74de:4242::ff04',
- 'fda1:384a:74de:4242::ff05',
- 'fda1:384a:74de:4242::ff06',
- 'fda1:384a:74de:4242::ff07',
- 'fda1:384a:74de:4242::ff08',
- },
- },
-
- -- The next node feature allows clients to always reach the node it is
- -- connected to using a known IP address.
- next_node = {
- name = 'node.ffki',
- -- anycast IPs of all nodes
- ip4 = '10.116.254.254',
- ip6 = 'fda1:384a:74de:4242::ffff',
-
- -- anycast MAC of all nodes
- mac = '36:f4:54:fc:e5:11'
- },
-
- mesh_vpn = {
- enabled = true,
- mtu = 1280,
-
- fastd = {
- methods = {'salsa2012+umac'},
- -- configurable = true,
- -- syslog_level = 'warn',
- groups = {
- backbone = {
- -- Limit number of connected peers to reduce bandwidth.
- limit = 1,
- peers = {
- ffki_vpn0 = {
- key = '7a01772ff2351ce7ad3e305da58ba96178997cadb23fcd8c527e88b2fb677528',
- remotes = {
- 'ipv6 "vpn0.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn0.freifunk.in-kiel.de" port 11235'
- },
- },
- ffki_vpn1 = {
- key = '65db8bff947e7c02ef7e152e73fb17c39ee9cfea91d047cb7a063ecb1eb7dd88',
- remotes = {
- 'ipv6 "vpn1.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn1.freifunk.in-kiel.de" port 11235'
- },
- },
- ffki_vpn2 = {
- key = 'fa400de81fc9f53127a4e60980c9756af372161c01ecbc7574fe115cf6434821',
- remotes = {
- 'ipv6 "vpn2.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn2.freifunk.in-kiel.de" port 11235'
- },
- },
- ffki_vpn3 = {
- key = 'd93050db0bf01b37ea9fda6d0977c07dcac598d244f8f7ceff8dc903b28c6462',
- remotes = {
- 'ipv6 "vpn3.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn3.freifunk.in-kiel.de" port 11235'
- },
- },
- ffki_vpn4 = {
- key = 'ad853e5848ad5c2a149a93f156215e4b6eafed3ef16f7b70b80f33677bda8aa0',
- remotes = {
- 'ipv6 "vpn4.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn4.freifunk.in-kiel.de" port 11235'
- },
- },
- ffki_vpn5 = {
- key = '692f620fbc01c3dd69d3126c76a258854bd2de6ea6a9f6889620c78f98065c8c',
- remotes = {
- 'ipv6 "vpn5.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn5.freifunk.in-kiel.de" port 11235'
- },
- },
- ffki_vpn6 = {
- key = '53a1b531ec6a94337601e8ac5345670bc82fac156200e313dda90ca50255d018',
- remotes = {
- 'ipv6 "vpn6.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn6.freifunk.in-kiel.de" port 11235'
- },
- },
- ffki_vpn7 = {
- key = '3845a2d0559776beb27be2044e4d9a9913a7743f9b0e1dcd3ebacf50545342ec',
- remotes = {
- 'ipv6 "vpn7.freifunk.toppoint.de" port 11235',
- 'ipv4 "vpn7.freifunk.toppoint.de" port 11235'
- },
- },
- ffki_vpn8 = {
- key = 'd36c8a48f279bdcc0b8de66c232989f12faaf4bf490ba6bba6bd01526083601e',
- remotes = {
- 'ipv6 "vpn8.ffki.de" port 11235',
- 'ipv4 "vpn8.ffki.de" port 11235'
- },
- },
- },
- },
- },
- },
- bandwidth_limit = {
- enabled = false,
- egress = 2000,
- ingress = 4000,
- },
- },
-
- autoupdater = {
- -- Default branch. Don't forget to set GLUON_BRANCH when building!
- branch = 'stable',
-
- branches = {
- -- stable releases are only rolled out selectively after a lot of testing in the rc branch
- stable = {
- name = 'stable',
- mirrors = {
- -- List of mirrors to fetch images from. IPv6 required!
- 'http://[fda1:384a:74de:4242::fd00]/firmware/stable/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff00]/firmware/stable/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff01]/firmware/stable/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff02]/firmware/stable/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff03]/firmware/stable/sysupgrade/',
- 'http://0.updates.services.ffki/firmware/stable/sysupgrade/',
- 'http://1.updates.services.ffki/firmware/stable/sysupgrade/',
- },
- good_signatures = 3,
- pubkeys = {
- 'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
- '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
- '589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
- '9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
- '359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- Sven (FL)
- '622e6eccd148c4d4a53ee367dd1d73740da6795fe8dc2df1ff022bf1b4344714', -- eNBeWe
- 'a15a8f462b5d11982e2b5d36c1788ec48e328d54a736c217aa820b61faa0ad55', -- tSYS
- },
- },
-
- -- nightly builds are rolled out automatically whenever a commit is pushed into the nightly branch
- nightly = {
- name = 'nightly',
- mirrors = {
- 'http://[fda1:384a:74de:4242::fd00]/firmware/nightly/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff00]/firmware/nightly/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff01]/firmware/nightly/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff02]/firmware/nightly/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff03]/firmware/nightly/sysupgrade/',
- 'http://0.updates.services.ffki/firmware/nightly/sysupgrade/',
- 'http://1.updates.services.ffki/firmware/nightly/sysupgrade/',
- },
- good_signatures = 1,
- pubkeys = {
- 'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
- '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
- '589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
- '9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
- '359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- Sven (FL)
- '622e6eccd148c4d4a53ee367dd1d73740da6795fe8dc2df1ff022bf1b4344714', -- eNBeWe
- 'a15a8f462b5d11982e2b5d36c1788ec48e328d54a736c217aa820b61faa0ad55', -- tSYS
- '1c24d4b41680f16cda0c19ad53de84ef1be3a86870e6fec6454833a6a46f7122', -- Buildbot Um, AutoDeploy
- 'cb0141d79e131854eb05d6c9ce5cc237baa462e288b7fcb0eadbd92da8f34b3f', -- Buildbot Dois, AutoDeploy
- },
- },
-
- -- release candidate for the next stable
- -- this contains only tested versions and is not rolled out automatically
- rc = {
- name = 'stable',
- mirrors = {
- 'http://[fda1:384a:74de:4242::fd00]/firmware/release-candidate/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff00]/firmware/release-candidate/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff01]/firmware/release-candidate/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff02]/firmware/release-candidate/sysupgrade/',
- 'http://[fda1:384a:74de:4242::ff03]/firmware/release-candidate/sysupgrade/',
- 'http://0.updates.services.ffki/firmware/release-candidate/sysupgrade/',
- 'http://1.updates.services.ffki/firmware/release-candidate/sysupgrade/',
- },
- good_signatures = 2,
- pubkeys = {
- 'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
- '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
- '589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
- '9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
- '359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- Sven (FL)
- '622e6eccd148c4d4a53ee367dd1d73740da6795fe8dc2df1ff022bf1b4344714', -- eNBeWe
- 'a15a8f462b5d11982e2b5d36c1788ec48e328d54a736c217aa820b61faa0ad55', -- tSYS
- '1c24d4b41680f16cda0c19ad53de84ef1be3a86870e6fec6454833a6a46f7122', -- Buildbot Um, AutoDeploy
- 'cb0141d79e131854eb05d6c9ce5cc237baa462e288b7fcb0eadbd92da8f34b3f', -- Buildbot Dois, AutoDeploy
- },
- },
- },
- },
-
- ssid_changer = {
- enabled = true,
- switch_timeframe = 60, -- only once every timeframe (in minutes) the SSID will change to OFFLINE
- -- set to 1440 to change once a day
- -- set to 1 minute to change every time the router gets offline
- first = 5, -- the first few minutes directly after reboot within which an Offline-SSID always may be activated
- prefix = 'FF_Offline_', -- use something short to leave space for the nodename (no '~' allowed!)
- suffix = 'nodename', -- generate the SSID with either 'nodename', 'mac' or to use only the prefix: 'none'
-
- tq_limit_enabled = false, -- if false, the offline SSID will only be set if there is no gateway reacheable
- -- upper and lower limit to turn the offline_ssid on and off
- -- in-between these two values the SSID will never be changed to prevent it from toggeling every minute.
- tq_limit_max = 45, -- upper limit, above that the online SSID will be used
- tq_limit_min = 35 -- lower limit, below that the offline SSID will be used
- },
-}
+master wird nicht mehr benutzt, rc ist der neue default branch
diff --git a/site.mk b/site.mk
index 8122d7e..8390221 100644
--- a/site.mk
+++ b/site.mk
@@ -1,214 +1 @@
-GLUON_SITE_PACKAGES := \
- gluon-mesh-batman-adv-14 \
- gluon-core \
- gluon-respondd \
- gluon-autoupdater \
- gluon-setup-mode \
- gluon-config-mode-contact-info \
- gluon-config-mode-core \
- gluon-config-mode-autoupdater \
- gluon-config-mode-mesh-vpn \
- gluon-config-mode-geo-location \
- gluon-ebtables-filter-multicast \
- gluon-ebtables-filter-ra-dhcp \
- gluon-web-admin \
- gluon-web-autoupdater \
- gluon-web-network \
- gluon-web-private-wifi \
- gluon-web-wifi-config \
- gluon-mesh-vpn-fastd \
- gluon-radvd \
- gluon-status-page \
- iwinfo \
- iptables \
- haveged
-# from sargon:
-GLUON_SITE_PACKAGES += \
- roamguide \
- ddhcpd
-
-# from https://github.com/Freifunk-Nord/eulenfunk-packages
-GLUON_SITE_PACKAGES += \
- gluon-quickfix
-
-# from https://github.com/Freifunk-Nord/gluon-ssid-changer:
-GLUON_SITE_PACKAGES += \
- gluon-ssid-changer
-
-# from ffki-packages:
-GLUON_SITE_PACKAGES += \
- gluon-config-mode-ppa \
- gluon-config-mode-hostname-no-pretty
-# gluon-config-mode-contact-info-anonymous-hint
-
-# from ffm-packages
-#GLUON_SITE_PACKAGES += \
-# ffffm-button-bind
-# better at the bottom for only some models
-
-# from T-X alt-esc package:
-GLUON_SITE_PACKAGES += \
- gluon-alt-esc-client \
- gluon-alt-esc-provider
-
-# Always call `make` from the command line with the desired release version!
-# otherwise this is generated:
-#DEFAULT_GLUON_RELEASE := 2017.1.8
-DEFAULT_GLUON_RELEASE := 2017.1.8~exp$(shell date '+%y%m%d')
-
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-GLUON_PRIORITY ?= 0
-GLUON_BRANCH ?= stable
-export GLUON_BRANCH
-
-GLUON_TARGET ?= ar71xx-generic
-export GLUON_TARGET
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-# enable generation of images for ath10k devices with 802.11s mode
-GLUON_ATH10K_MESH ?= 11s
-
-GLUON_LANGS ?= en de
-
-# basic support the 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
-
-# support for USB tethering
-USB_PACKAGES_TETHERING := \
- kmod-usb-net \
- kmod-usb-net-asix \
- kmod-usb-net-dm9601-ether
-
-USB_X86_GENERIC_NETWORK_MODULES := \
- kmod-usb-ohci-pci \
- kmod-sky2 \
- kmod-atl2 \
- kmod-igb \
- kmod-3c59x \
- kmod-e100 \
- kmod-e1000 \
- kmod-e1000e \
- kmod-natsemi \
- kmod-ne2k-pci \
- kmod-pcnet32 \
- kmod-8139too \
- kmod-r8169 \
- kmod-sis900 \
- kmod-tg3 \
- kmod-via-rhine \
- kmod-via-velocity \
- kmod-forcedeth
-
-# storage support for USB
-USB_PACKAGES_STORAGE := \
- block-mount \
- kmod-fs-ext4 \
- kmod-fs-vfat \
- kmod-usb-storage \
- kmod-usb-storage-extras \
- blkid \
- swap-utils \
- 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
-# from ffki-packages:
-USB_PACKAGES_STORAGE += \
- gluon-usb-media \
- gluon-config-mode-usb-media
-
-# add addition network drivers and usb stuff only to targes where disk space does not matter
-ifeq ($(GLUON_TARGET),x86-generic)
- # support the USB stack on x86 devices
- # and add a few common USB NICs
- GLUON_SITE_PACKAGES += \
- $(USB_PACKAGES_STORAGE) \
- $(USB_PACKAGES_HID) \
- $(USB_PACKAGES_TETHERING) \
- $(USB_PACKAGES_3G) \
- $(USB_PACKAGES_GPS) \
- $(USB_X86_GENERIC_NETWORK_MODULES)
-endif
-
-# use the target names of https://github.com/freifunk-gluon/gluon/blob/master/targets/ar71xx-generic#L163
-ifeq ($(GLUON_TARGET),ar71xx-generic)
- GLUON_tp-link-tl-wr842n-nd-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-tl-wr842n-nd-v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-tl-wr842n-nd-v3_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-tl-wr1043n-nd-v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-tl-wr1043n-nd-v3_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-tl-wr1043n-nd-v4_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-tl-wdr4300-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-tl-wr2543n-nd-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_linksys-wrt160nl_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_d-link-dir-825-rev-b1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_d-link-dir-505-rev-a1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_d-link-dir-505-rev-a2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_gl-inet-6408a-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_gl-inet-6416a-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_netgear-wndr3700_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_netgear-wndr3700v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_netgear-wndr3700v4_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_buffalo-wzr-hp-g450h_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_buffalo-wzr-hp-g300nh_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
- GLUON_tp-link-archer-c7-v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
-endif
-
-ifeq ($(GLUON_TARGET),mpc85xx-generic)
- GLUON_tp-link-tl-wdr4900-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
-endif
-
-# from ffm-packages
-ifeq ($(GLUON_TARGET),ar71xx-tiny)
- GLUON_tp-link-tl-wr841n-nd-v5_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr841n-nd-v7_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr841n-nd-v8_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr841n-nd-v9_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr841n-nd-v10_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr841n-nd-v11_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr841n-nd-v12_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr841n-nd-v13_SITE_PACKAGES += ffffm-button-bind
-endif
-ifeq ($(GLUON_TARGET),ar71xx-generic)
- GLUON_tp-link-tl-wr1043n-nd-v2_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr1043n-nd-v3_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr1043n-nd-v4_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr1043n-v5_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr842n-nd-v1_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr842n-nd-v2_SITE_PACKAGES += ffffm-button-bind
- GLUON_tp-link-tl-wr842n-nd-v3_SITE_PACKAGES += ffffm-button-bind
-endif
+master wird nicht mehr benutzt, rc ist der neue default branch