ctucx.git: ansible-configs

replace include with import_tasks

diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml
@@ -8,5 +8,5 @@
   when:
     - ansible_distribution == "Alpine"
 
-- include: wanderduene.yml
+- import_tasks: wanderduene.yml
   when: system.hostname == "wanderduene"

diff --git a/roles/bind/tasks/main.yml b/roles/bind/tasks/main.yml
@@ -1,27 +1,27 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.bind.enable is defined
     - services.bind.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.bind.enable is defined
     - services.bind.enable is true
 
-- include: firewall.yml
+- import_tasks: firewall.yml
   when:
     - services.bind.enable is defined
     - services.bind.enable is true
     - network.nftables.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.bind.enable is defined
     - services.bind.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.bind.enable is defined
     - services.bind.enable is false

diff --git a/roles/cgit/tasks/main.yml b/roles/cgit/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.cgit.enable is defined
     - services.cgit.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.cgit.enable is defined
     - services.cgit.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.cgit.enable is defined
     - services.cgit.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.cgit.enable is defined
     - services.cgit.enable is true
     - services.cgit.nginx.enable is defined
     - services.cgit.nginx.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.cgit.enable is defined
     - services.cgit.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.cgit.enable is defined
     - services.cgit.enable is false

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
@@ -6,35 +6,35 @@
 #     msg: This role only works on AlpineLinux and ArchLinux
 #   when: (ansible_distribution != "Alpine") or (ansible_distribution != "Archlinux")
 
-- include: packages.yml
+- import_tasks: packages.yml
 
-- include: fstab.yml
+- import_tasks: fstab.yml
   when: system.fstab is defined
 
-- include: timezone.yml
+- import_tasks: timezone.yml
   when: system.timezone is defined
 
-- include: network_general.yml
+- import_tasks: network_general.yml
 
-- include: network_alpine.yml
+- import_tasks: network_alpine.yml
   when: ansible_distribution == "Alpine"
 
-- include: network_ip-forwarding.yml
+- import_tasks: network_ip-forwarding.yml
   when: network.ipForwarding is defined 
 
-- include: firewall-nftables.yml
+- import_tasks: firewall-nftables.yml
   when: network.nftables.enable is defined 
 
-- include: ntp.yml
+- import_tasks: ntp.yml
   when: system.useNTP is defined
 
-- include: sudo.yml
+- import_tasks: sudo.yml
   when: system.enableSudo is defined
 
-- include: users.yml
+- import_tasks: users.yml
   when: system.users is defined
 
-- include: node-exporter.yml
+- import_tasks: node-exporter.yml
   when: services.prometheus_node_exporter is defined
 
 - meta: flush_handlers

diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
@@ -1,21 +1,21 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.dnsmasq.enable is defined
     - services.dnsmasq.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.dnsmasq.enable is defined
     - services.dnsmasq.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.dnsmasq.enable is defined
     - services.dnsmasq.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.dnsmasq.enable is defined
     - services.dnsmasq.enable is false

diff --git a/roles/fritzboxExporter/tasks/main.yaml b/roles/fritzboxExporter/tasks/main.yaml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.fritzboxExporter.enable is defined
     - services.fritzboxExporter.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.fritzboxExporter.enable is defined
     - services.fritzboxExporter.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.fritzboxExporter.enable is defined
     - services.fritzboxExporter.enable is true
     - services.fritzboxExporter.nginx.enable is defined
     - services.fritzboxExporter.nginx.enable is true
 
-- include: firewall.yml
+- import_tasks: firewall.yml
   when:
     - network.nftables.enable is true
     - services.fritzboxExporter.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.fritzboxExporter.enable is defined
     - services.fritzboxExporter.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.fritzboxExporter.enable is defined
     - services.fritzboxExporter.enable is false

diff --git a/roles/frpc/tasks/main.yml b/roles/frpc/tasks/main.yml
@@ -6,22 +6,22 @@
     - system.enableOwnRepos is false
 
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.frpc.enable is defined
     - services.frpc.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.frpc.enable is defined 
     - services.frpc.enable is true 
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.frpc.enable is defined 
     - services.frpc.enable is true 
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.frpc.enable is defined 
     - services.frpc.enable is true 

diff --git a/roles/frps/tasks/main.yml b/roles/frps/tasks/main.yml
@@ -5,29 +5,29 @@
     - services.frps.enable is defined and services.frps.enable is true
     - system.enableOwnRepos is false
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.frps.enable is defined
     - services.frps.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.frps.enable is defined
     - services.frps.enable is true 
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.frps.enable is defined
     - services.frps.enable is true 
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.frps.enable is defined
     - services.frps.enable is true 
     - services.frps.nginx.enable is defined
     - services.frps.nginx.enable is true 
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.frps.enable is defined
     - services.frps.enable is true 

diff --git a/roles/gitolite/tasks/main.yml b/roles/gitolite/tasks/main.yml
@@ -1,21 +1,21 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.gitolite.enable is defined
     - services.gitolite.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.gitolite.enable is defined
     - services.gitolite.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.gitolite.enable is defined
     - services.gitolite.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.gitolite.enable is defined
     - services.gitolite.enable is false

diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
@@ -1,40 +1,40 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.grafana.enable is defined
     - services.grafana.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.grafana.enable is defined
     - services.grafana.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.grafana.enable is defined
     - services.grafana.enable is true
 
-- include: provisioning.yml
+- import_tasks: provisioning.yml
   when:
     - services.grafana.enable is defined
     - services.grafana.enable is true
     - services.grafana.provisioning.enable is defined
     - services.grafana.provisioning.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.grafana.enable is defined
     - services.grafana.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.grafana.enable is defined
     - services.grafana.enable is true
     - services.grafana.nginx is defined
     - services.grafana.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.grafana.enable is defined
     - services.grafana.enable is false

diff --git a/roles/hostapd/tasks/main.yml b/roles/hostapd/tasks/main.yml
@@ -1,21 +1,21 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.hostapd.enable is defined
     - services.hostapd.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.hostapd.enable is defined
     - services.hostapd.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.hostapd.enable is defined
     - services.hostapd.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.hostapd.enable is defined
     - services.hostapd.enable is false

diff --git a/roles/influxdb/tasks/main.yml b/roles/influxdb/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.influxdb.enable is defined
     - services.influxdb.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.influxdb.enable is defined
     - services.influxdb.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.influxdb.enable is defined
     - services.influxdb.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.influxdb.enable is defined
     - services.influxdb.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.influxdb.enable is defined
     - services.influxdb.enable is true
     - services.influxdb.nginx is defined
     - services.influxdb.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.influxdb.enable is defined
     - services.influxdb.enable is false

diff --git a/roles/maddy/tasks/main.yml b/roles/maddy/tasks/main.yml
@@ -1,31 +1,31 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.maddy.enable is defined
     - services.maddy.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.maddy.enable is defined
     - services.maddy.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.maddy.enable is defined
     - services.maddy.enable is true
 
-- include: firewall.yml
+- import_tasks: firewall.yml
   when:
     - services.maddy.enable is defined
     - services.maddy.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.maddy.enable is defined
     - services.maddy.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.maddy.enable is defined
     - services.maddy.enable is false

diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
@@ -1,17 +1,17 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.mariadb.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.mariadb.enable is true
 
-- include: state.yml
+- import_tasks: state.yml
   when:
     - services.mariadb.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.mariadb.enable is false

diff --git a/roles/mbusd/tasks/main.yml b/roles/mbusd/tasks/main.yml
@@ -1,26 +1,26 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.mbusd.enable is defined
     - services.mbusd.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.mbusd.enable is defined
     - services.mbusd.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.mbusd.enable is defined
     - services.mbusd.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.mbusd.enable is defined
     - services.mbusd.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.mbusd.enable is defined
     - services.mbusd.enable is false

diff --git a/roles/mosquitto/tasks/main.yml b/roles/mosquitto/tasks/main.yml
@@ -1,21 +1,21 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.mosquitto.enable is defined
     - services.mosquitto.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.mosquitto.enable is defined
     - services.mosquitto.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.mosquitto.enable is defined
     - services.mosquitto.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.mosquitto.enable is defined
     - services.mosquitto.enable is false

