From 77a7021f77bcb4bec8f35593f140a2d9c93adae5 Mon Sep 17 00:00:00 2001 From: Anarion Date: Mon, 18 Mar 2024 09:24:55 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Simplified=20env=20vars?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/valheim/defaults/main.yml | 16 +++++++--------- roles/valheim/tasks/main.yml | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/roles/valheim/defaults/main.yml b/roles/valheim/defaults/main.yml index e402d3e0a2..c050e4fcc9 100644 --- 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 index 08a6a03dd0..4252949599 100644 --- 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: