From f66fdb2a44687b57ae41ff0c6ccb98b8213d48d1 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sat, 17 May 2014 15:19:35 +0200 Subject: [PATCH] Update config to luad See: freifunk-gluon/site-ffhl@43ec5c7a6d630be3514483a5db46b726fa9b92ad --- site.conf | 156 +++++++++++++++++++++++++++--------------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/site.conf b/site.conf index bf914bb..f61c021 100644 --- a/site.conf +++ b/site.conf @@ -1,111 +1,111 @@ { - hostname_prefix => 'ffhb', - site_name => 'Freifunk Bremen', - site_code => 'ffhb', - release => '0.3.101-nightly' . nightly, + hostname_prefix = 'ffhb', + site_name = 'Freifunk Bremen', + site_code = 'ffhb', + release = '0.3.101-nightly' . nightly, - prefix4 => '10.196.0.0/20', - prefix6 => 'fd2f:5119:0f2c::/64', + prefix4 = '10.196.0.0/20', + prefix6 = 'fd2f:5119:0f2c::/64', - mesh_domains => [ 'ffhb', '196.10.in-addr.arpa', 'c.2.f.0.9.1.1.5.f.2.d.f.ip6.arpa' ], + mesh_domains = [ 'ffhb', '196.10.in-addr.arpa', 'c.2.f.0.9.1.1.5.f.2.d.f.ip6.arpa' ], - timezone => 'CET-1CEST,M3.5.0,M10.5.0/3', # Europe/Berlin - ntp_servers => ['1.ntp.services.ffhb'], - regdom => 'DE', + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', # Europe/Berlin + ntp_servers = ['1.ntp.services.ffhb'], + regdom = 'DE', - wifi24 => { - ssid => 'bremen.freifunk.net', - channel => 6, - htmode => 'HT40+', - mesh_ssid => 'mesh.ffhb', - mesh_bssid => '32:06:1C:1F:B9:E8', - mesh_mcast_rate => 12000, + wifi24 = { + ssid = 'bremen.freifunk.net', + channel = 6, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffhb', + mesh_bssid = '32:06:1C:1F:B9:E8', + mesh_mcast_rate = 12000, }, - wifi5 => { - ssid => 'bremen.freifunk.net', - channel => 44, - htmode => 'HT40+', - mesh_ssid => 'mesh.ffhb', - mesh_bssid => '32:06:1C:1F:B9:E8', - mesh_mcast_rate => 12000, + wifi5 = { + ssid = 'bremen.freifunk.net', + channel = 44, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffhb', + mesh_bssid = '32:06:1C:1F:B9:E8', + mesh_mcast_rate = 12000, }, - next_node => { - ip4 => '10.196.0.127', - ip6 => 'fd2f:5119:f2c::127', - mac => '16:41:95:40:f7:dc', + next_node = { + ip4 = '10.196.0.127', + ip6 = 'fd2f:5119:f2c::127', + mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn => { - methods => ['salsa2012+gmac'], - mtu => 1426, - backbone => { - limit => 2, - peers => { - vpn01 => { - key => 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f', - remotes => ['ipv4 "vpn01.bremen.freifunk.net" port 10000'], + fastd_mesh_vpn = { + methods = {'salsa2012+gmac'}, + mtu = 1426, + backbone = { + limit = 2, + peers = { + vpn01 = { + key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f', + remotes = {'ipv4 "vpn01.bremen.freifunk.net" port 10000'}, }, - vpn02 => { - key => '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c', - remotes => ['ipv4 "vpn02.bremen.freifunk.net" port 10000'], + vpn02 = { + key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c', + remotes = {'ipv4 "vpn02.bremen.freifunk.net" port 10000'}, }, }, }, }, - autoupdater => { - enabled => 1, - branch => 'nightly', - branches => { - nightly => { - name => 'nightly', - mirrors => ['http://[fd2f:5119:0f2c::1]/firmware/nightly/sysupgrade', 'http://[fd2f:5119:0f2c::2]/firmware/nightly/sysupgrade'], - probability => 1, - good_signatures => 1, - pubkeys => [ + autoupdater = { + enabled = 1, + branch = 'nightly', + branches = { + nightly = { + name = 'nightly', + mirrors = {'http://[fd2f:5119:0f2c::1]/firmware/nightly/sysupgrade', 'http://[fd2f:5119:0f2c::2]/firmware/nightly/sysupgrade'}, + probability = 1, + good_signatures = 1, + pubkeys = { '4bc6c2c3f36f984a9c370558a453d8a91933323679dd6dbbf6568834133a6030', # autobuilder - ], + }, }, - testing => { - name => 'testing', - mirrors => ['http://[fd2f:5119:0f2c::1]/firmware/testing/sysupgrade', 'http://[fd2f:5119:0f2c::2]/firmware/testing/sysupgrade'], - probability => 0.5, - good_signatures => 1, - pubkeys => [ + testing = { + name = 'testing', + mirrors = {'http://[fd2f:5119:0f2c::1]/firmware/testing/sysupgrade', 'http://[fd2f:5119:0f2c::2]/firmware/testing/sysupgrade'}, + probability = 0.5, + good_signatures = 1, + pubkeys = { 'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', # jplitza '159ff7cdf2646f027bf8f901f8bd950cc3feca9ac13e29b70c57e162f7dafb1f', # mortzu - ], + }, }, - stable => { - name => 'stable', - mirrors => ['http://[fd2f:5119:0f2c::1]/firmware/stable/sysupgrade', 'http://[fd2f:5119:0f2c::2]/firmware/stable/sysupgrade'], - probability => 0.08, # mean time until update: ~12.5 hours (1/0.08) - good_signatures => 2, - pubkeys => [ + stable = { + name = 'stable', + mirrors = {'http://[fd2f:5119:0f2c::1]/firmware/stable/sysupgrade', 'http://[fd2f:5119:0f2c::2]/firmware/stable/sysupgrade'}, + probability = 0.08, # mean time until update: ~12.5 hours (1/0.08) + good_signatures = 2, + pubkeys = { 'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', # jplitza '159ff7cdf2646f027bf8f901f8bd950cc3feca9ac13e29b70c57e162f7dafb1f', # mortzu - ], + }, }, }, }, - simple_tc => { - mesh_vpn => { - ifname => "mesh-vpn", - enabled => 1, - limit_egress => 500, - limit_ingress => 8000, + simple_tc = { + mesh_vpn = { + ifname = "mesh-vpn", + enabled = 1, + limit_egress = 500, + limit_ingress = 8000, }, }, - config_mode => { - msg_welcome => <<'END', + config_mode = { + msg_welcome = [[ Willkommen zum Einrichtungsassistenten für deinen neuen Bremer Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab. -END - msg_pubkey => <<'END', +]], + msg_pubkey = [[ <%- f = io.open("/lib/gluon/core/sysconfig/primary_mac", "r") mac = f:read("*all") @@ -115,8 +115,8 @@ Servern des Bremer Freifunk-Projektes eingetragen ist, wird er deinem Knoten ermöglichen, sich mit dem Bremer Mesh-VPN zu verbinden. Verbinde dich dazu mit dem Internet (nicht über diesen Freifunk-Router!) und klicke auf diesen Link. -END - msg_reboot => <<'END', +]], + msg_reboot = [[

Dein Knoten startet gerade neu und versucht sich anschließend mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere Informationen zur @@ -126,6 +126,6 @@ Bremer Freifunk-Community findest du auf

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

-END +]], }, }