From 7ff03ef46b6d5f97f037c22aec1e1c70af761610 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 29 Jan 2025 14:34:46 +0100
Subject: [PATCH] Solved minor bugs which appeared during refactoring

---
 .../all/{03_system_email.yml => 02_system_email.yml}     | 4 ++--
 group_vars/all/{02_domains.yml => 03_domains.yml}        | 0
 group_vars/all/06_paths.yml                              | 1 -
 playbook.constructor.yml                                 | 6 +++---
 roles/docker-compose/tasks/main.yml                      | 4 ----
 roles/health-nginx/templates/health-nginx.py.j2          | 2 +-
 roles/user-administrator/tasks/main.yml                  | 9 ---------
 7 files changed, 6 insertions(+), 20 deletions(-)
 rename group_vars/all/{03_system_email.yml => 02_system_email.yml} (67%)
 rename group_vars/all/{02_domains.yml => 03_domains.yml} (100%)

diff --git a/group_vars/all/03_system_email.yml b/group_vars/all/02_system_email.yml
similarity index 67%
rename from group_vars/all/03_system_email.yml
rename to group_vars/all/02_system_email.yml
index baee59a7..bb027c51 100644
--- a/group_vars/all/03_system_email.yml
+++ b/group_vars/all/02_system_email.yml
@@ -2,10 +2,10 @@
 default_system_email:
   local:     no-reply
   domain:    "{{primary_domain}}"
-  username:  "{{system_email.local}}@{{system_email.domain}}"
+  username:  "no-reply@{{primary_domain}}"
   host:      "mail.{{primary_domain}}"
   smtp_port: 465
   tls:       true
   start_tls: false
-  from:      "{{system_email.username}}"
+  from:      "no-reply@{{primary_domain}}"
   smtp:      true
\ No newline at end of file
diff --git a/group_vars/all/02_domains.yml b/group_vars/all/03_domains.yml
similarity index 100%
rename from group_vars/all/02_domains.yml
rename to group_vars/all/03_domains.yml
diff --git a/group_vars/all/06_paths.yml b/group_vars/all/06_paths.yml
index 4d85f05c..4ac2e980 100644
--- a/group_vars/all/06_paths.yml
+++ b/group_vars/all/06_paths.yml
@@ -2,6 +2,5 @@
 # Path Variables for Key Directories and Scripts
 path_administrator_home:                      "/home/administrator/"
 path_administrator_scripts:                   "/opt/scripts/"
-#path_docker_volumes:                          "{{path_administrator_home}}volumes/docker/"
 path_docker_compose_instances:                "/opt/docker/"
 path_system_lock_script:                      "/opt/scripts/system-maintenance-lock.py"
\ No newline at end of file
diff --git a/playbook.constructor.yml b/playbook.constructor.yml
index f8a91662..35850b18 100644
--- a/playbook.constructor.yml
+++ b/playbook.constructor.yml
@@ -2,12 +2,12 @@
 - name: Merge variables
   hosts: all
   tasks:
-  - name: Merge domain definitions
-    set_fact:
-      domains: "{{ default_domains | combine(domains | default({}, true)) }}"
   - name: Merge system_email definitions
     set_fact:
       system_email: "{{ default_system_email | combine(system_email | default({}, true)) }}"
+  - name: Merge domain definitions
+    set_fact:
+      domains: "{{ default_domains | combine(domains | default({}, true)) }}"
 
 - name: update device
   hosts:  all
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index c00caf4f..75fa2f0b 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -1,7 +1,3 @@
-- name: load docker compose dependencies
-  include_role:
-    name: docker-compose
-
 - name: "remove {{ docker_compose_instance_directory }} and all its contents"
   file:
     path: "{{ docker_compose_instance_directory }}"
diff --git a/roles/health-nginx/templates/health-nginx.py.j2 b/roles/health-nginx/templates/health-nginx.py.j2
index 9b3cccf9..da68dfa0 100644
--- a/roles/health-nginx/templates/health-nginx.py.j2
+++ b/roles/health-nginx/templates/health-nginx.py.j2
@@ -25,7 +25,7 @@ for filename in os.listdir(config_path):
         # Default: Expect status code 200 or 302 for a domain
         expected_statuses = [200,302]
         
-        redirected_domains = [domain['source'] for domain in {{redirect_domains_mappings}}]
+        redirected_domains = [domain['source'] for domain in {{redirect_domain_mappings}}]
         redirected_domains.append("{{domains.mailu}}")
 
         # Determine expected status codes based on the domain
diff --git a/roles/user-administrator/tasks/main.yml b/roles/user-administrator/tasks/main.yml
index e9c1c0da..5e00ee6c 100644
--- a/roles/user-administrator/tasks/main.yml
+++ b/roles/user-administrator/tasks/main.yml
@@ -46,15 +46,6 @@
   notify: sshd restart
   when: run_once_user_administrator is not defined
 
-- name: "create {{path_administrator_home}}volumes/"
-  file:
-    path: "{{path_administrator_home}}volumes"
-    state: directory
-    owner: administrator
-    group: administrator
-    mode: 0700
-  when: run_once_user_administrator is not defined
-
 - name: run the user_administrator tasks once
   set_fact:
     run_once_user_administrator: true