Merge pull request mozilla#268 from mozilla/fix/dovecot-dh-version

Fix Dovecot v2.3.3+ DH config

Author: gstrauss

src/templates/partials/dovecot.hbs

@@ -5,8 +5,8 @@ ssl = required
 ssl_cert = </path/to/signed_cert_plus_intermediates
 ssl_key = </path/to/private_key
 {{#if output.usesDhe}}
-  {{#if (minver "2.3.3" form.serverVersion)}}
-  {{else if (minver "2.3.0" form.serverVersion)}}
+
+  {{#if (minver "2.3.0" form.serverVersion)}}
 # {{output.dhCommand}} > /path/to/dhparam
 ssl_dh = </path/to/dhparam
   {{else}}
@@ -23,4 +23,4 @@ ssl_protocols = {{join output.protocols " "}}
 {{#if output.ciphers.length}}
 ssl_cipher_list = {{{join output.ciphers ":"}}}
 {{/if}}
-ssl_prefer_server_ciphers = {{#if output.serverPreferredOrder}}yes{{else}}no{{/if}}
+ssl_prefer_server_ciphers = {{#if output.serverPreferredOrder}}yes{{else}}no{{/if}}