From b1bcedf2e46e5a894076b346b52def764a908e0a Mon Sep 17 00:00:00 2001 From: Speechmatics Bot <47453263+speechmatics-bot@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:39:40 +0100 Subject: [PATCH] Update roles/pushgateway/defaults/main.yml Co-authored-by: Ben Kochie Signed-off-by: Waldek Maleska --- roles/pushgateway/defaults/main.yml | 2 +- roles/pushgateway/meta/argument_specs.yml | 2 +- roles/pushgateway/templates/pushgateway.service.j2 | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/pushgateway/defaults/main.yml b/roles/pushgateway/defaults/main.yml index 973cfa5f6..70217df50 100644 --- a/roles/pushgateway/defaults/main.yml +++ b/roles/pushgateway/defaults/main.yml @@ -15,7 +15,7 @@ pushgateway_web_external_url: "" # Optional extra flags to be passed to pushgateway binary, e.g. # ['--log.level=debug', '--log.format=json', '--web.enable-admin-api'] -pushgateway_cli_extra_flags: [] +pushgateway_config_flags_extra: [] pushgateway_tls_server_config: {} diff --git a/roles/pushgateway/meta/argument_specs.yml b/roles/pushgateway/meta/argument_specs.yml index 0c9835508..ce45c652f 100644 --- a/roles/pushgateway/meta/argument_specs.yml +++ b/roles/pushgateway/meta/argument_specs.yml @@ -37,7 +37,7 @@ argument_specs: External address on which pushgateway is available. Useful when behind reverse proxy, e.g.: https://example.org/pushgateway default: "" - pushgateway_cli_extra_flags: + pushgateway_config_flags_extra: description: > Optional extra flags to be passed to pushgateway binary, e.g. ['--log.level=debug', '--log.format=json', '--web.enable-admin-api'] diff --git a/roles/pushgateway/templates/pushgateway.service.j2 b/roles/pushgateway/templates/pushgateway.service.j2 index 2f29ab9c8..488382aab 100644 --- a/roles/pushgateway/templates/pushgateway.service.j2 +++ b/roles/pushgateway/templates/pushgateway.service.j2 @@ -29,11 +29,11 @@ ExecStart={{ pushgateway_binary_install_dir }}/pushgateway \ {% if pushgateway_web_external_url %} '--web.external-url={{ pushgateway_web_external_url }}' \ {% endif %} -{% if pushgateway_cli_extra_flags and - pushgateway_cli_extra_flags is iterable and - pushgateway_cli_extra_flags is not mapping and - pushgateway_cli_extra_flags is not string %} -{% for extra_flag in pushgateway_cli_extra_flags %} +{% if pushgateway_config_flags_extra and + pushgateway_config_flags_extra is iterable and + pushgateway_config_flags_extra is not mapping and + pushgateway_config_flags_extra is not string %} +{% for extra_flag in pushgateway_config_flags_extra %} '{{ extra_flag }}' \ {% endfor %} {% endif %}