ansible-galaxy/wireguard-ui
1
0
Fork 0
mirror of https://gitea.0xace.cc/ansible-galaxy/wireguard-ui.git synced 2024-11-24 23:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix combined volumes end envs

Browse Source
This commit is contained in:
ace 2022-07-13 21:44:35 +03:00
parent 8b8d89f213
commit 2df5e60dc1
No known key found for this signature in database
GPG Key ID: 2E47CC17BA7F8CF0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handlers/main.yaml
View File

@ -7,8 +7,8 @@
container_default_behavior: no_defaults
detach: true
restart_policy: unless-stopped
env: "{{ wireguard_ui_combined_env }}"
volumes: "{{ wireguard_ui_combined_volumes }}"
env: "{{ wireguard_ui_env }}"
volumes: "{{ wireguard_ui_volumes }}"
when:
- wireguard_ui_container_engine == 'docker'
- not wireguard_ui_container.changed
@ -21,8 +21,8 @@
image: "{{ wireguard_ui_container_registry }}/{{ wireguard_ui_image_name }}:{{ wireguard_ui_image_tag }}"
state: started
restart: yes
env: "{{ wireguard_ui_combined_env }}"
volumes: "{{ wireguard_ui_combined_volumes }}"
env: "{{ wireguard_ui_env }}"
volumes: "{{ wireguard_ui_volumes }}"
when:
- wireguard_ui_container_engine == 'podman'
- not wireguard_ui_container.changed

4
tasks/RedHat/podman.yaml
View File

@ -23,8 +23,8 @@
network_mode: "{{ wireguard_ui_network_mode }}"
image: "{{ wireguard_ui_container_registry }}/{{ wireguard_ui_image_name }}:{{ wireguard_ui_image_tag }}"
state: created
env: "{{ wireguard_ui_combined_env }}"
volumes: "{{ wireguard_ui_combined_volumes }}"
env: "{{ wireguard_ui_env }}"
volumes: "{{ wireguard_ui_volumes }}"
register: wireguard_ui_container
notify: Restart WireGuard UI with podman

6
tasks/main.yaml
View File

@ -14,12 +14,12 @@
- name: Merge volumes
set_fact:
wireguard_ui_combined_volumes: "{{ wireguard_ui_default_volumes | default({}) + [item.key +':'+ item.value] }}"
loop: "{{ wireguard_ui_volumes | default({}) | dict2items }}"
wireguard_ui_volumes: "{{ wireguard_ui_volumes | default([]) + [item.key +':'+ item.value] }}"
loop: "{{ wireguard_ui_default_volumes | dict2items }}"
- name: Merge ENV
set_fact:
wireguard_ui_combined_env: "{{ wireguard_ui_default_env | combine(wireguard_ui_env, recursive=true) }}"
wireguard_ui_env: "{{ wireguard_ui_default_env | combine(wireguard_ui_env | default({}), recursive=true) }}"
- name: "Install WireGuard UI for {{ ansible_facts['os_family'] }}"
include_tasks: "{{ ansible_facts['os_family'] }}/main.yaml"