Commit 99eaf89d authored by Nick Busey's avatar Nick Busey

Merge branch 'jinja-when' into 'master'

Fixes Ansible deprecations about Jinja templates in when conditions

See merge request !37
parents 87e217e1 ac51c452
Pipeline #42943697 passed with stages
in 29 seconds
......@@ -45,6 +45,47 @@ enable_tick: False
enable_transmission: False
enable_xfinityusageinfluxdb: False
enabled_services:
tinc: "{{ enable_tinc }}"
tor: "{{ enable_tor }}"
apple_health_influx: "{{ enable_apple_health_influx }}"
bitwarden: "{{ enable_bitwarden }}"
bulletnotes: "{{ enable_bulletnotes }}"
darksky_influx: "{{ enable_darksky_influx }}"
dasher: "{{ enable_dasher }}"
docs: "{{ enable_docs }}"
emby: "{{ enable_emby }}"
firefly_iii: "{{ enable_firefly_iii }}"
gitea: "{{ enable_gitea }}"
grafana: "{{ enable_grafana }}"
homeassistant: "{{ enable_homeassistant }}"
homedash: "{{ enable_homedash }}"
inventario: "{{ enable_inventario }}"
jackett: "{{ enable_jackett }}"
kibitzr: "{{ enable_kibitzr }}"
mashio: "{{ enable_mashio }}"
matomo: "{{ enable_matomo }}"
miniflux: "{{ enable_miniflux }}"
minio: "{{ enable_minio }}"
monicahq: "{{ enable_monicahq }}"
nextcloud: "{{ enable_nextcloud }}"
nzbget: "{{ enable_nzbget }}"
openldap: "{{ enable_openldap }}"
openvpn: "{{ enable_openvpn }}"
organizr: "{{ enable_organizr }}"
paperless: "{{ enable_paperless }}"
pihole: "{{ enable_pihole }}"
plex: "{{ enable_plex }}"
portainer: "{{ enable_portainer }}"
sonarr: "{{ enable_sonarr }}"
radarr: "{{ enable_radarr }}"
restic: "{{ enable_restic }}"
syncthing: "{{ enable_syncthing }}"
thelounge: "{{ enable_thelounge }}"
tick: "{{ enable_tick }}"
transmission: "{{ enable_transmission }}"
xfinityusageinfluxdb: "{{ enable_xfinityusageinfluxdb }}"
darksky_key:
latitude:
longitude:
......
......@@ -75,7 +75,7 @@
- name: Deploy enabled services.
include_role:
name: "{{ item }}"
when: enable_{{ item }}
when: "enabled_services[item]"
with_items:
- "{{ services }}"
......@@ -83,7 +83,7 @@
systemd:
name: "{{ item }}"
state: stopped
when: enable_{{ item }} == False
when: "not enabled_services[item]"
with_items:
- "{{ services }}"
ignore_errors: "yes"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment