playbook.yml

@@ -74,16 +74,11 @@
 - name: setup wordpress hosts
   hosts: wordpress
   become: true
-  tasks:
-    - name: Include docker-wordpress role for each domain
-      include_role:
-        name: docker-wordpress
+  roles:
+   -  role: docker-wordpress
       vars:
-        domain: "{{ item }}"
+        domains: "{{wordpress_domains}}"
         http_port: 8003
-      loop: "{{ wordpress_domains }}"
-      loop_control:
-        loop_var: item
 - name: setup mediawiki hosts
   hosts: mediawiki
   become: true

roles/docker-wordpress/tasks/main.yml

@@ -1,16 +1,14 @@
 ---
-- name: recieve wordpress certificates for {{domain}}
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
-
-- name: Activate NGINX matomo tracking for {{domain}}
-  include_role:
-    name: nginx-matomo-tracking
-  when: nginx_matomo_tracking_active
+- name: recieve wordpress certificates
+  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{item}}
+  loop: "{{domains}}"
 
 - name: configure wordpress nginx configurations
   vars:
     client_max_body_size: "{{wordpress_max_upload_size}}"
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ domain }}.conf
+    domain: "{{item}}"
+  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ item }}.conf
+  loop: "{{domains}}"
   notify: restart nginx
 
 - name: "create {{docker_compose_wordpress_path}}"

roles/nginx-docker-reverse-proxy/templates/proxy_pass.conf.j2

@@ -7,7 +7,6 @@ location /
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-Proto https;
   proxy_set_header X-Forwarded-Port 443;
-  proxy_set_header Accept-Encoding "";
 
   # WebSocket specific header
   proxy_http_version 1.1;

roles/nginx-matomo-tracking/Readme.md

@@ -13,8 +13,8 @@ This Ansible role automates the integration of Matomo tracking code into Nginx-s
 
 ## Role Variables
 - `matomo_domain`: The domain of your Matomo installation.
-- `domain`: The domain of the website you wish to track.
-- `matomo_auth_token`: Matomo auth token
+- `base_domain`: The base domain of the website you wish to track.
+- `matomo_site_id`: The site ID configured in your Matomo dashboard.
 
 ## Dependencies
 - None. This role is designed to be included in Nginx server block configurations.