playbook.yml

@@ -17,7 +17,7 @@
       - gitea
       - postfix
       - matrix_riot
-      - privatebin
+      - pastebin
 
     smtp_host: postfix
     smtp_port: 587

roles/docker/defaults/main.yml

@@ -1,6 +1,3 @@
-nginx:
-  volume_folder: "{{ volume_root_folder }}/nginx"
-
 ldap:
   domain: "ldap.{{ base_domain }}"
 

roles/docker/tasks/services/nginx-proxy.yml

@@ -1,10 +1,8 @@
 ---
 
-- name: create nginx-proxy volume folders
+- docker_volume:
-  file:
+    name: "{{ volume }}"
-    name: "{{ nginx.volume_folder }}/{{ volume }}"
+  with_items:
-    state: directory
-  loop:
     - conf
     - vhost
     - html
@@ -24,11 +22,11 @@
       - "80:80"
       - "443:443"
     volumes:
-      - "{{ nginx.volume_folder }}/conf:/etc/nginx/conf.d"
+      - conf:/etc/nginx/conf.d
-      - "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d"
+      - vhost:/etc/nginx/vhost.d
-      - "{{ nginx.volume_folder }}/html:/usr/share/nginx/html"
+      - html:/usr/share/nginx/html
-      - "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam"
+      - dhparam:/etc/nginx/dhparam
-      - "{{ nginx.volume_folder }}/certs:/etc/nginx/certs:ro"
+      - certs:/etc/nginx/certs:ro
       - /var/run/docker.sock:/tmp/docker.sock:ro
 
 - name: nginx letsencrypt container
@@ -37,11 +35,10 @@
     image: jrcs/letsencrypt-nginx-proxy-companion
     restart_policy: always
     volumes:
-      - "{{ nginx.volume_folder }}/vhost:/etc/nginx/vhost.d"
+      - vhost:/etc/nginx/vhost.d
-      - "{{ nginx.volume_folder }}/html:/usr/share/nginx/html"
+      - html:/usr/share/nginx/html
-      - "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam:ro"
+      - dhparam:/etc/nginx/dhparam:ro
-      - "{{ nginx.volume_folder }}/certs:/etc/nginx/certs"
+      - certs:/etc/nginx/certs
       - /var/run/docker.sock:/var/run/docker.sock:ro
     env:
       NGINX_PROXY_CONTAINER: nginx-proxy
-

roles/docker/tasks/services/privatebin.yml

@@ -2,13 +2,11 @@
 
 - name: create privatebin volume folders
   file:
-    name: "{{ privatebin.volume_folder }}/{{ volume }}"
+    name: "{{ privatebin.volume_folder }}/{{ item }}"
     state: directory
-  loop:
+  with_items:
     - cfg
     - data
-  loop_control:
-    loop_var: volume
 
 - name: upload privatebin config
   template: