|
|
@ -36,6 +36,9 @@ services:
|
|
|
|
- "{{ bind6 }}:{{ port }}:{{ port }}"
|
|
|
|
- "{{ bind6 }}:{{ port }}:{{ port }}"
|
|
|
|
{% endif %}
|
|
|
|
{% endif %}
|
|
|
|
{% endfor %}
|
|
|
|
{% endfor %}
|
|
|
|
|
|
|
|
networks:
|
|
|
|
|
|
|
|
- default
|
|
|
|
|
|
|
|
- webmail
|
|
|
|
volumes:
|
|
|
|
volumes:
|
|
|
|
- "{{ root }}/certs:/certs"
|
|
|
|
- "{{ root }}/certs:/certs"
|
|
|
|
- "{{ root }}/overrides/nginx:/overrides:ro"
|
|
|
|
- "{{ root }}/overrides/nginx:/overrides:ro"
|
|
|
@ -169,12 +172,8 @@ services:
|
|
|
|
env_file: {{ env }}
|
|
|
|
env_file: {{ env }}
|
|
|
|
volumes:
|
|
|
|
volumes:
|
|
|
|
- "{{ root }}/dav:/data"
|
|
|
|
- "{{ root }}/dav:/data"
|
|
|
|
{% if resolver_enabled %}
|
|
|
|
networks:
|
|
|
|
depends_on:
|
|
|
|
- radicale
|
|
|
|
- resolver
|
|
|
|
|
|
|
|
dns:
|
|
|
|
|
|
|
|
- {{ dns }}
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
|
|
|
|
{% if fetchmail_enabled %}
|
|
|
|
{% if fetchmail_enabled %}
|
|
|
@ -204,13 +203,10 @@ services:
|
|
|
|
volumes:
|
|
|
|
volumes:
|
|
|
|
- "{{ root }}/webmail:/data"
|
|
|
|
- "{{ root }}/webmail:/data"
|
|
|
|
- "{{ root }}/overrides/{{ webmail_type }}:/overrides:ro"
|
|
|
|
- "{{ root }}/overrides/{{ webmail_type }}:/overrides:ro"
|
|
|
|
|
|
|
|
networks:
|
|
|
|
|
|
|
|
- webmail
|
|
|
|
depends_on:
|
|
|
|
depends_on:
|
|
|
|
- imap
|
|
|
|
- front
|
|
|
|
{% if resolver_enabled %}
|
|
|
|
|
|
|
|
- resolver
|
|
|
|
|
|
|
|
dns:
|
|
|
|
|
|
|
|
- {{ dns }}
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
|
|
|
|
networks:
|
|
|
|
networks:
|
|
|
@ -226,6 +222,14 @@ networks:
|
|
|
|
{% if ipv6_enabled %}
|
|
|
|
{% if ipv6_enabled %}
|
|
|
|
- subnet: {{ subnet6 }}
|
|
|
|
- subnet: {{ subnet6 }}
|
|
|
|
{% endif %}
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
{% if webdav_enabled %}
|
|
|
|
|
|
|
|
radicale:
|
|
|
|
|
|
|
|
driver: bridge
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
{% if webmail_type != 'none' %}
|
|
|
|
|
|
|
|
webmail:
|
|
|
|
|
|
|
|
driver: bridge
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
{% if oletools_enabled %}
|
|
|
|
{% if oletools_enabled %}
|
|
|
|
noinet:
|
|
|
|
noinet:
|
|
|
|
driver: bridge
|
|
|
|
driver: bridge
|
|
|
|