diff --git a/site.conf b/site.conf index 952520e..4a8a087 100644 --- a/site.conf +++ b/site.conf @@ -1,144 +1,144 @@ { - hostname_prefix = 'ffpi-', - site_name = 'Freifunk Pinneberg', - site_code = 'ffpi', - opkg = { - openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', - extra = { - modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S', - }, - }, - prefix4 = '10.137.0.0/16', - prefix6 = 'fde8:21c6:9d82::/64', - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - ntp_servers = {'1.ntp.services.ffpi'}, - regdom = 'DE', - wifi24 = { - channel = 9, - htmode = 'HT20', - ap = { - ssid = 'pinneberg.freifunk.net' - }, - ibss = { - ssid = '0a:00:ba:dc:ab:1e', - bssid = '0a:00:ba:dc:ab:1e', - mcast_rate = 12000 - } - }, - wifi5 = { - channel = 40, - htmode = 'HT40+', - ap = { - ssid = 'pinneberg.freifunk.net', - }, - ibss = { - ssid = '0a:00:ba:dc:ab:1e', - bssid = '0a:00:ba:dc:ab:1e', - mcast_rate = 12000, - } - }, - next_node = { - ip4 = '10.137.0.1', - ip6 = 'fde8:21c6:9d82::1', - mac = '16:41:95:40:f7:dc' - }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, - mtu = 1426, - groups = { - backbone = { - limit = 1, - peers = { - gate01 = { - key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', - remotes = { - 'ipv4 "gate01.hoogi.de" port 10000', - 'ipv4 "gate01.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate01.freifunk-pinneberg.de" port 10000' - }, - }, - gate03 = { - key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', - remotes = { - 'ipv4 "gate03.hoogi.de" port 10000', - 'ipv4 "gate03.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate03.freifunk-pinneberg.de" port 10000' - }, - }, - gate04 = { - key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', - remotes = { - 'ipv4 "gate04.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate04.freifunk-pinneberg.de" port 10000' - }, - }, - gate05 = { - key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', - remotes = { - 'ipv4 "gate05.hoogi.de" port 10000', - 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', - 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' - } - } - } - } - }, - bandwidth_limit = { - enabled = false, - limit_ingress = 3000, - limit_egress = 200 - } - }, - autoupdater = { - branch = 'experimental', - branches = { - stable = { - name = 'stable', - mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, - good_signatures = 3, - pubkeys = { - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - } - }, - beta = { - name = 'beta', - mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, - good_signatures = 2, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - } - }, - experimental = { - name = 'experimental', - mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, - good_signatures = 1, - pubkeys = { - '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop - 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry - '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas - '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin - 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel - } - } - } - }, - roles = { - default = 'node', - list = { - 'node', - 'temp', - 'mobile', - 'offloader', - 'service', - 'test', - 'hidden' - }, - }, + hostname_prefix = 'ffpi-', + site_name = 'Freifunk Pinneberg', + site_code = 'ffpi', + opkg = { + openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', + extra = { + modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S', + }, + }, + prefix4 = '10.137.0.0/16', + prefix6 = 'fde8:21c6:9d82::/64', + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin + ntp_servers = {'1.ntp.services.ffpi'}, + regdom = 'DE', + wifi24 = { + channel = 9, + htmode = 'HT20', + ap = { + ssid = 'pinneberg.freifunk.net' + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000 + } + }, + wifi5 = { + channel = 40, + htmode = 'HT40+', + ap = { + ssid = 'pinneberg.freifunk.net', + }, + ibss = { + ssid = '0a:00:ba:dc:ab:1e', + bssid = '0a:00:ba:dc:ab:1e', + mcast_rate = 12000, + } + }, + next_node = { + ip4 = '10.137.0.1', + ip6 = 'fde8:21c6:9d82::1', + mac = '16:41:95:40:f7:dc' + }, + fastd_mesh_vpn = { + methods = {'salsa2012+umac'}, + mtu = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gate01 = { + key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d', + remotes = { + 'ipv4 "gate01.hoogi.de" port 10000', + 'ipv4 "gate01.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate01.freifunk-pinneberg.de" port 10000' + }, + }, + gate03 = { + key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496', + remotes = { + 'ipv4 "gate03.hoogi.de" port 10000', + 'ipv4 "gate03.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate03.freifunk-pinneberg.de" port 10000' + }, + }, + gate04 = { + key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef', + remotes = { + 'ipv4 "gate04.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate04.freifunk-pinneberg.de" port 10000' + }, + }, + gate05 = { + key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9', + remotes = { + 'ipv4 "gate05.hoogi.de" port 10000', + 'ipv4 "gate05.pinneberg.freifunk.net" port 10000', + 'ipv4 "gate05.freifunk-pinneberg.de" port 10000' + } + } + } + } + }, + bandwidth_limit = { + enabled = false, + limit_ingress = 3000, + limit_egress = 200 + } + }, + autoupdater = { + branch = 'experimental', + branches = { + stable = { + name = 'stable', + mirrors = {'http://1.updates.services.ffpi/stable/sysupgrade'}, + good_signatures = 3, + pubkeys = { + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel + } + }, + beta = { + name = 'beta', + mirrors = {'http://1.updates.services.ffpi/beta/sysupgrade'}, + good_signatures = 2, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel + } + }, + experimental = { + name = 'experimental', + mirrors = {'http://1.updates.services.ffpi/experimental/sysupgrade'}, + good_signatures = 1, + pubkeys = { + '5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop + 'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry + '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas + '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin + 'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel + } + } + } + }, + roles = { + default = 'node', + list = { + 'node', + 'temp', + 'mobile', + 'offloader', + 'service', + 'test', + 'hidden' + }, + }, } diff --git a/site.mk b/site.mk index a5b727a..54333ac 100644 --- a/site.mk +++ b/site.mk @@ -1,76 +1,76 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ - gluon-alfred \ - gluon-respondd \ - 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-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-portconfig \ - gluon-luci-wifi-config \ - gluon-luci-private-wifi \ - gluon-luci-node-role \ - gluon-next-node \ - gluon-mesh-vpn-fastd \ - gluon-radvd \ - gluon-setup-mode \ - gluon-status-page \ - iwinfo \ - iptables \ - haveged + gluon-mesh-batman-adv-15 \ + gluon-alfred \ + gluon-respondd \ + 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-luci-admin \ + gluon-luci-autoupdater \ + gluon-luci-portconfig \ + gluon-luci-wifi-config \ + gluon-luci-private-wifi \ + gluon-luci-node-role \ + gluon-next-node \ + gluon-mesh-vpn-fastd \ + gluon-radvd \ + gluon-setup-mode \ + gluon-status-page \ + iwinfo \ + iptables \ + haveged # basic support for USB stack USB_PACKAGES_BASIC := \ - kmod-usb-core \ - kmod-usb2 + 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 + 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 + kmod-usb-acm \ + ugps # support for HID devices (keyboard, mouse, ...) USB_PACKAGES_HID := \ - kmod-usb-hid \ - kmod-hid-generic + kmod-usb-hid \ + kmod-hid-generic # storage support for USB devices USB_PACKAGES_STORAGE := \ - block-mount \ - blkid \ - kmod-fs-ext4 \ - kmod-fs-vfat \ - kmod-usb-storage \ - kmod-usb-storage-extras \ - 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 \ - swap-utils + block-mount \ + blkid \ + kmod-fs-ext4 \ + kmod-fs-vfat \ + kmod-usb-storage \ + kmod-usb-storage-extras \ + 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 \ + swap-utils # ar71xx-generic GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) @@ -90,17 +90,17 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) # x86-generic ifeq ($(GLUON_TARGET),x86-generic) GLUON_SITE_PACKAGES += \ - $(USB_PACKAGES_HID) \ - $(USB_PACKAGES_BASIC) \ - $(USB_PACKAGES_STORAGE) + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) endif # x86-64 ifeq ($(GLUON_TARGET),x86-64) GLUON_SITE_PACKAGES += \ - $(USB_PACKAGES_HID) \ - $(USB_PACKAGES_BASIC) \ - $(USB_PACKAGES_STORAGE) + $(USB_PACKAGES_HID) \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) endif DEFAULT_GLUON_RELEASE := 0.9+exp$(shell date '+%Y%m%d')