Simplify task includes

playbooks/prod_web.yml

@@ -12,24 +12,16 @@
     - name: ensure docker network
       docker_network: name=web
       tags: [ docker ]
-    - name: include tasks for apps
-      include_tasks: tasks/app/{{ task }}
+    - name: include tasks for applications
+      include_tasks: tasks/{{ item }}
       with_items:
-        - gulagbot.yml
-        - redis.yml
-      loop_control:
-        loop_var: task
-      tags: [ always ]
-    - name: include tasks for web services
-      include_tasks: tasks/web/{{ task }}
-      with_items:
-        - 9iron.yml
-        - desultd.yml
-        - gitea.yml
-        - nextcloud.yml
-        - srv.yml
-      loop_control:
-        loop_var: task
+        - app/gulagbot.yml
+        - app/redis.yml
+        - web/9iron.yml
+        - web/desultd.yml
+        - web/gitea.yml
+        - web/nextcloud.yml
+        - web/srv.yml
       tags: [ always ]
   roles:
     - role: backup
@@ -89,21 +81,12 @@
     - name: ensure docker network
       docker_network: name=web
       tags: [ docker ]
-    - name: include tasks for apps
-      include_tasks: tasks/app/{{ task }}
+    - name: include tasks for applications
+      include_tasks: tasks/{{ item }}
       with_items:
-        - redis.yml
-      loop_control:
-        loop_var: task
-      tags: [ always ]
-    - name: include tasks for web services
-      include_tasks: tasks/web/{{ task }}
-      with_items:
-        - peertube.yml
-        - pleroma.yml
-        - ingress-generic.yml
-      loop_control:
-        loop_var: task
+        - app/redis.yml
+        - web/peertube.yml
+        - web/pleroma.yml
       tags: [ always ]
   roles:
     - role: backup
@@ -129,21 +112,13 @@
     - name: ensure docker network
       docker_network: name=web
       tags: [ docker ]
-    - name: include tasks for apps
-      include_tasks: tasks/app/{{ task }}
+    - name: include tasks for applications
+      include_tasks: tasks/{{ item }}
       with_items:
-        - redis.yml
-      loop_control:
-        loop_var: task
-      tags: [ always ]
-    - name: include tasks for web services
-      include_tasks: tasks/web/{{ task }}
-      with_items:
-        - movienight.yml
-        - netbox.yml
-        - nagios.yml
-      loop_control:
-        loop_var: task
+        - app/redis.yml
+        - web/movienight.yml
+        - web/netbox.yml
+        - web/nagios.yml
       tags: [ always ]
   roles:
     - role: backup