From 94c3b74ea90221bd7a9d508fdf3b825e16680c17 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 1 Aug 2025 23:03:57 +0200
Subject: [PATCH] change default values to container_base_dir

---
 .../deploy_container_booklore/defaults/main.yml  |  1 -
 .../deploy_container_booklore/tasks/main.yml     |  6 +++---
 .../deploy_container_booklore/vars/main.yml      |  1 +
 .../defaults/main.yml                            |  1 -
 .../deploy_container_excalidraw/tasks/main.yml   |  8 ++++----
 .../deploy_container_excalidraw/vars/main.yml    |  1 +
 .../deploy_container_homepage/defaults/main.yml  |  1 -
 .../deploy_container_homepage/tasks/main.yml     |  8 ++++----
 .../deploy_container_homepage/vars/main.yml      |  1 +
 .../deploy_container_koito/defaults/main.yml     |  1 -
 .../roles/deploy_container_koito/tasks/main.yml  |  6 +++---
 .../roles/deploy_container_koito/vars/main.yml   |  1 +
 .../deploy_container_lldap/defaults/main.yml     |  3 ---
 .../roles/deploy_container_lldap/tasks/main.yml  | 16 ++++++++--------
 .../roles/deploy_container_lldap/vars/main.yml   |  1 +
 .../deploy_container_wishlist/defaults/main.yml  |  1 -
 .../deploy_container_wishlist/tasks/main.yml     |  6 +++---
 .../deploy_container_wishlist/vars/main.yml      |  1 +
 18 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/ansible/roles/deploy_container_booklore/defaults/main.yml b/ansible/roles/deploy_container_booklore/defaults/main.yml
index 7fa2ebe..7d018d1 100644
--- a/ansible/roles/deploy_container_booklore/defaults/main.yml
+++ b/ansible/roles/deploy_container_booklore/defaults/main.yml
@@ -1,6 +1,5 @@
 container_booklore_version: latest
 container_booklore_domain: booklore.example.com
-container_booklore_directory: /opt/docker/booklore
 container_booklore_db_root_password: super_duper_secret_root_password
 container_booklore_db_user: db_user
 container_booklore_db_password: super_secret_password
\ No newline at end of file
diff --git a/ansible/roles/deploy_container_booklore/tasks/main.yml b/ansible/roles/deploy_container_booklore/tasks/main.yml
index d013145..866a273 100644
--- a/ansible/roles/deploy_container_booklore/tasks/main.yml
+++ b/ansible/roles/deploy_container_booklore/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure data directories exist
   ansible.builtin.file:
-    path: "{{ container_booklore_directory }}/data/{{ item }}"
+    path: "{{ container_base_dir }}/data/{{ item }}"
     state: directory
     mode: '0755'
   loop:
@@ -13,7 +13,7 @@
 - name: Deploy Docker Compose and .env files
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ container_booklore_directory }}/{{ item.dest }}"
+    dest: "{{ container_base_dir }}/{{ item.dest }}"
     mode: '0644'
   loop:
     - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
@@ -22,7 +22,7 @@
 
 - name: Start Container
   community.docker.docker_compose_v2:
-    project_src: "{{ container_booklore_directory }}"
+    project_src: "{{ container_base_dir }}"
     pull: always
     docker_host: "unix:///run/user/1000/docker.sock"
   become: false
diff --git a/ansible/roles/deploy_container_booklore/vars/main.yml b/ansible/roles/deploy_container_booklore/vars/main.yml
index e69de29..481a422 100644
--- a/ansible/roles/deploy_container_booklore/vars/main.yml
+++ b/ansible/roles/deploy_container_booklore/vars/main.yml
@@ -0,0 +1 @@
+container_base_dir: /opt/docker/booklore
\ No newline at end of file
diff --git a/ansible/roles/deploy_container_excalidraw/defaults/main.yml b/ansible/roles/deploy_container_excalidraw/defaults/main.yml
index 676cfd8..d082569 100644
--- a/ansible/roles/deploy_container_excalidraw/defaults/main.yml
+++ b/ansible/roles/deploy_container_excalidraw/defaults/main.yml
@@ -1,3 +1,2 @@
 container_excalidraw_version: latest
 container_excalidraw_domain: excalidraw.example.com
