thooge
/
ffpi-site
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tabs in Leerzeichen konvertiert

master
Thomas Hooge 2017-07-23 09:26:00 +02:00
parent 66523e673d
commit 1abd153327
2 changed files with 204 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

282
site.conf
View File

@ -1,143 +1,143 @@
{ {
hostname_prefix = 'ffpi-', hostname_prefix = 'ffpi-',
site_name = 'Freifunk Pinneberg', site_name = 'Freifunk Pinneberg',
site_code = 'ffpi', site_code = 'ffpi',
opkg = { opkg = {
openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages',
extra = { extra = {
modules = 'http://1.download.services.ffpi/stable/modules/gluon-%GS-%GR/%S', modules = 'http://1.download.services.ffpi/stable/modules/gluon-%GS-%GR/%S',
}, },
}, },
prefix4 = '10.137.0.0/16', prefix4 = '10.137.0.0/16',
prefix6 = 'fde8:21c6:9d82::/64', prefix6 = 'fde8:21c6:9d82::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {'1.ntp.services.ffpi'}, ntp_servers = {'1.ntp.services.ffpi'},
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
channel = 9, channel = 9,
htmode = 'HT20', htmode = 'HT20',
ap = { ap = {
ssid = 'pinneberg.freifunk.net' ssid = 'pinneberg.freifunk.net'
}, },
ibss = { ibss = {
ssid = '0a:00:ba:dc:ab:1e', ssid = '0a:00:ba:dc:ab:1e',
bssid = '0a:00:ba:dc:ab:1e', bssid = '0a:00:ba:dc:ab:1e',
mcast_rate = 12000 mcast_rate = 12000
}, },
}, },
wifi5 = { wifi5 = {
channel = 40, channel = 40,
htmode = 'HT40+', htmode = 'HT40+',
master = { master = {
ssid = 'pinneberg.freifunk.net', ssid = 'pinneberg.freifunk.net',
}, },
ibss = { ibss = {
ssid = '0a:00:ba:dc:ab:1e', ssid = '0a:00:ba:dc:ab:1e',
bssid = '0a:00:ba:dc:ab:1e', bssid = '0a:00:ba:dc:ab:1e',
mcast_rate = 12000, mcast_rate = 12000,
}, },
}, },
next_node = { next_node = {
ip4 = '10.137.0.1', ip4 = '10.137.0.1',
ip6 = 'fde8:21c6:9d82::1', ip6 = 'fde8:21c6:9d82::1',
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
fastd_mesh_vpn = { fastd_mesh_vpn = {
methods = {'salsa2012+umac'}, methods = {'salsa2012+umac'},
mtu = 1426, mtu = 1426,
groups = { groups = {
backbone = { backbone = {
limit = 1, limit = 1,
peers = { peers = {
gate01 = { gate01 = {
key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d',
remotes = { remotes = {
'ipv4 "gate01.hoogi.de" port 10000', 'ipv4 "gate01.hoogi.de" port 10000',
'ipv4 "gate01.pinneberg.freifunk.net" port 10000', 'ipv4 "gate01.pinneberg.freifunk.net" port 10000',
'ipv4 "gate01.freifunk-pinneberg.de" port 10000' 'ipv4 "gate01.freifunk-pinneberg.de" port 10000'
}, },
}, },
gate03 = { gate03 = {
key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496',
remotes = { remotes = {
'ipv4 "gate03.hoogi.de" port 10000', 'ipv4 "gate03.hoogi.de" port 10000',
'ipv4 "gate03.pinneberg.freifunk.net" port 10000', 'ipv4 "gate03.pinneberg.freifunk.net" port 10000',
'ipv4 "gate03.freifunk-pinneberg.de" port 10000' 'ipv4 "gate03.freifunk-pinneberg.de" port 10000'
}, },
}, },
gate04 = { gate04 = {
key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef',
remotes = { remotes = {
'ipv4 "gate04.pinneberg.freifunk.net" port 10000', 'ipv4 "gate04.pinneberg.freifunk.net" port 10000',
'ipv4 "gate04.freifunk-pinneberg.de" port 10000' 'ipv4 "gate04.freifunk-pinneberg.de" port 10000'
}, },
}, },
gate05 = { gate05 = {
key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9',
remotes = { remotes = {
'ipv4 "gate05.hoogi.de" port 10000', 'ipv4 "gate05.hoogi.de" port 10000',
'ipv4 "gate05.pinneberg.freifunk.net" port 10000', 'ipv4 "gate05.pinneberg.freifunk.net" port 10000',
'ipv4 "gate05.freifunk-pinneberg.de" port 10000' 'ipv4 "gate05.freifunk-pinneberg.de" port 10000'
}, },
}, },
}, },
}, },
}, },
bandwidth_limit = { bandwidth_limit = {
enabled = false, enabled = false,
limit_ingress = 3000, limit_ingress = 3000,
limit_egress = 200, limit_egress = 200,
} }
}, },
autoupdater = { autoupdater = {
branch = 'stable', branch = 'stable',
branches = { branches = {
stable = { stable = {
name = 'stable', name = 'stable',
mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'},
good_signatures = 3, good_signatures = 3,
pubkeys = { pubkeys = {
'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
}, },
}, },
beta = { beta = {
name = 'beta', name = 'beta',
mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'},
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
}, },
}, },
experimental = { experimental = {
name = 'experimental', name = 'experimental',
mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'},
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
}, },
}, },
}, },
}, },
roles = { roles = {
default = 'node', default = 'node',
list = { list = {
'node', 'node',
'temp', 'temp',
'mobile', 'mobile',
'offloader', 'offloader',
'service', 'service',
'test', 'test',
}, },
}, },
} }

