From db0104978f97e540db418eeb3b4b7cdcba602c5a Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 25 Feb 2023 12:23:07 +0200 Subject: [PATCH] Extract api_prefix rageshake configuration into matrix_rageshake_config_api_prefix --- roles/custom/matrix-rageshake/defaults/main.yml | 2 ++ roles/custom/matrix-rageshake/templates/config.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/custom/matrix-rageshake/defaults/main.yml b/roles/custom/matrix-rageshake/defaults/main.yml index 3568d23f8..4f574d3f6 100644 --- a/roles/custom/matrix-rageshake/defaults/main.yml +++ b/roles/custom/matrix-rageshake/defaults/main.yml @@ -29,6 +29,8 @@ matrix_rageshake_systemd_required_services_list: ["docker.service"] # List of systemd services that matrix-rageshake.service wants matrix_rageshake_systemd_wanted_services_list: [] +matrix_rageshake_config_api_prefix: "https://{{ matrix_server_fqn_rageshake }}/api/" + # Rageshake Settings # Additional config to pass to the rageshake. diff --git a/roles/custom/matrix-rageshake/templates/config.j2 b/roles/custom/matrix-rageshake/templates/config.j2 index 2b0d64b7a..08c90438c 100644 --- a/roles/custom/matrix-rageshake/templates/config.j2 +++ b/roles/custom/matrix-rageshake/templates/config.j2 @@ -1,2 +1,2 @@ -api_prefix: "https://{{ matrix_server_fqn_rageshake }}/api/" +api_prefix: {{ matrix_rageshake_config_api_prefix | to_json }} {{ matrix_rageshake_config | to_nice_yaml(indent=2, width=999999) }}