From f6e62525d16f799283ae2d00c6edcb64cde8ec57 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 11 Aug 2025 20:00:48 +0200
Subject: [PATCH] Optimized wordpress variables

---
 roles/web-app-wordpress/tasks/main.yml | 7 +++----
 roles/web-app-wordpress/vars/main.yml  | 7 ++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/roles/web-app-wordpress/tasks/main.yml b/roles/web-app-wordpress/tasks/main.yml
index 394c63b0..cfe05217 100644
--- a/roles/web-app-wordpress/tasks/main.yml
+++ b/roles/web-app-wordpress/tasks/main.yml
@@ -6,7 +6,7 @@
 - name: "Include role srv-proxy-6-6-domain for {{ application_id }}"
   include_role:
     name: srv-proxy-6-6-domain
-  loop: "{{ applications | get_app_conf(application_id, 'server.domains.canonical', True) }}"
+  loop: "{{ wordpress_domains }}"
   loop_control:
     loop_var: domain
   vars:
@@ -25,15 +25,14 @@
     dest: "{{ host_msmtp_conf }}"
   notify: docker compose up
 
-
 - name: "Install wordpress"
   include_tasks: install.yml
 
-- name: "Install and activate WordPress plugins from application config"
+- name: "Install and activate WordPress plugins"
   block:
     - name: "Iterate through WordPress plugins"
       include_tasks: plugin.yml
-      loop: "{{ applications | get_app_conf(application_id, 'plugins', True) | dict2items }}"
+      loop: "{{ wordpress_plugins }}"
       loop_control:
         label: "{{ item.key }}"
       vars:
diff --git a/roles/web-app-wordpress/vars/main.yml b/roles/web-app-wordpress/vars/main.yml
index 3f3a8f51..722b4f96 100644
--- a/roles/web-app-wordpress/vars/main.yml
+++ b/roles/web-app-wordpress/vars/main.yml
@@ -1,10 +1,15 @@
+# General
 application_id:             "web-app-wordpress"
 database_type:              "mariadb"
 host_msmtp_conf:            "{{docker_compose.directories.config}}msmtprc.conf"
+
+# Wordpress Specific
 wordpress_max_upload_size:  "{{ applications | get_app_conf(application_id, 'max_upload_size') }}"
 wordpress_custom_image:     "wordpress_custom"
 wordpress_docker_html_path: "/var/www/html"
 wordpress_version:          "{{ applications | get_app_conf(application_id, 'docker.services.wordpress.version', True) }}"
 wordpress_image:            "{{ applications | get_app_conf(application_id, 'docker.services.wordpress.image', True) }}"
 wordpress_name:             "{{ applications | get_app_conf(application_id, 'docker.services.wordpress.name', True) }}"
-wordpress_volume:           "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
\ No newline at end of file
+wordpress_volume:           "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
+wordpress_domains:          "{{ applications | get_app_conf(application_id, 'server.domains.canonical', True) }}"
+wordpress_plugins:          "{{ applications | get_app_conf(application_id, 'plugins', True) | dict2items }}"
\ No newline at end of file