samsapti/lab-ansible
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Intersect apps_backup with apps_include

Browse source
This commit is contained in:
Sam A. 2023-11-11 14:51:43 +01:00
parent 646bfa4e85
commit c816f3d551
Signed by: samsapti
GPG key ID: CBBBE7371E81C4EA
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/apps/defaults/main.yml
View file

@ -56,7 +56,7 @@ apps_vars:
version: '1.6.0' version: '1.6.0'
apps_include: "{{ apps_vars | dict2items | map(attribute='key') | list }}" apps_include: "{{ apps_vars | dict2items | map(attribute='key') | list }}"
apps_backup: "{{ apps_vars | dict2items | selectattr('value.backup', 'true') | map(attribute='key') | list }}" apps_backup: "{{ apps_vars | dict2items | selectattr('value.backup', 'true') | map(attribute='key') | list | intersect(apps_include) }}"
apps_proxied: "{{ apps_vars | dict2items | selectattr('value.domain', 'defined') | map(attribute='key') | list | intersect(apps_include) }}" apps_proxied: "{{ apps_vars | dict2items | selectattr('value.domain', 'defined') | map(attribute='key') | list | intersect(apps_include) }}"
apps_sender_domains: apps_sender_domains:

2
roles/apps/templates/compose-files/restic.yml.j2
View file

@ -31,9 +31,7 @@ services:
- "/var/run/docker.sock:/var/run/docker.sock:rw" - "/var/run/docker.sock:/var/run/docker.sock:rw"
- "/usr/libexec/docker/cli-plugins/docker-compose:/usr/libexec/docker/cli-plugins/docker-compose:ro" - "/usr/libexec/docker/cli-plugins/docker-compose:/usr/libexec/docker/cli-plugins/docker-compose:ro"
{% for app in apps_backup %} {% for app in apps_backup %}
{% if app in apps_include %}
- "{{ apps_data_root }}/{{ app }}/data:/mnt/volumes/{{ app }}:ro" - "{{ apps_data_root }}/{{ app }}/data:/mnt/volumes/{{ app }}:ro"
{% endif %}
{% endfor %} {% endfor %}
prune: prune: