refactored wordpress role

playbook.yml

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

roles/docker-wordpress/tasks/create-wordpress-nginx.yml

@@ -0,0 +1,10 @@
+- name: Activate NGINX matomo tracking for {{domain}}
+  include_role:
+    name: nginx-matomo-tracking
+  when: nginx_matomo_tracking_active
+
+- 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
+  notify: restart nginx

roles/docker-wordpress/tasks/main.yml

@@ -1,17 +1,19 @@
 ---
-- name: recieve wordpress certificates for {{domain}}
+- name: "include task receive certbot certificate"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: recieve-certbot-certificate.yml
-
-- name: Activate NGINX matomo tracking for {{domain}}
-  include_role:
-    name: nginx-matomo-tracking
-  when: nginx_matomo_tracking_active
-
-- name: configure wordpress nginx configurations
   vars:
-    client_max_body_size: "{{wordpress_max_upload_size}}"
+    domain: "{{ item }}"
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ domain }}.conf
+  loop: "{{ wordpress_domains }}"
-  notify: restart nginx
+  loop_control:
+    loop_var: item
+
+- name: "include task create wordpress nginx"
+  include_tasks: create-wordpress-nginx.yml
+  vars:
+    domain: "{{ item }}"
+  loop: "{{ wordpress_domains }}"
+  loop_control:
+    loop_var: item
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

tasks/recieve-certbot-certificate.yml

@@ -0,0 +1,2 @@
+- name: recieve certbot certificate for {{domain}}
+  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}