refactor: split basic ansible task list for compose services into contrib/docker_compose_template_task_list.yml

.idea/jsonSchemas.xml

@@ -19,6 +19,24 @@
             </SchemaInfo>
           </value>
         </entry>
+        <entry key="Traefik v2 File Provider">
+          <value>
+            <SchemaInfo>
+              <option name="generatedName" value="New Schema" />
+              <option name="name" value="Traefik v2 File Provider" />
+              <option name="relativePathToSchema" value="https://json.schemastore.org/traefik-v2-file-provider.json" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="directory" value="true" />
+                    <option name="path" value="roles/traefik/templates/rules" />
+                    <option name="mappingKind" value="Directory" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
       </map>
     </state>
   </component>

contrib/docker_compose_template_task_list.yml

@@ -0,0 +1,33 @@
+# https://stackoverflow.com/questions/41667864/can-the-templates-module-handle-multiple-templates-directories
+
+- name: Ensure service directory exists
+  file:
+    path: "{{ current_svc_path }}"
+    state: directory
+    mode: "500"
+
+- name: Ensure directory structure exists
+  file:
+    path: "{{ current_svc_path }}/{{ item.path }}"
+    state: directory
+    mode: "500"
+  with_community.general.filetree: "{{ templates_source }}"
+  when: item.state == "directory"
+
+
+- name: Include app config variables
+  include_vars:
+    file: "{{ role_path }}/vars/app_config.yml"
+
+- name: Generate {{ current_svc_name }} deployment from templates
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ current_svc_path }}/{{ item.path | regex_replace('\\.j2$', '') }}"
+    mode: "400"
+  with_community.general.filetree: "{{ templates_source }}"
+  when: item.state == "file"
+
+- name: Deploy docker-compose for {{ current_svc_name }}
+  community.docker.docker_compose:
+    project_src: "{{ current_svc_path }}"
+    state: present

roles/common/tasks/main.yml

@@ -16,6 +16,7 @@
       - docker-fish-completion
       - docker-compose-fish-completion
       - zfs
+      - zfs-utils-py
     state: latest
     update_cache: yes
   register: apk_installs

roles/gitea/tasks/main.yml

@@ -1,33 +1,2 @@
-# https://stackoverflow.com/questions/41667864/can-the-templates-module-handle-multiple-templates-directories
+- name: "Docker compose steps for {{ current_svc_name }}"
-
+  import_tasks: "{{ playbook_dir }}/contrib/docker_compose_template_task_list.yml"
-- name: Ensure service directory exists
-  file:
-    path: "{{ current_svc_path }}"
-    state: directory
-    mode: "500"
-
-- name: Ensure directory structure exists
-  file:
-    path: "{{ current_svc_path }}/{{ item.path }}"
-    state: directory
-    mode: "500"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "directory"
-
-
-- name: Include app config variables
-  include_vars:
-    file: "{{ role_path }}/vars/app_config.yml"
-
-- name: Generate {{ current_svc_name }} deployment from templates
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ current_svc_path }}/{{ item.path | regex_replace('\\.j2$', '') }}"
-    mode: "400"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "file"
-
-- name: Deploy docker-compose for {{ current_svc_name }}
-  community.docker.docker_compose:
-    project_src: "{{ current_svc_path }}"
-    state: present

roles/jellyfin/tasks/main.yml

@@ -1,33 +1,2 @@
-# https://stackoverflow.com/questions/41667864/can-the-templates-module-handle-multiple-templates-directories
+- name: "Docker compose steps for {{ current_svc_name }}"
-
+  import_tasks: "{{ playbook_dir }}/contrib/docker_compose_template_task_list.yml"
-- name: Ensure service directory exists
-  file:
-    path: "{{ current_svc_path }}"
-    state: directory
-    mode: "500"
-
-- name: Ensure directory structure exists
-  file:
-    path: "{{ current_svc_path }}/{{ item.path }}"
-    state: directory
-    mode: "500"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "directory"
-
-
-- name: Include app config variables
-  include_vars:
-    file: "{{ role_path }}/vars/app_config.yml"
-
-- name: Generate {{ current_svc_name }} deployment from templates
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ current_svc_path }}/{{ item.path | regex_replace('\\.j2$', '') }}"
-    mode: "400"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "file"
-
-- name: Deploy docker-compose for {{ current_svc_name }}
-  community.docker.docker_compose:
-    project_src: "{{ current_svc_path }}"
-    state: present

roles/nextcloud/tasks/main.yml

@@ -1,33 +1,2 @@
-# https://stackoverflow.com/questions/41667864/can-the-templates-module-handle-multiple-templates-directories
+- name: "Docker compose steps for {{ current_svc_name }}"
-
+  import_tasks: "{{ playbook_dir }}/contrib/docker_compose_template_task_list.yml"
-- name: Ensure service directory exists
-  file:
-    path: "{{ current_svc_path }}"
-    state: directory
-    mode: "500"
-
-- name: Ensure directory structure exists
-  file:
-    path: "{{ current_svc_path }}/{{ item.path }}"
-    state: directory
-    mode: "500"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "directory"
-
-
-- name: Include app config variables
-  include_vars:
-    file: "{{ role_path }}/vars/app_config.yml"
-
-- name: Generate {{ current_svc_name }} deployment from templates
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ current_svc_path }}/{{ item.path | regex_replace('\\.j2$', '') }}"
-    mode: "400"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "file"
-
-- name: Deploy docker-compose for {{ current_svc_name }}
-  community.docker.docker_compose:
-    project_src: "{{ current_svc_path }}"
-    state: present

roles/traefik/tasks/main.yml

@@ -1,33 +1,2 @@
-# https://stackoverflow.com/questions/41667864/can-the-templates-module-handle-multiple-templates-directories
+- name: "Docker compose steps for {{ current_svc_name }}"
-
+  import_tasks: "{{ playbook_dir }}/contrib/docker_compose_template_task_list.yml"
-- name: Ensure service directory exists
-  file:
-    path: "{{ current_svc_path }}"
-    state: directory
-    mode: "500"
-
-- name: Ensure directory structure exists
-  file:
-    path: "{{ current_svc_path }}/{{ item.path }}"
-    state: directory
-    mode: "500"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "directory"
-
-
-#- name: Include app config variables
-#  include_vars:
-#    file: "{{ role_path }}/vars/app_config.yml"
-
-- name: Generate {{ current_svc_name }} deployment from templates
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ current_svc_path }}/{{ item.path | regex_replace('\\.j2$', '') }}"
-    mode: "400"
-  with_community.general.filetree: "{{ templates_source }}"
-  when: item.state == "file"
-
-- name: Deploy docker-compose for {{ current_svc_name }}
-  community.docker.docker_compose:
-    project_src: "{{ current_svc_path }}"
-    state: present