refactored docker and nginx roles, to make them more modular

playbook-servers.yml

@@ -55,6 +55,7 @@
   roles:
   - role: docker-wordpress
     vars:
+      domains: "{{wordpress_domains}}"
       http_port: 8003
 
 - name: setup mediawiki hosts
@@ -161,7 +162,7 @@
   roles:
    -  role: docker-joomla
       vars:
-        domain: "joomla.{{top_domain}}"
+        domain: "{{joomla_domains}}"
         http_port: 8014
 
 - name: setup attendize

roles/docker-akaunting/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: register directory
   stat:

roles/docker-baserow/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-bigbluebutton/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include task certbot-matomo.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: certbot-matomo.yml
 
 - name: configure {{domain}}.conf
   template: src=templates/nginx-proxy.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf

roles/docker-elk/tasks/main.yml

@@ -1,11 +1,7 @@
 ---
 
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: create elasticsearch-sysctl.conf
   copy:

roles/docker-funkwhale/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-gitea/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}} https
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-jenkins/tasks/main.yml

@@ -1,9 +1,5 @@
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "docker jenkins"
   docker_compose:

roles/docker-joomla/tasks/main.yml

@@ -1,10 +1,9 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
+  loop: "{{ domains }}"
-- name: configure {{domain}}.conf
+  loop_control:
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
+    loop_var: domain
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-listmonk/tasks/main.yml

@@ -1,12 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: 
-    src:  "roles/nginx-docker-reverse-proxy/templates/domain.conf.j2"
-    dest: "/etc/nginx/conf.d/{{domain}}.conf"
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-mailu/tasks/main.yml

@@ -1,13 +1,8 @@
 ---
-
+- name: "include tasks nginx-docker-proxy-domain.yml"
-- name: recieve {{domain}} certificate
+  include_tasks: nginx-docker-proxy-domain.yml
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
-
-- name: configure {{domain}}.conf
   vars:
     client_max_body_size: "31M"
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "create {{path_docker_compose_files}}mailu"
   file:

roles/docker-mastodon/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include task certbot-matomo.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: certbot-matomo.yml
 
 - name: configure {{domain}}.conf
   template: src=templates/mastodon.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf

roles/docker-matomo/tasks/main.yml

@@ -1,12 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: 
-    src:  "roles/nginx-docker-reverse-proxy/templates/domain.conf.j2"
-    dest: "/etc/nginx/conf.d/{{domain}}.conf"
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-mediawiki/tasks/main.yml

@@ -1,9 +1,5 @@
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "docker mediawiki"
   docker_compose:

roles/docker-nextcloud/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include task certbot-matomo.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: certbot-matomo.yml
 
 - name: configure {{domain}}.conf
   template: 

roles/docker-peertube/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include task certbot-matomo.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: certbot-matomo.yml
-
-- name: configure {{domain}}.conf
-  template: src=templates/peertube.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-pixelfed/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-roulette-wheel/tasks/main.yml

@@ -1,10 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: src=roles/nginx-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

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

@@ -1,10 +0,0 @@
-- 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,19 +1,12 @@
 ---
-- name: "include task receive certbot certificate"
-  include_tasks: recieve-certbot-certificate.yml
-  vars:
-    domain: "{{ item }}"
-  loop: "{{ wordpress_domains }}"
-  loop_control:
-    loop_var: item
 
-- name: "include task create wordpress nginx"
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  include_tasks: create-wordpress-nginx.yml
+  include_tasks: nginx-docker-proxy-domain.yml
-  vars:
+  loop: "{{ domains }}"
-    domain: "{{ item }}"
-  loop: "{{ wordpress_domains }}"
   loop_control:
-    loop_var: item
+    loop_var: domain
+  vars:
+    client_max_body_size: "{{wordpress_max_upload_size}}"
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/docker-yourls/tasks/main.yml

@@ -1,12 +1,6 @@
 ---
-- name: recieve {{domain}} certificate
+- name: "include tasks nginx-docker-proxy-domain.yml"
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
+  include_tasks: nginx-docker-proxy-domain.yml
-
-- name: configure {{domain}}.conf
-  template: 
-    src:  "roles/nginx-docker-reverse-proxy/templates/domain.conf.j2"
-    dest: "/etc/nginx/conf.d/{{domain}}.conf"
-  notify: restart nginx
 
 - name: "create {{docker_compose_instance_directory}}"
   file:

roles/nginx-homepage/tasks/main.yml

@@ -1,10 +1,11 @@
+---
+- name: "include task certbot-matomo.yml"
+  include_tasks: certbot-matomo.yml
+
 - name: configure {{domain}}.conf
   template: src=homepage.nginx.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
   notify: restart nginx
 
-- name: recieve {{domain}} certificate
-  command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
-
 - name: nginx-homepage repo git
   git:
     repo: "{{nginx_homepage_repository_address}}"

tasks/certbot-matomo.yml

@@ -0,0 +1,5 @@
+- name: "include task receive certbot certificate"
+  include_tasks: recieve-certbot-certificate.yml
+
+- name: "include task implement-matomo-tracking.yml"
+  include_tasks: implement-matomo-tracking.yml

tasks/nginx-docker-proxy-domain.yml

@@ -1,8 +1,5 @@
-- name: "include task receive certbot certificate"
+- name: "include task certbot-matomo.yml"
-  include_tasks: recieve-certbot-certificate.yml
+  include_tasks: certbot-matomo.yml
-
-- name: "include task implement-matomo-tracking.yml"
-  include_tasks: implement-matomo-tracking.yml
 
 - name: "include task create-domain-conf.yml"
   include_tasks: create-domain-conf.yml