126
site.mk
View File

@ -1,76 +1,76 @@
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-15 \ gluon-mesh-batman-adv-15 \
gluon-alfred \ gluon-alfred \
gluon-respondd \ gluon-respondd \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-autoupdater \ gluon-config-mode-autoupdater \
gluon-config-mode-contact-info \ gluon-config-mode-contact-info \
gluon-config-mode-core \ gluon-config-mode-core \
gluon-config-mode-geo-location \ gluon-config-mode-geo-location \
gluon-config-mode-hostname \ gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \ gluon-config-mode-mesh-vpn \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-luci-admin \ gluon-luci-admin \
gluon-luci-autoupdater \ gluon-luci-autoupdater \
gluon-luci-portconfig \ gluon-luci-portconfig \
gluon-luci-wifi-config \ gluon-luci-wifi-config \
gluon-luci-private-wifi \ gluon-luci-private-wifi \
gluon-luci-node-role \ gluon-luci-node-role \
gluon-next-node \ gluon-next-node \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \ gluon-setup-mode \
gluon-status-page \ gluon-status-page \
iwinfo \ iwinfo \
iptables \ iptables \
haveged haveged
# basic support for USB stack # basic support for USB stack
USB_PACKAGES_BASIC := \ USB_PACKAGES_BASIC := \
kmod-usb-core \ kmod-usb-core \
kmod-usb2 kmod-usb2
# support for USB UMTS/3G devices # support for USB UMTS/3G devices
USB_PACKAGES_3G := \ USB_PACKAGES_3G := \
kmod-usb-serial \ kmod-usb-serial \
kmod-usb-serial-wwan \ kmod-usb-serial-wwan \
kmod-usb-serial-option \ kmod-usb-serial-option \
chat \ chat \
ppp ppp
# support for USB GPS devices # support for USB GPS devices
USB_PACKAGES_GPS := \ USB_PACKAGES_GPS := \
kmod-usb-acm \ kmod-usb-acm \
ugps ugps
# support for HID devices (keyboard, mouse, ...) # support for HID devices (keyboard, mouse, ...)
USB_PACKAGES_HID := \ USB_PACKAGES_HID := \
kmod-usb-hid \ kmod-usb-hid \
kmod-hid-generic kmod-hid-generic
# storage support for USB devices # storage support for USB devices
USB_PACKAGES_STORAGE := \ USB_PACKAGES_STORAGE := \
block-mount \ block-mount \
blkid \ blkid \
kmod-fs-ext4 \ kmod-fs-ext4 \
kmod-fs-vfat \ kmod-fs-vfat \
kmod-usb-storage \ kmod-usb-storage \
kmod-usb-storage-extras \ kmod-usb-storage-extras \
kmod-nls-cp1250 \ kmod-nls-cp1250 \
kmod-nls-cp1251 \ kmod-nls-cp1251 \
kmod-nls-cp437 \ kmod-nls-cp437 \
kmod-nls-cp775 \ kmod-nls-cp775 \
kmod-nls-cp850 \ kmod-nls-cp850 \
kmod-nls-cp852 \ kmod-nls-cp852 \
kmod-nls-cp866 \ kmod-nls-cp866 \
kmod-nls-iso8859-1 \ kmod-nls-iso8859-1 \
kmod-nls-iso8859-13 \ kmod-nls-iso8859-13 \
kmod-nls-iso8859-15 \ kmod-nls-iso8859-15 \
kmod-nls-iso8859-2 \ kmod-nls-iso8859-2 \
kmod-nls-koi8r \ kmod-nls-koi8r \
kmod-nls-utf8 \ kmod-nls-utf8 \
swap-utils swap-utils
# ar71xx-generic # ar71xx-generic
GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
@ -90,17 +90,17 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
# x86-generic # x86-generic
ifeq ($(GLUON_TARGET),x86-generic) ifeq ($(GLUON_TARGET),x86-generic)
GLUON_SITE_PACKAGES += \ GLUON_SITE_PACKAGES += \
$(USB_PACKAGES_HID) \ $(USB_PACKAGES_HID) \
$(USB_PACKAGES_BASIC) \ $(USB_PACKAGES_BASIC) \
$(USB_PACKAGES_STORAGE) $(USB_PACKAGES_STORAGE)
endif endif
# x86-64 # x86-64
ifeq ($(GLUON_TARGET),x86-64) ifeq ($(GLUON_TARGET),x86-64)
GLUON_SITE_PACKAGES += \ GLUON_SITE_PACKAGES += \
$(USB_PACKAGES_HID) \ $(USB_PACKAGES_HID) \
$(USB_PACKAGES_BASIC) \ $(USB_PACKAGES_BASIC) \
$(USB_PACKAGES_STORAGE) $(USB_PACKAGES_STORAGE)
endif endif
DEFAULT_GLUON_RELEASE := 0.8 DEFAULT_GLUON_RELEASE := 0.8