diff --git a/templates/410_process-ngcp.yaml.tt2 b/templates/410_process-ngcp.yaml.tt2 index 90a436f..6e249f0 100644 --- a/templates/410_process-ngcp.yaml.tt2 +++ b/templates/410_process-ngcp.yaml.tt2 @@ -34,7 +34,7 @@ command: stderr: [] "pgrep -n -f '[k]amailio.*kamailio.proxy.pid'": -{{if and [% is_proxy && kamailio.proxy.start == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} +{{if and [% is_proxy && kamailio.proxy.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} exit-status: 0 stdout: - "/[0-9]+/" @@ -45,7 +45,7 @@ command: stderr: [] "pgrep -n -f '[k]amailio.*kamailio.lb.pid'": -{{if and [% is_lb && kamailio.lb.start == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} +{{if and [% is_lb && kamailio.lb.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} exit-status: 0 stdout: - "/[0-9]+/" diff --git a/templates/411_process-ngcp-pro.yaml.tt2 b/templates/411_process-ngcp-pro.yaml.tt2 index 24a1bb9..4b6b2b7 100644 --- a/templates/411_process-ngcp-pro.yaml.tt2 +++ b/templates/411_process-ngcp-pro.yaml.tt2 @@ -54,7 +54,7 @@ process: running: true ngcp-voisniff: - running: {{if and [% (is_proxy || is_li) && voisniff.daemon.start == 'yes' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} + running: {{if and [% (is_proxy || is_li) && voisniff.daemon.enable == 'yes' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} # We have to use a truncated process name because that's the COMM limit # on Linux (15 characters). Real name: prometheus-haproxy-exporter. diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index 34f899d..bbe1852 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -32,12 +32,12 @@ service: running: [% is_lb && haproxy.enable == "yes" && general.ngcp_type == 'carrier' ? 'true' : 'false' %] kamailio-lb.service: - enabled: [% general.process_handler == 'none' && kamailio.lb.start == "yes" ? 'true' : 'false' %] - running: {{if and [% is_lb && kamailio.lb.start == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} + enabled: [% general.process_handler == 'none' && kamailio.lb.enable == "yes" ? 'true' : 'false' %] + running: {{if and [% is_lb && kamailio.lb.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} kamailio-proxy.service: - enabled: [% general.process_handler == 'none' && kamailio.proxy.start == "yes" ? 'true' : 'false' %] - running: {{if and [% is_proxy && kamailio.proxy.start == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} + enabled: [% general.process_handler == 'none' && kamailio.proxy.enable == "yes" ? 'true' : 'false' %] + running: {{if and [% is_proxy && kamailio.proxy.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} ngcp-license-client.service: enabled: [% general.process_handler == 'none' && (general.license_key != '' || general.anonymous_usage_statistics == 'yes') ? 'true' : 'false' %] @@ -110,7 +110,7 @@ service: ngcp-voisniff.service: enabled: false - running: {{if and [% (is_proxy || is_li) && voisniff.daemon.start == 'yes' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} + running: {{if and [% (is_proxy || is_li) && voisniff.daemon.enable == 'yes' ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} ngcpcfg-api.service: enabled: [% is_mgmt && bootenv.ngcpcfg_api.enable == "yes" ? 'true' : 'false' %]