diff --git a/roles/nfsserver/tasks/main.yml b/roles/nfsserver/tasks/main.yml
@@ -1,26 +1,26 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.nfsserver.enable is defined
     - services.nfsserver.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.nfsserver.enable is defined
     - services.nfsserver.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.nfsserver.enable is defined
     - services.nfsserver.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.nfsserver.enable is defined
     - services.nfsserver.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.nfsserver.enable is defined
     - services.nfsserver.enable is false

diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.nginx.enable is defined
     - services.nginx.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.nginx.enable is defined
     - services.nginx.enable is true
 
-- include: vhosts.yml
+- import_tasks: vhosts.yml
   when:
     - services.nginx.enable is defined
     - services.nginx.enable is true
     - services.nginx.vhosts is defined
 
-- include: firewall.yml
+- import_tasks: firewall.yml
   when:
     - services.nginx.enable is defined
     - services.nginx.enable is true
     - network.nftables.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.nginx.enable is defined
     - services.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.nginx.enable is defined
     - services.nginx.enable is false

diff --git a/roles/oeffi-web/tasks/main.yml b/roles/oeffi-web/tasks/main.yml
@@ -1,28 +1,28 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.oeffi_web.enable is defined
     - services.oeffi_web.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.oeffi_web.enable is defined
     - services.oeffi_web.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.oeffi_web.enable is defined
     - services.oeffi_web.enable is true
     - services.oeffi_web.nginx.enable is defined
     - services.oeffi_web.nginx.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.oeffi_web.enable is defined
     - services.oeffi_web.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.oeffi_web.enable is defined
     - services.oeffi_web.enable is false

diff --git a/roles/oeffisearch/tasks/main.yml b/roles/oeffisearch/tasks/main.yml
@@ -1,28 +1,28 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.oeffisearch.enable is defined
     - services.oeffisearch.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.oeffisearch.enable is defined
     - services.oeffisearch.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.oeffisearch.enable is defined
     - services.oeffisearch.enable is true
     - services.oeffisearch.nginx.enable is defined
     - services.oeffisearch.nginx.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.oeffisearch.enable is defined
     - services.oeffisearch.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.oeffisearch.enable is defined
     - services.oeffisearch.enable is false

diff --git a/roles/openssh/tasks/main.yml b/roles/openssh/tasks/main.yml
@@ -1,27 +1,27 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.openssh.enable is defined
     - services.openssh.enable is true
 
-- include: firewall.yml
+- import_tasks: firewall.yml
   when:
     - services.openssh.enable is defined
     - services.openssh.enable is true
     - network.nftables.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.openssh.enable is defined
     - services.openssh.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.openssh.enable is defined
     - services.openssh.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.openssh.enable is defined
     - services.openssh.enable is false

diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml
@@ -1,32 +1,32 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.php_fpm.enable is defined
     - services.php_fpm.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.php_fpm.enable is defined
     - services.php_fpm.enable is true
 
-- include: extraModules.yml
+- import_tasks: extraModules.yml
   when:
     - services.php_fpm.enable is defined
     - services.php_fpm.enable is true
     - services.php_fpm.extraModules is defined
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.php_fpm.enable is defined
     - services.php_fpm.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.php_fpm.enable is defined
     - services.php_fpm.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.php_fpm.enable is defined
     - services.php_fpm.enable is false

diff --git a/roles/pleroma/tasks/main.yml b/roles/pleroma/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.pleroma.enable is defined
     - services.pleroma.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.pleroma.enable is defined
     - services.pleroma.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.pleroma.enable is defined
     - services.pleroma.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.pleroma.enable is defined
     - services.pleroma.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.pleroma.enable is defined
     - services.pleroma.enable is true
     - services.pleroma.nginx is defined
     - services.pleroma.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.pleroma.enable is defined
     - services.pleroma.enable is false

diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
@@ -1,16 +1,16 @@
 ---
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.postgresql.enable is defined
     - services.postgresql.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.postgresql.enable is defined
     - services.postgresql.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.postgresql.enable is defined
     - services.postgresql.enable is false

diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.prometheus.enable is defined
     - services.prometheus.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.prometheus.enable is defined
     - services.prometheus.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.prometheus.enable is defined
     - services.prometheus.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.prometheus.enable is defined
     - services.prometheus.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.prometheus.enable is defined
     - services.prometheus.enable is true
     - services.prometheus.nginx is defined
     - services.prometheus.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.prometheus.enable is defined
     - services.prometheus.enable is false

