From 31797b9e2cc48400f4ff1ccff4cd66cb4f18872e Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Tue, 6 Feb 2024 16:36:33 -0600 Subject: [PATCH] refactor: use `ansible_host` var for templating SquadJS hosts --- .../templates/SquadJS.tactical.json.j2 | 2 +- .../templates/SquadJS.vanilla.json.j2 | 86 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/roles/squad-server/templates/SquadJS.tactical.json.j2 b/roles/squad-server/templates/SquadJS.tactical.json.j2 index e576ef7..3d9c2f0 100644 --- a/roles/squad-server/templates/SquadJS.tactical.json.j2 +++ b/roles/squad-server/templates/SquadJS.tactical.json.j2 @@ -1,7 +1,7 @@ { "server": { "id": {{ server.server_id }}, - "host": "asgard-eternal.com", + "host": "{{ ansible_host }}", "queryPort": {{ server.ports.query }}, "rconPort": {{ server.ports.rcon }}, "rconPassword": "{{ server.secrets.rcon_password }}", diff --git a/roles/squad-server/templates/SquadJS.vanilla.json.j2 b/roles/squad-server/templates/SquadJS.vanilla.json.j2 index dd9704e..36f3b64 100644 --- a/roles/squad-server/templates/SquadJS.vanilla.json.j2 +++ b/roles/squad-server/templates/SquadJS.vanilla.json.j2 @@ -1,7 +1,7 @@ { "server": { "id": {{ server.server_id }}, - "host": "asgard-eternal.com", + "host": "{{ ansible_host }}", "queryPort": {{ server.ports.query }}, "rconPort": {{ server.ports.rcon }}, "rconPassword": "{{ server.secrets.rcon_password }}", @@ -298,48 +298,48 @@ "automaticSeedingMode": true, "gamemodeWhitelist": [ "RAAS", "tanks", "invasion", "inv" ], "layerFilteringMode": "blacklist", - "layerLevelBlacklist": [ - "FoolsRoad", - "Kamdesh", - "Logar", - "Mestia", - "Sumari", - "Narva_Invasion_v5", - "Narva_RAAS_v5", - "Gorodok_RAAS_v04", - "Fallujah_RAAS_v7", - "AlBasrah_RAAS_v1", - "Chora_Invasion", - "Fallujah_Invasion", - "GooseBay_Invasion_v3", - "Gorodok_Invasion_v1", - "Fallujah_RAAS_v6", - "BlackCoast_Invasion_v2", - "BlackCoast_Invasion_v1", - "BlackCoast_Invasion_v3", - "Mutaha_Invasion_v1", - "Narva_Invasion_v3", - "Skorpo_Invasion_v2", - "Skorpo_Invasion_v3", - "Skorpo_Invasion_v4", - "Tallil_Tanks_v1", - "Tallil_RAAS_v2", - "Tallil_RAAS_v7", - "Tallil_Invasion_v1", - "Tallil_Invasion_v2", - "Tallil_Invasion_v5", - "Yehorivka_RAAS_v04", - "Yehorivka_RAAS_v10", - "Yehorivka_RAAS_v05", - "Yehorivka_RAAS_v14", - "Harju_Invasion_v1", - "Harju_Invasion_v3", - "Harju_Invasion_v4", - "Harju_Invasion_v5", - "Harju_RAAS_v2", - "Harju_RAAS_v5", - "Tallil_RAAS_v3", - "Manicouagan_RAAS_v13", + "layerLevelBlacklist": [ + "FoolsRoad", + "Kamdesh", + "Logar", + "Mestia", + "Sumari", + "Narva_Invasion_v5", + "Narva_RAAS_v5", + "Gorodok_RAAS_v04", + "Fallujah_RAAS_v7", + "AlBasrah_RAAS_v1", + "Chora_Invasion", + "Fallujah_Invasion", + "GooseBay_Invasion_v3", + "Gorodok_Invasion_v1", + "Fallujah_RAAS_v6", + "BlackCoast_Invasion_v2", + "BlackCoast_Invasion_v1", + "BlackCoast_Invasion_v3", + "Mutaha_Invasion_v1", + "Narva_Invasion_v3", + "Skorpo_Invasion_v2", + "Skorpo_Invasion_v3", + "Skorpo_Invasion_v4", + "Tallil_Tanks_v1", + "Tallil_RAAS_v2", + "Tallil_RAAS_v7", + "Tallil_Invasion_v1", + "Tallil_Invasion_v2", + "Tallil_Invasion_v5", + "Yehorivka_RAAS_v04", + "Yehorivka_RAAS_v10", + "Yehorivka_RAAS_v05", + "Yehorivka_RAAS_v14", + "Harju_Invasion_v1", + "Harju_Invasion_v3", + "Harju_Invasion_v4", + "Harju_Invasion_v5", + "Harju_RAAS_v2", + "Harju_RAAS_v5", + "Tallil_RAAS_v3", + "Manicouagan_RAAS_v13", "Manicouagan_RAAS_v15", "Kohat_Invasion_v1", "Kohat_RAAS_v04",