refactor: update

Author: Nitestack

group_vars/all/main.yml

@@ -19,7 +19,7 @@ services:
   # AdGuard Home
   adguard_home:
     enabled: true
-    domain: "adguard.{{ domain }}"
+    domain: "dns.{{ domain }}"
     container_name: "adguard-home"
     port: 80
   # AdventureLog
@@ -47,7 +47,7 @@ services:
   # Beszel
   beszel:
     enabled: true
-    domain: "monitor.{{ domain }}"
+    domain: "status.{{ domain }}"
     container_name: "beszel"
     port: 8090
   # Calibre Web Automated
@@ -64,7 +64,7 @@ services:
     port: 3003
   ente_api:
     enabled: true
-    domain: "ente-api.{{ domain }}"
+    domain: "ente.{{ domain }}"
     container_name: "ente-museum"
     port: 8080
   # FreshRSS
@@ -100,7 +100,7 @@ services:
   # n8n
   n8n:
     enabled: false
-    domain: "automation.{{ domain }}"
+    domain: "automate.{{ domain }}"
     container_name: "n8n"
     port: 5678
   # NextCloud
@@ -111,7 +111,7 @@ services:
     port: 11000
   nextcloud_aio:
     enabled: true
-    domain: "nextcloud-aio.{{ domain }}"
+    domain: "nc-aio.{{ domain }}"
     container_name: "nextcloud-aio-mastercontainer"
     port: 8080
   # Personal Site
@@ -135,7 +135,7 @@ services:
   # wger
   wger:
     enabled: false
-    domain: "fit.{{ domain }}"
+    domain: "health.{{ domain }}"
     container_name: "wger-web"
     port: 8000
 

roles/service_deploy/defaults/main.yml

@@ -8,6 +8,9 @@ service_dir_name: ""
 # Directories to create for the service
 data_dirs: []
 
+# Additional downloads
+service_downloads: []
+
 # List of additional templates to copy
 service_templates: []
 

roles/service_deploy/tasks/main.yml

@@ -16,6 +16,7 @@
         group: 1000
         mode: "0755"
       become: true
+      when: data_dirs | length > 0
 
     - name: "Create and set permissions for additional data directories"
       ansible.builtin.file:
@@ -43,6 +44,15 @@
         mode: "0644"
       when: env_url != ""
 
+    - name: "Download additional files"
+      ansible.builtin.get_url:
+        url: "{{ item.url }}"
+        dest: "{{ service_dir }}/{{ item.dest }}"
+        mode: "0644"
+      loop: "{{ service_downloads }}"
+      loop_control:
+        label: "{{ item.dest }}"
+
     - name: "Check for compose.yml template for {{ service_name }}"
       ansible.builtin.stat:
         path: "{{ ansible_parent_role_paths[-1] }}/templates/compose.yml.j2"

roles/wger/tasks/main.yml

@@ -1,31 +1,4 @@
 ---
-- name: "Create and set permissions for wger data directories"
-  ansible.builtin.file:
-    path: "{{ wger_data_dir }}/{{ item }}"
-    state: directory
-    owner: 1000
-    group: 1000
-    mode: "0755"
-  loop:
-    - "static"
-    - "media"
-    - "db"
-    - "redis"
-    - "beat"
-  become: true
-
-- name: "Create service directory for wger"
-  ansible.builtin.file:
-    path: "{{ wger_service_dir }}"
-    state: directory
-    mode: "0755"
-
-- name: "Download redis.conf file for wger"
-  ansible.builtin.get_url:
-    url: "https://raw.githubusercontent.com/wger-project/docker/refs/heads/master/config/redis.conf"
-    dest: "{{ wger_service_dir }}/redis.conf"
-    mode: "0644"
-
 - name: Deploy wger
   ansible.builtin.include_role:
     name: service_deploy
@@ -34,3 +7,12 @@
     service_dir_name: "{{ wger_dir_name }}"
     compose_url: "https://raw.githubusercontent.com/wger-project/docker/b450305f141247494b43d94ca21a900810f9ee93/docker-compose.yml"
     env_url: "https://raw.githubusercontent.com/wger-project/docker/5545c354c4196321833a6f28d7559525946d805d/config/prod.env"
+    service_downloads:
+      - url: "https://raw.githubusercontent.com/wger-project/docker/refs/heads/master/config/redis.conf"
+        dest: "redis.conf"
+    data_dirs:
+      - "static"
+      - "media"
+      - "db"
+      - "redis"
+      - "beat"