-container_excalidraw_directory: /opt/docker/excalidraw
diff --git a/ansible/roles/deploy_container_excalidraw/tasks/main.yml b/ansible/roles/deploy_container_excalidraw/tasks/main.yml
index 1b1cbe9..3c7ee29 100644
--- a/ansible/roles/deploy_container_excalidraw/tasks/main.yml
+++ b/ansible/roles/deploy_container_excalidraw/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure data directories exist
   ansible.builtin.file:
-    path: "{{ container_excalidraw_directory }}/data/{{ item }}"
+    path: "{{ container_base_dir }}/data/{{ item }}"
     state: directory
     mode: '0755'
   loop:
@@ -11,7 +11,7 @@
 
 - name: Create neccessary Files
   ansible.builtin.file:
-    path: "{{ traefik_container_dir }}/data/{{ item }}"
+    path: "{{ container_base_dir }}/data/{{ item }}"
     state: touch
     mode: '0644'
   loop:
@@ -22,7 +22,7 @@
 - name: Deploy Docker Compose and .env files
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ container_excalidraw_directory }}/{{ item.dest }}"
+    dest: "{{ container_base_dir }}/{{ item.dest }}"
     mode: '0644'
   loop:
     - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
@@ -31,7 +31,7 @@
 
 - name: Start Container
   community.docker.docker_compose_v2:
-    project_src: "{{ container_excalidraw_directory }}"
+    project_src: "{{ container_base_dir }}"
     pull: always
     docker_host: "unix:///run/user/1000/docker.sock"
   become: false
diff --git a/ansible/roles/deploy_container_excalidraw/vars/main.yml b/ansible/roles/deploy_container_excalidraw/vars/main.yml
index e69de29..b2b338b 100644
--- a/ansible/roles/deploy_container_excalidraw/vars/main.yml
+++ b/ansible/roles/deploy_container_excalidraw/vars/main.yml
@@ -0,0 +1 @@
+container_base_dir: /opt/docker/excalidraw
\ No newline at end of file
diff --git a/ansible/roles/deploy_container_homepage/defaults/main.yml b/ansible/roles/deploy_container_homepage/defaults/main.yml
index 0e0f29d..ca2f032 100644
--- a/ansible/roles/deploy_container_homepage/defaults/main.yml
+++ b/ansible/roles/deploy_container_homepage/defaults/main.yml
@@ -1,6 +1,5 @@
 container_homepage_version: latest
 container_homepage_domain: dashboard.example.com
-container_homepage_directory: /opt/docker/homepage
 container_homepage_config_files:
   - src: "{{ inventory_dir }}/host_files/{{ inventory_hostname }}/container_homepage_config_files/bookmarks.yaml"
     dest: "bookmarks.yaml"
diff --git a/ansible/roles/deploy_container_homepage/tasks/main.yml b/ansible/roles/deploy_container_homepage/tasks/main.yml
index 290c0ff..18a2b23 100644
--- a/ansible/roles/deploy_container_homepage/tasks/main.yml
+++ b/ansible/roles/deploy_container_homepage/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure data directories exist
   ansible.builtin.file:
-    path: "{{ container_homepage_directory }}/data/{{ item }}"
+    path: "{{ container_base_dir }}/data/{{ item }}"
     state: directory
     mode: '0755'
   loop:
@@ -11,7 +11,7 @@
 - name: Deploy Docker Compose and .env files
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ container_homepage_directory }}/{{ item.dest }}"
+    dest: "{{ container_base_dir }}/{{ item.dest }}"
     mode: '0644'
   loop:
     - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
@@ -21,14 +21,14 @@
 - name: Deploy tenant-specific config files
   ansible.builtin.copy:
     src: "{{ item.src }}"
-    dest: "{{ container_homepage_directory }}/data/config/{{ item.dest }}"
+    dest: "{{ container_base_dir }}/data/config/{{ item.dest }}"
     mode: '0644'
   loop: "{{ container_homepage_config_files }}"
   become: false
 
 - name: Start Container
   community.docker.docker_compose_v2:
-    project_src: "{{ container_homepage_directory }}"
+    project_src: "{{ container_base_dir }}"
     pull: always
     docker_host: "unix:///run/user/1000/docker.sock"
   become: false
