fixup! datamodel: jinja2 templates rework WIP

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/monitoring_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/monitoring_macros.lua.j2
index b126538e0d0a9399ab73c387a6350e2b15429a12..a20f69d93dec3c93257c860d9b5b51b9da613475 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/macros/monitoring_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/monitoring_macros.lua.j2
@@ -1,7 +1,7 @@
-{% from 'macros/common_macros.lua.j2' import modules_load %}
+{% from 'macros/common_macros.lua.j2' import quotes, modules_load %}
 
 
-{% macro monitoring_control_socket() -%}
+{% macro monitoring_control_socket(path) -%}
 --- control socket location
 local ffi = require('ffi')
 local id = os.getenv('SYSTEMD_INSTANCE')
@@ -10,7 +10,7 @@ if not id then
 else
     -- Bind to control socket in CWD (= rundir in config)
     -- FIXME replace with relative path after fixing https://gitlab.nic.cz/knot/knot-resolver/-/issues/720
-    local path = '{{ cwd }}/control/'..id
+    local path = {{ quotes(path) }} .. '/control/'.. id
     log_warn(ffi.C.LOG_GRP_SYSTEM, 'path = ' .. path)
     local ok, err = pcall(net.listen, path, nil, { kind = 'control' })
     if not ok then

diff --git a/manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
index 138e79563399bd120158af53e41beac4687c9a5e..9636ca424a7114cdc2636e9c6821f5db549b716e 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
@@ -5,12 +5,12 @@
 -- MONITORING configuration
 --------------------------------------------------------------------------------
 
-{{ monitoring_control_socket() }}
+{{ monitoring_control_socket(cwd) }}
 
 {% if cfg.monitoring.enabled == "always" %}
 {{ modules_load('stats') }}
 {% endif %}
 
-{{ monitoring_collect_lazy_statistics }}
+{{ monitoring_collect_lazy_statistics() }}
 
-{{ monitoring_collect_statistics }}
+{{ monitoring_collect_statistics() }}