diff --git a/site.conf b/site.conf index fccbed6..f33a022 100644 --- a/site.conf +++ b/site.conf @@ -1,6 +1,6 @@ --[[ gluon site.conf example - This file contains the Munich freifunk site.conf which was adopted from the original freifunk suite used in Luebeck. + This file contains the Munich freifunk site.conf which was adopted from the original freifunk suite used in Luebeck. There are comments added to most switches to explain the usage of gluon. This is lua code now, not perl anymore. @@ -10,10 +10,11 @@ { --[[ Community settings - hostname_prefix: Nodename prefix - freifunk-abcdef123456 (hex-part is generated from node's MAC address) - site_name: Name of your community - site_code: Shortcode of your community ]] + hostname_prefix: Nodename prefix + freifunk-abcdef123456 (hex-part is generated from node's MAC address) + site_name: Name of your community + site_code: Shortcode of your community + ]] hostname_prefix = 'freifunk', site_name = 'Freifunk München', @@ -21,9 +22,9 @@ --[[ General network settings - prefix4: IPv4 range of your community - prefix6: IPv6 range of your community - is also required for radvd ]] + prefix4: IPv4 range of your community + prefix6: IPv6 range of your community + is also required for radvd ]] prefix4 = '10.80.0.0/20', prefix6 = 'fdef:ffc0:4fff::/64', @@ -31,31 +32,31 @@ --[[ NTP settings Synchronize the time of the nodes - timezone: Timezone of your community - http://wiki.openwrt.org/doc/uci/system#time.zones - ntp_servers: List of NTP-Servers to query. You can use any public and/or your private NTP-Servers of your community. - http://www.pool.ntp.org/zone/de ]] + timezone: Timezone of your community + http://wiki.openwrt.org/doc/uci/system#time.zones + ntp_servers: List of NTP-Servers to query. You can use any public and/or your private NTP-Servers of your community. + http://www.pool.ntp.org/zone/de ]] timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', ntp_servers = {'1.ntp.services.ffm'}, --[[ Wireless settings - regdom: IEEE 802.11 Regulatory Domain - http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance - wifi24: Wifi settings for 2.4 GHz frequency devices - wifi5: Wifi settings for 5 GHz frequency devices + regdom: IEEE 802.11 Regulatory Domain + http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance + wifi24: Wifi settings for 2.4 GHz frequency devices + wifi5: Wifi settings for 5 GHz frequency devices sub - ssid: Wifi name shown to the user (We recommend %site_code%.freifunk.net) - channel: Wifi channel to use - htmode: Specifies the channel width in 802.11n and 802.11ac mode, possible values are: - HT20 (single 20MHz channel), - HT40- (2x 20MHz channels, primary/control channel is upper, secondary channel is below) - HT40+ (2x 20MHz channels, primary/control channel is lower, secondary channel is above). - VHT20 / VHT40 / VHT80 / VHT160 (channel width in 802.11ac, extra channels are picked according to the specification) - http://wiki.openwrt.org/doc/uci/wireless#common.options (-> htmode) - mesh_ssid: SSID of the mesh-interface, an ugly SSID prevent clients from connecting (We recommend not to change this) - mesh_bssid: BSSID of the mesh-interface - mesh_mcast_rate: multicast rate of the mesh-interface ]] + ssid: Wifi name shown to the user (We recommend %site_code%.freifunk.net) + channel: Wifi channel to use + htmode: Specifies the channel width in 802.11n and 802.11ac mode, possible values are: + HT20 (single 20MHz channel), + HT40- (2x 20MHz channels, primary/control channel is upper, secondary channel is below) + HT40+ (2x 20MHz channels, primary/control channel is lower, secondary channel is above). + VHT20 / VHT40 / VHT80 / VHT160 (channel width in 802.11ac, extra channels are picked according to the specification) + http://wiki.openwrt.org/doc/uci/wireless#common.options (-> htmode) + mesh_ssid: SSID of the mesh-interface, an ugly SSID prevent clients from connecting (We recommend not to change this) + mesh_bssid: BSSID of the mesh-interface + mesh_mcast_rate: multicast rate of the mesh-interface ]] regdom = 'DE', @@ -79,13 +80,13 @@ --[[ Next-Node - next_node: Howto reach the node you are currently connected to - The node will always be reachable at that address, and it's the same on all nodes. Because next_node packets are redirected within the node itself, there will be no conflicts. - sub - ip4: IPv4 Address to use - ip6: IPv6 Address to use - mac: MAC Address to use - (TODO: What is the purpose of this MAC-Address here?) ]] + next_node: Howto reach the node you are currently connected to + The node will always be reachable at that address, and it's the same on all nodes. Because next_node packets are redirected within the node itself, there will be no conflicts. + sub + ip4: IPv4 Address to use + ip6: IPv6 Address to use + mac: MAC Address to use + (TODO: What is the purpose of this MAC-Address here?) ]] next_node = { ip4 = '10.80.0.1', @@ -95,22 +96,22 @@ --[[ Gateway settings - fastd_mesh_vpn: fastd vpn settings - https://projects.universe-factory.net/projects/fastd/wiki/User_manual + fastd_mesh_vpn: fastd vpn settings + https://projects.universe-factory.net/projects/fastd/wiki/User_manual sub - methods: encryption algorithms to use - https://projects.universe-factory.net/projects/fastd/wiki/Methods - When multiple method statements are given, the first one has the highest preference. - mtu: package size - backbone: fastd vpn gateways of your community + methods: encryption algorithms to use + https://projects.universe-factory.net/projects/fastd/wiki/Methods + When multiple method statements are given, the first one has the highest preference. + mtu: package size + backbone: fastd vpn gateways of your community sub - limit: Number of gateways each node connects to - On startup, each node tries to connect to every gateway, and then chooses the number of 'limit' fastest gateways it could reach - peers: Gateways + limit: Number of gateways each node connects to + On startup, each node tries to connect to every gateway, and then chooses the number of 'limit' fastest gateways it could reach + peers: Gateways sub sub - key: public fastd key of your gateway - https://github.com/tcatm/ecdsautils - remotes: List of fastd configuration strings to connect to your gateway server ]] + key: public fastd key of your gateway + https://github.com/tcatm/ecdsautils + remotes: List of fastd configuration strings to connect to your gateway server ]] fastd_mesh_vpn = { @@ -119,13 +120,13 @@ backbone = { limit = 2, peers = { - vpn_gw01 = { --[[ VPN Server von frnk ]] + vpn_gw01 = { --[[ VPN Server von frnk (Island greencloud) ]] key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', - remotes = {'46.149.17.144 port 10000'}, + remotes = {'ipv4 "46.149.17.144" port 10000'}, }, vpn_gw02 = { --[[ VPN Server von Ole (netcap) ]] key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', - remotes = {'37.120.168.150 port 10000'}, + remotes = {'ipv4 "37.120.168.150" port 10000'}, }, }, }, @@ -133,28 +134,28 @@ --[[ gluon autoupdater section a how-to can be found here: http://gluon.readthedocs.org/en/latest/features/autoupdater.html - enable: 0, 1 - branch: stable, beta, experimental - name: name of the branch - mirrors: comma separated ipv6 based mirror-servers to access the firmware image - good_signatures: number of at leased good signatures signed by the authors of the firmware - pubkeys: public keys of the authors of the firmware image ]] + enable: 0, 1 + branch: stable, beta, experimental + name: name of the branch + mirrors: comma separated ipv6 based mirror-servers to access the firmware image + good_signatures: number of at leased good signatures signed by the authors of the firmware + pubkeys: public keys of the authors of the firmware image]] autoupdater = { enabled = 0, - branch = 'experimental', + branch = 'stable', branches = { stable = { name = 'stable', mirrors = { - 'http://{fdca:ffee:babe:1::fec1}/firmware/stable/sysupgrade/', - 'http://{fdca:ffee:babe:1::fec2}/firmware/stable/sysupgrade/', + 'http://37.120.168.150/firmware/stable/sysupgrade/', + }, probability = 0.08, - good_signatures = 2, + good_signatures = 1, pubkeys = { - 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- someguy - 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- someother + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole + }, }, }, @@ -197,7 +198,7 @@ config_mode = { msg_welcome = [[ -Willkommen zum Einrichtungsassistenten für deinen neuen Münchner +Willkommen zum Einrichtungsassistenten für deinen neuen Münchner Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab. ]], @@ -223,3 +224,5 @@ Viel Spaß mit deinem Knoten und der Erkundung von Freifunk! ]], }, } + + diff --git a/site.mk b/site.mk index fe1daff..dc247b3 100644 --- a/site.mk +++ b/site.mk @@ -1,8 +1,3 @@ -## gluon site.mk makefile example - -## GLUON_SITE_PACKAGES -# specify gluon/openwrt packages to include here - GLUON_SITE_PACKAGES := \ gluon-mesh-batman-adv-14 \ gluon-alfred \ @@ -27,22 +22,8 @@ GLUON_SITE_PACKAGES := \ haveged -## DEFAULT_GLUON_RELEASE -# version string to use for images -# gluon relies on -# opkg compare-versions "$1" '>>' "$2" -# to decide if a version is newer or not. - DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d') - -## GLUON_RELEASE -# call make with custom GLUON_RELEASE flag, to use your own release version scheme. -# e.g.: -# $ make images GLUON_RELEASE=23.42+5 -# would generate images named like this: -# gluon-ff%site_code%-23.42+5-%router_model%.bin - # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)