diff --git a/ansible/roles/deploy_container_homepage/vars/main.yml b/ansible/roles/deploy_container_homepage/vars/main.yml
index e69de29..57f4996 100644
--- a/ansible/roles/deploy_container_homepage/vars/main.yml
+++ b/ansible/roles/deploy_container_homepage/vars/main.yml
@@ -0,0 +1 @@
+container_base_dir: /opt/docker/homepage
\ No newline at end of file
diff --git a/ansible/roles/deploy_container_koito/defaults/main.yml b/ansible/roles/deploy_container_koito/defaults/main.yml
index 18796d0..0d1105c 100644
--- a/ansible/roles/deploy_container_koito/defaults/main.yml
+++ b/ansible/roles/deploy_container_koito/defaults/main.yml
@@ -1,4 +1,3 @@
 container_koito_version: latest
 container_koito_domain: music.heyer.systems
-container_koito_directory: /opt/docker/koito
 container_koito_db_password: "super_secret_db_password"
diff --git a/ansible/roles/deploy_container_koito/tasks/main.yml b/ansible/roles/deploy_container_koito/tasks/main.yml
index 3e2c4aa..b1c57ec 100644
--- a/ansible/roles/deploy_container_koito/tasks/main.yml
+++ b/ansible/roles/deploy_container_koito/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure data directories exist
   ansible.builtin.file:
-    path: "{{ container_koito_directory }}/data/{{ item }}"
+    path: "{{ container_base_dir }}/data/{{ item }}"
     state: directory
     mode: '0755'
   loop:
@@ -12,7 +12,7 @@
 - name: Deploy Docker Compose and .env files
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ container_koito_directory }}/{{ item.dest }}"
+    dest: "{{ container_base_dir }}/{{ item.dest }}"
     mode: '0644'
   loop:
     - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
@@ -21,7 +21,7 @@
 
 - name: Start Container
   community.docker.docker_compose_v2:
-    project_src: "{{ container_koito_directory }}"
+    project_src: "{{ container_base_dir }}"
     pull: always
     docker_host: "unix:///run/user/1000/docker.sock"
   become: false
diff --git a/ansible/roles/deploy_container_koito/vars/main.yml b/ansible/roles/deploy_container_koito/vars/main.yml
index e69de29..e3a02ee 100644
--- a/ansible/roles/deploy_container_koito/vars/main.yml
+++ b/ansible/roles/deploy_container_koito/vars/main.yml
@@ -0,0 +1 @@
+container_base_dir: /opt/docker/koito
\ No newline at end of file
diff --git a/ansible/roles/deploy_container_lldap/defaults/main.yml b/ansible/roles/deploy_container_lldap/defaults/main.yml
index 908664e..f22771f 100644
--- a/ansible/roles/deploy_container_lldap/defaults/main.yml
+++ b/ansible/roles/deploy_container_lldap/defaults/main.yml
@@ -10,6 +10,3 @@ container_lldap_domain: "ldap.example.com"           # Fully qualified domain na
 
 # LDAP admin user password
 container_lldap_ldap_user_pass: "adminPas$word"      # Admin password (can be replaced by secret file)
-
-# Base directory for container data (e.g., for volumes, secrets)
-container_lldap_directory: "/opt/docker/lldap"  # Base directory on the host for LLDAP data
diff --git a/ansible/roles/deploy_container_lldap/tasks/main.yml b/ansible/roles/deploy_container_lldap/tasks/main.yml
index 57b47f3..392412f 100644
--- a/ansible/roles/deploy_container_lldap/tasks/main.yml
+++ b/ansible/roles/deploy_container_lldap/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: Ensure data directories exist
   ansible.builtin.file:
-    path: "{{ container_lldap_directory }}/{{ item }}"
+    path: "{{ container_base_dir }}/{{ item }}"
     state: directory
     mode: '0755'
   loop:
@@ -10,12 +10,12 @@
 
 - name: Check if jwt_secret file exists
   ansible.builtin.stat:
-    path: "{{ container_lldap_directory }}/secrets/jwt_secret"
+    path: "{{ container_base_dir }}/secrets/jwt_secret"
   register: jwt_secret_stat
 
 - name: Check if key_seed file exists
   ansible.builtin.stat:
-    path: "{{ container_lldap_directory }}/secrets/key_seed"
+    path: "{{ container_base_dir }}/secrets/key_seed"
   register: key_seed_stat
 
 - name: Generate JWT secret if not exists
