From c028055f2833904c322e8c8f4025b73fbe42e95b Mon Sep 17 00:00:00 2001
From: Chris Fiege <chris@tinyhost.de>
Date: Sun, 26 May 2024 15:13:52 +0200
Subject: [PATCH] site.conf: Re-format using stylua
Re-format site.conf using stylua, an opinionated code formatter for Lua.
This commit should be a no-op - but makes the file much more readable.
---
site.template | 166 ++++++++++++++++++++++++--------------------------
1 file changed, 81 insertions(+), 85 deletions(-)
diff --git a/site.template b/site.template
index 85bada9..c68f67e 100644
--- a/site.template
+++ b/site.template
@@ -1,144 +1,140 @@
{
authorized_keys = {
- 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAvKxyTng9ik/oFf3W+0CItmX127rKhmXXX5rB3n+trO/4pPE/YOkTq5rMuNpeRl8+AqY9ZW9qQHyIc8D4IqtJNhe9OfFeIDHrSxilHGh/IXwdZ/MpexaeGUzqyck8xNxIeqqbs6ouBXHhWcBIjQQlXEj5fGTU6MFbUauvJd0bc8c7OhW2PzQkjbahriH0C/o+xoxovXFEa8Vrerxyv8lWSsm92j2qXBXdO1woOV0npruhq6hVzELdhSVpaHYg3n7HQCaB39QiQBM9kU+Px7cjz9H5XUBtaS6YtMEyCKckA2RvwnAkWu/QDWsDvYAXnGU9/hrYAmG26plFvrNYi+U3pAzZDoEaDmckof5yO7bCl6LvQKGUKCZg8GNnnzKfOQVSsNlTaThhUDqZ88lToksLtQavNKZkWahNdAF6ZC+iRUDak01KqgeeuHKj7C2IfU/H4U4FoMtQwSoVnVNN+kLDrsN6wmT1wVOjvBIp5mTk0gY3w3gXCW3N5BpqNhDTt5Cd2yFbaXl2OcAdax8MreY+Ql1VCR3wWJfj/ikwqDYnyBt/lYdeqm8X5HEw57JvWc1ckGMW/olV5a/MrW5GYTp9G9fOBkPgM8ypl340RoDMoNe7b7Pr9zTyLMjfdtvbRq7uehiT8VDn5OVWPTBsjKjcj1orrKN+3zJiH49UBP4FWW0= shoragan', -- REMOVE_FOR_STABLE
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDpA48TpFAdr7EpwF8Htisf48R4ououADEyVVLHyt5kyQeZhBetTsWKzCzBosEt/cHMMuS/uQaqE8tRLqvox2kc4gjgJh/drPqXnf4UJILvSi/nHkQXOqY7/H/Fn2UvYZWlsecegzKaBSFemigJ8G21RxosA22nu+QJv3M0Ra0jyuHjdfxheLPJpM+76x/H0ploONOtGAo8iycJKfl+OitB2KJjoq2ohX4+tX32coifF9BKtQUbLva6llSfZpjJ9lrI7O6hk0xQtV/jMaDyCoZ6yRx8YiO2fk5ixoL0WIgdexeixDf4fffJXQuORR5kXoeXKk8BH5W68AokrUqqaSyUGMhBzl9WVVt2yV5basufC9uAFiMrG+ry1X2Yt5M+yAIELQQ1D8olc37xhXPIn/QDg9o5oTH+iJg9mTEMRndrA2Q0QnOYvS0D7umU0t3AADqE6rG3LOS2XV+Y4iBNqSDbJhESBNJs/Vq5BuUf4yUm7+ExQARJX5bwm8vuA7mW8+1m74phtKFFNcAqAON2J24gDh7IhyGZ76fEJXB1YQlJxOdfumqp85oqth+fKVsMwngCld+CJ4B/PHpgfUnmve3mm28aVGcPdlr40uQ/3K6V9GsW778MFyIO5bsY8ZS1VRVMwzf3VA785EpkCsZ51O7YBDzZ7ROwNppXU9F2gvTqNQ== kasa', -- REMOVE_FOR_STABLE
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEWpbjL6mqW3l69pEMTSuiI3VR7Z55k4onUIksDpqRFej+jOap9yX48f8JrCxuCr9KdnYlncRANAT+bIr4cVDGX7sPW09dVdll6SIx4z3zOCePgy+3zCDIsGpxwtWIqgiXckQlm7eV2McIuoZNoW1Z7I/TU7BcpS03Np6nYW12VG/F2eElwrDoNRJ18qUm6DxeINetfi5Ob/T9Zjuo9HsSpZNhXPP15AHlL9ttk3ActKBmS1LHOL33czcpoFEr4s3GsCOGDRaFdzQinh/A8yywYpap/lXgRS0sXOj+zAI44X1vKun115hBgKukyubrZMZ5UzjSs/CFtGOdyoZq/YXf chrissi@dauntless ffbs router key', -- REMOVE_FOR_STABLE
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClXiNtzvLk9wZPC6uoUWuXwGzKY9/fkX0+FtfQncg2sd9cWRG9GMw70qR6d4JudzLgXE/+t5oLFHwi20lgtoTsm7xizRgxRMsgM9rIXXlz/kK8aMtOS63AyV7bpicAAc/clhVG99fJq8ooDbDg3xp2TonYbpowqTTQiRMjE4TK3jhM88i2Sw2lfLiAX7ksOOBlYepzHbuEmQH4u9Gq3Qk45bAzuhWf5Jv67C//g07NthR9uvEUzO23Co+yLvzDPKujuh7mFJsjmw3Tq4fW0q3gQgBJH+fUeVyzqoWbYzZZ+wwemFgV/KtD8tl++bqaAKsmh8/XDb96fS0U+/EpIH6d FFBS Parker Key (Emantor)', -- REMOVE_FOR_STABLE
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKRbxolK7sqhdenKVsZnzP/KKnJIERrl+rP6f+ESrUDb0Ra2Li01jACZC2uyq545zSQFfeDfmwWIvTOTs4eBf3mIA1hsUNjm8NdC8JofZry2G9AsnHB55+Szgg4LRecCeHShfoCdgxEE3NvFrkjQeay6Rc2+XMDVIcK1wo9veSCsC5xYKfRaY3/da9cu6vqlL2830arIrBQhOWxDvwWxgQDAo5l1ylcVmdC+GZ0XRRW8HyXkv8A6GoWI/inMT5aZGJFugyw3f+PqKnjDWk3Mda0cA21hQfwnzOaX7M8iULv0xIumpnXBn5nUiCWeRtXzShDKbsICsfVIKGR0GAzC4n larsan@lati', -- REMOVE_FOR_STABLE
- 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAso+wUKaYd2XNcuaK0O2HYoluIkButZrHUGvn47CwAU5Zpb7Pzlf61wJGHDQxK8/YeNx5J/PqlLpYPJXQTdKI4tpyKkB3r1/cfR99kCTO2hZXrsKzty0cqfhL9qNZ8a1eRGVMjh1k66DtTu9y0xH60CKbeV3C+Hd0rz8izfbSAAtpX44GBE+yJY7pnFJi5S1Zx+nUFgiar118ODizmNtC1EiC26IIvT1FuXDWNSM7iuYDgCZv+MxV+gIqW+54maWz4MBTQgys0K+oqKxQ5Vq1fN2XV2IBrnp8UD5A649ltjezwn0WZjoTHBb4++3WGOlulX1YjBYOiBSvCBZMM9MJpQ== marco', -- REMOVE_FOR_STABLE
+ "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAvKxyTng9ik/oFf3W+0CItmX127rKhmXXX5rB3n+trO/4pPE/YOkTq5rMuNpeRl8+AqY9ZW9qQHyIc8D4IqtJNhe9OfFeIDHrSxilHGh/IXwdZ/MpexaeGUzqyck8xNxIeqqbs6ouBXHhWcBIjQQlXEj5fGTU6MFbUauvJd0bc8c7OhW2PzQkjbahriH0C/o+xoxovXFEa8Vrerxyv8lWSsm92j2qXBXdO1woOV0npruhq6hVzELdhSVpaHYg3n7HQCaB39QiQBM9kU+Px7cjz9H5XUBtaS6YtMEyCKckA2RvwnAkWu/QDWsDvYAXnGU9/hrYAmG26plFvrNYi+U3pAzZDoEaDmckof5yO7bCl6LvQKGUKCZg8GNnnzKfOQVSsNlTaThhUDqZ88lToksLtQavNKZkWahNdAF6ZC+iRUDak01KqgeeuHKj7C2IfU/H4U4FoMtQwSoVnVNN+kLDrsN6wmT1wVOjvBIp5mTk0gY3w3gXCW3N5BpqNhDTt5Cd2yFbaXl2OcAdax8MreY+Ql1VCR3wWJfj/ikwqDYnyBt/lYdeqm8X5HEw57JvWc1ckGMW/olV5a/MrW5GYTp9G9fOBkPgM8ypl340RoDMoNe7b7Pr9zTyLMjfdtvbRq7uehiT8VDn5OVWPTBsjKjcj1orrKN+3zJiH49UBP4FWW0= shoragan", -- REMOVE_FOR_STABLE
+ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDpA48TpFAdr7EpwF8Htisf48R4ououADEyVVLHyt5kyQeZhBetTsWKzCzBosEt/cHMMuS/uQaqE8tRLqvox2kc4gjgJh/drPqXnf4UJILvSi/nHkQXOqY7/H/Fn2UvYZWlsecegzKaBSFemigJ8G21RxosA22nu+QJv3M0Ra0jyuHjdfxheLPJpM+76x/H0ploONOtGAo8iycJKfl+OitB2KJjoq2ohX4+tX32coifF9BKtQUbLva6llSfZpjJ9lrI7O6hk0xQtV/jMaDyCoZ6yRx8YiO2fk5ixoL0WIgdexeixDf4fffJXQuORR5kXoeXKk8BH5W68AokrUqqaSyUGMhBzl9WVVt2yV5basufC9uAFiMrG+ry1X2Yt5M+yAIELQQ1D8olc37xhXPIn/QDg9o5oTH+iJg9mTEMRndrA2Q0QnOYvS0D7umU0t3AADqE6rG3LOS2XV+Y4iBNqSDbJhESBNJs/Vq5BuUf4yUm7+ExQARJX5bwm8vuA7mW8+1m74phtKFFNcAqAON2J24gDh7IhyGZ76fEJXB1YQlJxOdfumqp85oqth+fKVsMwngCld+CJ4B/PHpgfUnmve3mm28aVGcPdlr40uQ/3K6V9GsW778MFyIO5bsY8ZS1VRVMwzf3VA785EpkCsZ51O7YBDzZ7ROwNppXU9F2gvTqNQ== kasa", -- REMOVE_FOR_STABLE
+ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEWpbjL6mqW3l69pEMTSuiI3VR7Z55k4onUIksDpqRFej+jOap9yX48f8JrCxuCr9KdnYlncRANAT+bIr4cVDGX7sPW09dVdll6SIx4z3zOCePgy+3zCDIsGpxwtWIqgiXckQlm7eV2McIuoZNoW1Z7I/TU7BcpS03Np6nYW12VG/F2eElwrDoNRJ18qUm6DxeINetfi5Ob/T9Zjuo9HsSpZNhXPP15AHlL9ttk3ActKBmS1LHOL33czcpoFEr4s3GsCOGDRaFdzQinh/A8yywYpap/lXgRS0sXOj+zAI44X1vKun115hBgKukyubrZMZ5UzjSs/CFtGOdyoZq/YXf chrissi@dauntless ffbs router key", -- REMOVE_FOR_STABLE
+ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClXiNtzvLk9wZPC6uoUWuXwGzKY9/fkX0+FtfQncg2sd9cWRG9GMw70qR6d4JudzLgXE/+t5oLFHwi20lgtoTsm7xizRgxRMsgM9rIXXlz/kK8aMtOS63AyV7bpicAAc/clhVG99fJq8ooDbDg3xp2TonYbpowqTTQiRMjE4TK3jhM88i2Sw2lfLiAX7ksOOBlYepzHbuEmQH4u9Gq3Qk45bAzuhWf5Jv67C//g07NthR9uvEUzO23Co+yLvzDPKujuh7mFJsjmw3Tq4fW0q3gQgBJH+fUeVyzqoWbYzZZ+wwemFgV/KtD8tl++bqaAKsmh8/XDb96fS0U+/EpIH6d FFBS Parker Key (Emantor)", -- REMOVE_FOR_STABLE
+ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKRbxolK7sqhdenKVsZnzP/KKnJIERrl+rP6f+ESrUDb0Ra2Li01jACZC2uyq545zSQFfeDfmwWIvTOTs4eBf3mIA1hsUNjm8NdC8JofZry2G9AsnHB55+Szgg4LRecCeHShfoCdgxEE3NvFrkjQeay6Rc2+XMDVIcK1wo9veSCsC5xYKfRaY3/da9cu6vqlL2830arIrBQhOWxDvwWxgQDAo5l1ylcVmdC+GZ0XRRW8HyXkv8A6GoWI/inMT5aZGJFugyw3f+PqKnjDWk3Mda0cA21hQfwnzOaX7M8iULv0xIumpnXBn5nUiCWeRtXzShDKbsICsfVIKGR0GAzC4n larsan@lati", -- REMOVE_FOR_STABLE
+ "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAso+wUKaYd2XNcuaK0O2HYoluIkButZrHUGvn47CwAU5Zpb7Pzlf61wJGHDQxK8/YeNx5J/PqlLpYPJXQTdKI4tpyKkB3r1/cfR99kCTO2hZXrsKzty0cqfhL9qNZ8a1eRGVMjh1k66DtTu9y0xH60CKbeV3C+Hd0rz8izfbSAAtpX44GBE+yJY7pnFJi5S1Zx+nUFgiar118ODizmNtC1EiC26IIvT1FuXDWNSM7iuYDgCZv+MxV+gIqW+54maWz4MBTQgys0K+oqKxQ5Vq1fN2XV2IBrnp8UD5A649ltjezwn0WZjoTHBb4++3WGOlulX1YjBYOiBSvCBZMM9MJpQ== marco", -- REMOVE_FOR_STABLE
},
- hostname_prefix = 'ffbs-next',
- site_name = 'Freifunk Braunschweig Next',
- site_code = 'ffbs-next',
+ hostname_prefix = "ffbs-next",
+ site_name = "Freifunk Braunschweig Next",
+ site_code = "ffbs-next",
- timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
- ntp_servers = {'172.16.0.123'},
- regdom = 'DE',
+ timezone = "CET-1CEST,M3.5.0,M10.5.0/3", -- Europe/Berlin
+ ntp_servers = { "172.16.0.123" },
+ regdom = "DE",
domain_seed = "ca95f6e5c63886922a3154b6bf90a4938ef04e176180ff5308f2b2aba1c90b88",
wifi24 = {
channel = 1,
ap = {
- ssid = 'Freifunk',
- },
+ ssid = "Freifunk",
+ },
mesh = {
- id = 'eseB6Qlu',
+ id = "eseB6Qlu",
mcast_rate = 12000,
},
- aliases = { },
+ aliases = {},
},
wifi5 = {
channel = 44,
outdoors = "preset",
- outdoor_chanlist = '100-140',
- htmode = 'HT40+',
+ outdoor_chanlist = "100-140",
+ htmode = "HT40+",
ap = {
- ssid = 'Freifunk',
+ ssid = "Freifunk",
},
mesh = {
- id = 'eseB6Qlu',
+ id = "eseB6Qlu",
mcast_rate = 12000,
},
- aliases = { },
+ aliases = {},
},
dns = {
- servers = { '172.16.0.53', '2001:bf7:382:0::53', },
+ servers = { "172.16.0.53", "2001:bf7:382:0::53" },
},
next_node = {
- ip4 = '172.16.127.1',
- ip6 = '2001:bf7:382:0::1',
+ ip4 = "172.16.127.1",
+ ip6 = "2001:bf7:382:0::1",
name = { "node.ffbs" },
- mac = '72:02:46:6a:1c:27',
+ mac = "72:02:46:6a:1c:27",
},
- mesh = {
- vxlan = true,
- batman_adv = {
- routing_algo = 'BATMAN_IV',
+ mesh = {
+ vxlan = true,
+ batman_adv = {
+ routing_algo = "BATMAN_IV",
+ },
},
-},
-
autoupdater = {
branches = {
parker_stable = {
- name = 'parker_stable',
- mirrors = {'http://w.freifunk-bs.de/parker_stable/sysupgrade'},
+ name = "parker_stable",
+ mirrors = { "http://w.freifunk-bs.de/parker_stable/sysupgrade" },
good_signatures = 1,
pubkeys = {
- '9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
- '5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc', -- kasa
- 'fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d', -- emantor
- '5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a', -- larsan
+ "9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd", -- chrissi
+ "5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc", -- kasa
+ "fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d", -- emantor
+ "5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a", -- larsan
},
},
parker_beta = {
- name = 'parker_beta',
- mirrors = {'http://w.freifunk-bs.de/parker_beta/sysupgrade'},
+ name = "parker_beta",
+ mirrors = { "http://w.freifunk-bs.de/parker_beta/sysupgrade" },
good_signatures = 1,
pubkeys = {
- '9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
- '5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc', -- kasa
- 'fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d', -- emantor
- '5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a', -- larsan
+ "9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd", -- chrissi
+ "5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc", -- kasa
+ "fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d", -- emantor
+ "5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a", -- larsan
},
},
},
},
-config_mode = {
- remote_login = {
- show_password_form = true,
- },
- geo_location = {
- osm = {
- center = {
- lat = 52.26469,
- lon = 10.52378,
+ config_mode = {
+ remote_login = {
+ show_password_form = true,
+ },
+ geo_location = {
+ osm = {
+ center = {
+ lat = 52.26469,
+ lon = 10.52378,
+ },
},
+ show_altitude = true,
},
- show_altitude = true,
},
-},
- opkg = {
- openwrt = "http://downloads.openwrt.org/releases/%v/packages/%A",
- },
-
-radv_filterd = {
- -- default setting. only here for reference..
- threshold = 20,
-},
+ opkg = {
+ openwrt = "http://downloads.openwrt.org/releases/%v/packages/%A",
+ },
-parker = {
- config_server = 'config.freifunk-bs.de',
- config_pubkey = 'RWTecZzXNMuXYhvcquk321nc73U3oc7xm6Fm5FEF5y3X/HUyWsvp/rHp',
-},
+ radv_filterd = {
+ -- default setting. only here for reference..
+ threshold = 20,
+ },
-mesh_vpn = {
- parker = {
- mtu = 1312,
- },
- bandwidth_limit = {
- enabled = false,
- ingress = 3000,
- egress = 200,
- },
-},
-
-
+ parker = {
+ config_server = "config.freifunk-bs.de",
+ config_pubkey = "RWTecZzXNMuXYhvcquk321nc73U3oc7xm6Fm5FEF5y3X/HUyWsvp/rHp",
+ },
+ mesh_vpn = {
+ parker = {
+ mtu = 1312,
+ },
+ bandwidth_limit = {
+ enabled = false,
+ ingress = 3000,
+ egress = 200,
+ },
+ },
legacy = {
- version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'},
- old_files = {'/etc/config/config_mode', '/etc/config/ffbs', '/etc/config/freifunk'},
+ version_files = { "/etc/.freifunk_version_keep", "/etc/.lff_version_keep" },
+ old_files = { "/etc/config/config_mode", "/etc/config/ffbs", "/etc/config/freifunk" },
- config_mode_configs = {'config_mode', 'ffbs', 'freifunk'},
- fastd_configs = {'ffbs_mesh_vpn', 'mesh_vpn'},
- mesh_ifname = 'freifunk',
- tc_configs = {'ffbs', 'freifunk'},
- wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
+ config_mode_configs = { "config_mode", "ffbs", "freifunk" },
+ fastd_configs = { "ffbs_mesh_vpn", "mesh_vpn" },
+ mesh_ifname = "freifunk",
+ tc_configs = { "ffbs", "freifunk" },
+ wifi_names = { "wifi_freifunk", "wifi_freifunk5", "wifi_mesh", "wifi_mesh5" },
},
}
--
GitLab