From 2c4ee620c171387ea25250659722d5ebdecfe5d7 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 19 Feb 2025 03:37:56 +0100
Subject: [PATCH] Optimized Matomo

---
 roles/docker-matomo/tasks/main.yml              | 10 +++-------
 roles/health-nginx/templates/health-nginx.py.j2 |  2 --
 roles/nginx/tasks/main.yml                      |  3 +++
 roles/nginx/templates/nginx.conf.j2             |  1 +
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/roles/docker-matomo/tasks/main.yml b/roles/docker-matomo/tasks/main.yml
index 813c1e3b..083e1657 100644
--- a/roles/docker-matomo/tasks/main.yml
+++ b/roles/docker-matomo/tasks/main.yml
@@ -10,14 +10,10 @@
   ignore_errors: yes
   when: run_once_docker_matomo is not defined
 
-# @todo optimize this code. If global_matomo_tracking_enabled is active it doesn't have any impact.
-- name: implement matomo tracking for matomo if matomo is up and tracking enabled
+- name: "Determine global_matomo_tracking_enabled based on current value and site reachability"
   set_fact:
-    global_matomo_tracking_enabled: true
-  when: 
-    - site_check is defined and site_check.status == 200
-    - global_matomo_tracking_enabled | bool
-    - run_once_docker_matomo is not defined
+    global_matomo_tracking_enabled: "{{ (global_matomo_tracking_enabled | bool) and (site_check is defined and site_check.status == 200) }}"
+  when: run_once_docker_matomo is not defined
 
 - name: "include docker-central-database"
   include_role: 
diff --git a/roles/health-nginx/templates/health-nginx.py.j2 b/roles/health-nginx/templates/health-nginx.py.j2
index ce4062b5..65fd61fa 100644
--- a/roles/health-nginx/templates/health-nginx.py.j2
+++ b/roles/health-nginx/templates/health-nginx.py.j2
@@ -31,10 +31,8 @@ for filename in os.listdir(config_path):
         # Determine expected status codes based on the domain
         if domain == '{{domains.listmonk}}':
             expected_statuses = [404]
-{% if global_matomo_tracking_enabled | bool %}
         elif parts[0] == 'www' or domain in redirected_domains:
             expected_statuses = [301]
-{% endif %}
         elif domain == '{{domains.yourls}}':
             expected_statuses = [403]
 
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 4b869db2..ab5e8916 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -4,6 +4,9 @@
   notify: restart nginx
   when: run_once_nginx is not defined
 
+# I assume the following can be deleted
+# @todo Delete
+
 - name: install nginx-mod-headers-more for matomo
   pacman: 
     name: nginx-mod-headers-more
diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2
index a114f6c6..44c50d59 100644
--- a/roles/nginx/templates/nginx.conf.j2
+++ b/roles/nginx/templates/nginx.conf.j2
@@ -1,4 +1,5 @@
 {% if global_matomo_tracking_enabled | bool %}
+# @todo Assume this can be removed. Remove. 
 load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
 {% endif %}