Bug fixes

master
Ionut Filip 6 years ago
parent 6b6cbcf977
commit cb1ed349bf

@ -2,7 +2,7 @@
# This file is auto-generated by the Mailu configuration wizard. # This file is auto-generated by the Mailu configuration wizard.
# Please read the documentation before attempting any change. # Please read the documentation before attempting any change.
version: '3.7' version: '3.6'
services: services:
@ -18,7 +18,7 @@ services:
image: mailu/nginx:{{ version }} image: mailu/nginx:{{ version }}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
env: environment:
- TLS_FLAVOR={{ tls_flavor }} - TLS_FLAVOR={{ tls_flavor }}
- ADMIN={{ admin_enabled or 'false' }} - ADMIN={{ admin_enabled or 'false' }}
ports: ports:
@ -30,10 +30,8 @@ services:
- "{{ bind6 }}:{{ port }}:{{ port }}" - "{{ bind6 }}:{{ port }}:{{ port }}"
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if flavor in ('cert', 'mail') %}
volumes: volumes:
- "{{ root }}/certs:/certs" - "{{ root }}/certs:/certs"
{% endif %}
admin: admin:
image: mailu/admin:{{ version }} image: mailu/admin:{{ version }}
@ -54,7 +52,6 @@ services:
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/data:/data"
- "{{ root }}/mail:/mail" - "{{ root }}/mail:/mail"
- "{{ root }}/overrides:/overrides" - "{{ root }}/overrides:/overrides"
depends_on: depends_on:
@ -65,7 +62,6 @@ services:
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/data:/data"
- "{{ root }}/overrides:/overrides" - "{{ root }}/overrides:/overrides"
depends_on: depends_on:
- front - front
@ -107,8 +103,6 @@ services:
image: mailu/fetchmail:{{ version }} image: mailu/fetchmail:{{ version }}
restart: always restart: always
env_file: {{ env }} env_file: {{ env }}
volumes:
- "{{ root }}/data:/data"
{% endif %} {% endif %}
# Webmail # Webmail

@ -21,7 +21,7 @@ SECRET_KEY={{ secret(16) }}
# PUBLIC_IPV6= {{ bind6 }} (default: ::1) # PUBLIC_IPV6= {{ bind6 }} (default: ::1)
# Main mail domain # Main mail domain
# DOMAIN={{ domain }} DOMAIN={{ domain }}
# Mail address of the postmaster # Mail address of the postmaster
POSTMASTER={{ postmaster or 'admin'}} POSTMASTER={{ postmaster or 'admin'}}
@ -48,16 +48,16 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
#ADMIN={{ admin_enabled or 'false' }} #ADMIN={{ admin_enabled or 'false' }}
#Chose which webmail to run if any #Chose which webmail to run if any
#WEBMAIL={{ webmail_type or 'none' }} WEBMAIL={{ webmail_type }}
#Antivirus solution #Antivirus solution
#ANTIVIRUS={{ antivirus_enabled or 'none' }} #ANTIVIRUS={{ antivirus_enabled or 'none' }}
#Antispam solution #Antispam solution
#ANTISPAM={{ antispam_enabled or 'none'}} ANTISPAM={{ antispam_enabled or 'none'}}
#Dav server implementation #Dav server implementation
#WEBDAV={{ webdav_enabled or 'none' }} WEBDAV={{ webdav_enabled or 'none' }}
################################### ###################################
# Server behavior # Server behavior

Loading…
Cancel
Save