feat: prerequisites for compose-based service deployment (#9)

* refactor: move to main subdir

* refactor(vars): docker vars section

* feat: change directory structure

BREAKING CHANGE

* chore: add file template for env vars

* lint: resolve yamllint errors

defaults/main.yml → defaults/main/main.yml

@@ -25,18 +25,14 @@ infra_directory_path: '/opt/infra'
 infra_directory_owner: "{{ infra_user_name }}"
 infra_directory_group: "{{ infra_group_name }}"
 infra_directory_mode: 740
-# Subdirectories
-infra_subdirectories:
-  cfg:
-    path: "{{ infra_directory_path }}/cfg"
-  log:
-    path: "{{ infra_directory_path }}/log"
-  data:
-    path: "{{ infra_directory_path }}/data"
 
-### Services ###
+### Docker ###
 # Default restart policy
-infra_restart_policy: 'always'
+infra_restart_policy: always
+# Max. wait time for compose deployment
+infra_compose_wait_timeout: 60
+
+### Services ###
 # Whether to force pull container images
 infra_force_pull: false
 # Configure Graylog

tasks/deploy_pihole.yml

@@ -36,7 +36,7 @@
       community.docker.docker_network_info:
         name: "{{ svc_docker_network_name }}"
       register: _svc_net_res
-    
+
     - name: Set svc_network_subnet fact
       ansible.builtin.set_fact:
         _svc_network_subnet: "{{ _svc_net_res.network.IPAM.Config[0].Subnet }}"
@@ -82,10 +82,10 @@
     - name: Set DNS environment variable setting for pihole
       ansible.builtin.set_fact:
         infra_pihole_env_vars_dns: {
-          'PIHOLE_DNS_': "{{ 
-            _infra_unbound_container_deployment.container.NetworkSettings.Networks[svc_docker_network_name].IPAddress + 
-            '#' + (infra_unbound_listening_port | string) 
-            if infra_use_unbound else '' 
+          'PIHOLE_DNS_': "{{
+            _infra_unbound_container_deployment.container.NetworkSettings.Networks[svc_docker_network_name].IPAddress +
+            '#' + (infra_unbound_listening_port | string)
+            if infra_use_unbound else ''
           }}"
         }
       when:

tasks/directories.yml

@@ -7,12 +7,4 @@
     group: "{{ infra_directory_group }}"
     mode: "{{ infra_directory_mode }}"
 
-- name: Ensure infra_directory subdirectories are present
-  ansible.builtin.file:
-    path: "{{ item.value.path }}"
-    state: directory
-    owner: "{{ item.value.owner | default(infra_directory_owner) }}"
-    group: "{{ item.value.group | default(infra_directory_group) }}"
-    mode: "{{ item.value.mode | default(infra_directory_mode) }}"
-  with_dict: "{{ infra_subdirectories }}"
 ...

tasks/main.yml

@@ -1,15 +1,4 @@
 ---
-- name: Load OS-specific vars
-  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
-  vars:
-    params:
-      files:
-        - "{{ ansible_distribution | lower }}.yml"
-        - "{{ ansible_os_family | lower }}.yml"
-        - 'main.yml'
-      paths:
-        - 'vars'
-
 # Gather user facts
 - name: Include 'user_facts' tasks
   ansible.builtin.import_tasks: user_facts.yml

templates/template.env.j2

@@ -0,0 +1,4 @@
+# {{ ansible_managed }}
+{% for key, val in _env_vars.items() %}
+{{ key }}={{ val }}
+{% endfor %}

vars/main.yml → vars/main/main.yml

@@ -1,4 +1,9 @@
 ---
+### Docker ###
+# Shared labels for the Docker volumes
+infra_docker_volume_shared_labels:
+  netr0m.ansible-role: infra
+
 # Environment variables for the Unifi container
 infra_unifi_env_vars:
   PUID: "{{ infra_user_uid | string }}"