@@ -33,7 +33,7 @@
 - name: Copy JWT secret to host if generated
   ansible.builtin.copy:
     content: "{{ jwt_secret }}"
-    dest: "{{ container_lldap_directory }}/secrets/jwt_secret"
+    dest: "{{ container_base_dir }}/secrets/jwt_secret"
     mode: '0644'
   when: jwt_secret is defined
   become: false
@@ -41,7 +41,7 @@
 - name: Copy Key Seed to host if generated
   ansible.builtin.copy:
     content: "{{ key_seed }}"
-    dest: "{{ container_lldap_directory }}/secrets/key_seed"
+    dest: "{{ container_base_dir }}/secrets/key_seed"
     mode: '0644'
   when: key_seed is defined
   become: false
@@ -49,14 +49,14 @@
 - name: Write LDAP admin user password to file if not exists
   ansible.builtin.copy:
     content: "{{ container_lldap_ldap_user_pass }}"
-    dest: "{{ container_lldap_directory }}/secrets/ldap_user_pass"
+    dest: "{{ container_base_dir }}/secrets/ldap_user_pass"
     mode: '0644'
   become: false
 
 - name: Deploy Docker Compose and .env files
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ container_lldap_directory }}/{{ item.dest }}"
+    dest: "{{ container_base_dir }}/{{ item.dest }}"
     mode: '0644'
   loop:
     - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
@@ -65,7 +65,7 @@
 
 - name: Start Container
   community.docker.docker_compose_v2:
-    project_src: "{{ container_lldap_directory }}"
+    project_src: "{{ container_base_dir }}"
     pull: always
     docker_host: "unix:///run/user/1000/docker.sock"
   become: false
diff --git a/ansible/roles/deploy_container_lldap/vars/main.yml b/ansible/roles/deploy_container_lldap/vars/main.yml
index e69de29..b233887 100644
--- a/ansible/roles/deploy_container_lldap/vars/main.yml
+++ b/ansible/roles/deploy_container_lldap/vars/main.yml
@@ -0,0 +1 @@
+container_base_dir: /opt/docker/lldap
\ No newline at end of file
diff --git a/ansible/roles/deploy_container_wishlist/defaults/main.yml b/ansible/roles/deploy_container_wishlist/defaults/main.yml
index c846422..75729f2 100644
--- a/ansible/roles/deploy_container_wishlist/defaults/main.yml
+++ b/ansible/roles/deploy_container_wishlist/defaults/main.yml
@@ -1,6 +1,5 @@
 container_wishlist_url: "wishlist.example.com"
 container_wishlist_version: "latest"
-container_wishlist_directory: "/opt/docker/wishlist"
 
 container_wishlist_db_prefix: "dbs/"
 container_wishlist_db_log_file: "/dev/null"
diff --git a/ansible/roles/deploy_container_wishlist/tasks/main.yml b/ansible/roles/deploy_container_wishlist/tasks/main.yml
index c2836bb..f98ddc0 100644
--- a/ansible/roles/deploy_container_wishlist/tasks/main.yml
+++ b/ansible/roles/deploy_container_wishlist/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure data directories exist
   ansible.builtin.file:
-    path: "{{ container_wishlist_directory }}/data"
+    path: "{{ container_base_dir }}/data"
     state: directory
     mode: '0755'
   become: false
@@ -9,7 +9,7 @@
 - name: Deploy Docker Compose and .env files
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ container_wishlist_directory }}/{{ item.dest }}"
+    dest: "{{ container_base_dir }}/{{ item.dest }}"
     mode: '0644'
   loop:
     - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
@@ -18,7 +18,7 @@
 
 - name: Start Container
   community.docker.docker_compose_v2:
-    project_src: "{{ container_wishlist_directory }}"
+    project_src: "{{ container_base_dir }}"
     pull: always
     docker_host: "unix:///run/user/1000/docker.sock"
   become: false
diff --git a/ansible/roles/deploy_container_wishlist/vars/main.yml b/ansible/roles/deploy_container_wishlist/vars/main.yml
index e69de29..c045674 100644
--- a/ansible/roles/deploy_container_wishlist/vars/main.yml
+++ b/ansible/roles/deploy_container_wishlist/vars/main.yml
@@ -0,0 +1 @@
+container_base_dir: /opt/docker/wishlist
\ No newline at end of file