🚸 Simplified env vars

davestephens · Mar 18, 2024 · 77a7021 · 77a7021
1 parent bdcec28
commit 77a7021
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/roles/valheim/defaults/main.yml b/roles/valheim/defaults/main.yml
@@ -77,12 +77,10 @@ valheim_env:
   TYPE: "{{ valheim_type }}"
   SCHEDULED_RESTART: "{{ valheim_scheduled_restart }}"
   SCHEDULED_RESTART_SCHEDULE: "{{ valheim_scheduled_restart_schedule }}"
-
-# valheim_optional_env:
-#   WEBHOOK_URL: "{{ valheim_webhook_url }}"
-#   WEBHOOK_INCLUDE_PUBLIC_IP: "{{ valheim_webhook_include_public_ip }}"
-#   PRESET: "{{ valheim_preset }}"
-#   MODIFIERS: "{{ valheim_modifiers }}"
-#   SET_KEY: "{{ valheim_set_key }}"
-#   MODS: "{{ valheim_mods }}"
-#   ADDITIONAL_STEAMCMD_ARGS: "{{ valheim_additional_steamcmd_args }}"
+  # WEBHOOK_URL: "{{ valheim_webhook_url }}"
+  # WEBHOOK_INCLUDE_PUBLIC_IP: "{{ valheim_webhook_include_public_ip }}"
+  # PRESET: "{{ valheim_preset }}"
+  # MODIFIERS: "{{ valheim_modifiers }}"
+  # SET_KEY: "{{ valheim_set_key }}"
+  # MODS: "{{ valheim_mods }}"
+  # ADDITIONAL_STEAMCMD_ARGS: "{{ valheim_additional_steamcmd_args }}"
diff --git a/roles/valheim/tasks/main.yml b/roles/valheim/tasks/main.yml
@@ -25,7 +25,7 @@
           - "{{ valheim_port_a }}:2456/udp"
           - "{{ valheim_port_b }}:2457/udp"
           - "{{ valheim_port_c }}:2458/udp"
-        env: "{{ valheim_optional_env | default({}) | combine(valheim_env) }}"
+        env: "{{ valheim_env }}"
         restart_policy: unless-stopped
         memory: "{{ valheim_memory }}"
         capabilities: