Added input form constraints

setup/flavors/compose/docker-compose.yml

@@ -20,7 +20,7 @@ services:
     env_file: {{ env }}
     env:
       - TLS_FLAVOR={{ tls_flavor }}
-      - ADMIN={{ admin_enabled or 'no' }}
+      - ADMIN={{ admin_enabled or 'false' }}
     ports:
     {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
     {% if bind4 %}
@@ -112,7 +112,7 @@ services:
   {% endif %}
 
   # Webmail
-  {% if webmail_enabled %}
+  {% if webmail_type != 'none' %}
   webmail:
     image: mailu/{{ webmail_type }}:{{ version }}
     restart: always

setup/flavors/compose/mailu.env

@@ -33,8 +33,9 @@ POSTMASTER={{ postmaster or 'admin'}}
 HOSTNAMES={{ hostnames }}
 
 # Authentication rate limit (per source IP address)
-AUTH_RATELIMIT={% if auth_ratelimit_pm %}{{ auth_ratelimit_pm }}/minute;{% endif %}
-{% if auth_ratelimit_ph %}{{ auth_ratelimit_ph }}/hour{% endif %} 
+{% if auth_ratelimit_pm > '0' and auth_ratelimit_ph > '0' %}
+AUTH_RATELIMIT={{ auth_ratelimit_pm }}/minute;{{ auth_ratelimit_ph }}/hour 
+{% endif %}
 
 # Opt-out of statistics, replace with "True" to opt out
 DISABLE_STATISTICS={{ disable_statistics or 'False' }}
@@ -47,7 +48,6 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 #ADMIN={{ admin_enabled or 'false' }}
 
 #Chose which webmail to run if any
-#WEBMAIL_ENABLED={{ webmail_enabled or 'false' }}
 #WEBMAIL={{ webmail_type or 'none' }}
 
 #Antivirus solution