From f332e6db4632576e6cf35eeaf171e56fa48fd2ec Mon Sep 17 00:00:00 2001 From: creme Date: Thu, 5 Dec 2024 00:06:08 +0100 Subject: [PATCH] add missing apache_speedtest in config.jinja --- salt/freifunk/base/config.jinja | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/salt/freifunk/base/config.jinja b/salt/freifunk/base/config.jinja index 57758c2d..0ead4032 100644 --- a/salt/freifunk/base/config.jinja +++ b/salt/freifunk/base/config.jinja @@ -22,11 +22,9 @@ {% set custom_branch = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.branch') %} {% set autoupdate = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.autoupdate') %} -{% set freifunk_version = salt['cmd.shell']('test -f /usr/local/bin/freifunk-version && /usr/local/bin/freifunk-version || printf "n.a\n"') %} - +{% set freifunk_version = salt['cmd.shell']('test -f /usr/local/bin/freifunk-version && /usr/local/bin/freifunk-version || printf "n.a.\n"') %} {% set devmode = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.devmode || true') %} - {% set ddmesh_registerkey = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.ddmesh_registerkey') %} {% set servername = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.servername') %} @@ -38,9 +36,9 @@ {% set announce_gateway = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.announce_gateway') %} {% set apache_ddos_prevent = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.apache_ddos_prevent || true') %} +{% set apache_speedtest = salt['cmd.shell']('/usr/local/sbin/uci -qX get ffdd.sys.apache_speedtest || true') %} -{# check hostnamectl #} {% set chassis = salt['cmd.shell']("hostnamectl status | awk '/Chassis/ {print $2}'") %} {# ctime - used for crontab minutes #}