diff --git a/roles/radicale/tasks/checks.yml b/roles/radicale/tasks/checks.yml
@@ -1,16 +1,9 @@
-
-- fail: msg="Option 'services.radicale.configFile' has to be set!"
-  when:
-    - services.radicale.configFile is not defined
+---
 
 - fail: msg="Option 'services.radicale.users' has to be set!"
   when:
     - services.radicale.users is not defined
 
-- fail: msg="Option 'services.radicale.configFile' has to be set!"
-  when:
-    - services.radicale.configFile is not defined
-
 
 - fail: msg="Nginx role has to be enabled when using nginx options!"
   when:

diff --git a/roles/radicale/tasks/main.yml b/roles/radicale/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.radicale.enable is defined
     - services.radicale.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.radicale.enable is defined
     - services.radicale.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.radicale.enable is defined
     - services.radicale.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.radicale.enable is defined
     - services.radicale.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.radicale.enable is defined
     - services.radicale.enable is true
     - services.radicale.nginx.enable is defined
     - services.radicale.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.radicale.enable is defined
     - services.radicale.enable is false

diff --git a/roles/rest-server/tasks/main.yml b/roles/rest-server/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.rest_server.enable is defined
     - services.rest_server.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.rest_server.enable is defined
     - services.rest_server.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.rest_server.enable is defined
     - services.rest_server.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.rest_server.enable is defined
     - services.rest_server.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.rest_server.enable is defined
     - services.rest_server.enable is true
     - services.rest_server.nginx is defined
     - services.rest_server.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.rest_server.enable is defined
     - services.rest_server.enable is false

diff --git a/roles/serial2tcp/tasks/main.yml b/roles/serial2tcp/tasks/main.yml
@@ -1,26 +1,26 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.serial2tcp.enable is defined
     - services.serial2tcp.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.serial2tcp.enable is defined
     - services.serial2tcp.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.serial2tcp.enable is defined
     - services.serial2tcp.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.serial2tcp.enable is defined
     - services.serial2tcp.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.serial2tcp.enable is defined
     - services.serial2tcp.enable is false

diff --git a/roles/smartied/tasks/main.yml b/roles/smartied/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.smartied.enable is defined
     - services.smartied.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.smartied.enable is defined
     - services.smartied.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.smartied.enable is defined
     - services.smartied.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.smartied.enable is defined
     - services.smartied.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.smartied.enable is defined
     - services.smartied.enable is true
     - services.smartied.nginx is defined
     - services.smartied.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.smartied.enable is defined
     - services.smartied.enable is false

diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml
@@ -1,33 +1,33 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.synapse.enable is defined
     - services.synapse.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.synapse.enable is defined
     - services.synapse.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.synapse.enable is defined
     - services.synapse.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.synapse.enable is defined
     - services.synapse.enable is true
 
-- include: nginx.yml
+- import_tasks: nginx.yml
   when:
     - services.synapse.enable is defined
     - services.synapse.enable is true
     - services.synapse.nginx is defined
     - services.synapse.nginx.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.synapse.enable is defined
     - services.synapse.enable is false

diff --git a/roles/zigbee2mqtt/tasks/main.yml b/roles/zigbee2mqtt/tasks/main.yml
@@ -1,26 +1,26 @@
 ---
 
-- include: checks.yml
+- import_tasks: checks.yml
   when:
     - services.zigbee2mqtt.enable is defined
     - services.zigbee2mqtt.enable is true
 
-- include: install.yml
+- import_tasks: install.yml
   when:
     - services.zigbee2mqtt.enable is defined
     - services.zigbee2mqtt.enable is true
 
-- include: configure.yml
+- import_tasks: configure.yml
   when:
     - services.zigbee2mqtt.enable is defined
     - services.zigbee2mqtt.enable is true
 
-- include: start.yml
+- import_tasks: start.yml
   when:
     - services.zigbee2mqtt.enable is defined
     - services.zigbee2mqtt.enable is true
 
-- include: remove.yml
+- import_tasks: remove.yml
   when:
     - services.zigbee2mqtt.enable is defined
     - services.zigbee2mqtt.enable is false