use eumau/roundcube image + nginx auto config

defaults/main.yml

@@ -4,7 +4,7 @@ roundcube_domain: default
 roundcube_web_root: /roundcube
 
 # container
-roundcube_image: roundcube/roundcubemail
+roundcube_image: eumau/roundcubemail
 roundcube_container: roundcube
 roundcube_volume: roundcube
 

tasks/main.yml

@@ -66,28 +66,18 @@
       - name: "{{ docker_network_name }}"
     ports:
 
-- name: template nginx domain config
+- name: export nginx config
-  when: roundcube_domain != 'default'
+  set_fact:
-  include_role:
+    nginx_config: >-
-    name: nginx-docker
+      {{ nginx_config | default({}) | combine({
-    tasks_from: domain.yml
+        roundcube_domain: {
-  vars:
+          "locations": {
-    ng_domain_name: "{{ roundcube_domain }}"
+            roundcube_web_root: {
-
+              "proxy_pass": "http://{}:9000/".format(roundcube_container)
-- name: template nginx location config
+              }
-  include_role:
+            }
-    name: nginx-docker
+          }
-    tasks_from: location.yml
+        }) }}
-  vars:
-    ng_domain_name: "{{ roundcube_domain }}"
-    ng_location_name: "{{ roundcube_web_root }}"
-    ng_location_content: |
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_pass http://{{ roundcube_container }}/;
-
-- meta: flush_handlers
 
 - name: inspect roundcube volume
   docker_volume_info: