From fe6e1f144b6a7a454da38e1ef990a4e90ff93502 Mon Sep 17 00:00:00 2001
From: AngrySoundTech <angrysoundtech@gmail.com>
Date: Wed, 26 Jul 2023 13:31:30 -0400
Subject: [PATCH] Move whitelist

---
 ansible/tasks/deploy/minecraft.yml                          | 2 +-
 .../templates/stacks/{minecraft.yml => minecraft.yml.j2}    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename ansible/templates/stacks/{minecraft.yml => minecraft.yml.j2} (100%)

diff --git a/ansible/tasks/deploy/minecraft.yml b/ansible/tasks/deploy/minecraft.yml
index f31ec5c3a..3f17b45b1 100644
--- a/ansible/tasks/deploy/minecraft.yml
+++ b/ansible/tasks/deploy/minecraft.yml
@@ -23,7 +23,7 @@
     - "'swarm_manager' in group_names"
     - setting.minecraft.enabled
   template:
-    src: ../../templates/stacks/minecraft.yml
+    src: ../../templates/stacks/minecraft.yml.j2
     dest: /opt/stacks/minecraft/minecraft.yml
 
 - name: Minecraft | Deploy Stack
diff --git a/ansible/templates/stacks/minecraft.yml b/ansible/templates/stacks/minecraft.yml.j2
similarity index 100%
rename from ansible/templates/stacks/minecraft.yml
rename to ansible/templates/stacks/minecraft.yml.j2
index fd962b57d..1927547cb 100644
--- a/ansible/templates/stacks/minecraft.yml
+++ b/ansible/templates/stacks/minecraft.yml.j2
@@ -21,9 +21,6 @@ services:
       CIV_POSTGRES_HOST: minecraft_postgres
       CIV_POSTGRES_USERNAME: '{{secret.minecraft.postgres.username}}'
       CIV_POSTGRES_PASSWORD: '{{secret.minecraft.postgres.password}}'
-      {% if setting.minecraft.whitelist %}
-      ENABLE_WHITELIST: "true"
-      {% endif %}
     deploy:
       placement:
         constraints: [node.role == manager]
@@ -70,6 +67,9 @@ services:
       CIV_RABBITMQ_USERNAME: rabbitmq
       CIV_RABBITMQ_PASSWORD: '{{secret.minecraft.rabbitmq.password}}'
 
+      {% if setting.minecraft.whitelist %}
+      ENABLE_WHITELIST: "true"
+      {% endif %}
     volumes:
       - /opt/stacks/minecraft/paper-data:/data
       # Private Config & Plugins