diff options
author | April King <april@mozilla.com> | 2020-04-03 20:01:21 +0300 |
---|---|---|
committer | April King <april@mozilla.com> | 2020-04-03 20:01:21 +0300 |
commit | 1a60effe899c84c9da908371f2e8e638ed41de1c (patch) | |
tree | 76e8c2020d80cbc25af00221a1f672296aa2e5e3 | |
parent | 49351b497789dc61d4ce5c3d4b08ab806900ef52 (diff) |
Remove .pem references to be consistent
-rw-r--r-- | src/templates/partials/dovecot.hbs | 4 | ||||
-rw-r--r-- | src/templates/partials/exim.hbs | 4 | ||||
-rw-r--r-- | src/templates/partials/haproxy.hbs | 4 | ||||
-rw-r--r-- | src/templates/partials/lighttpd.hbs | 4 | ||||
-rw-r--r-- | src/templates/partials/mysql.hbs | 2 | ||||
-rw-r--r-- | src/templates/partials/nginx.hbs | 4 | ||||
-rw-r--r-- | src/templates/partials/postfix.hbs | 4 | ||||
-rw-r--r-- | src/templates/partials/postgresql.hbs | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/src/templates/partials/dovecot.hbs b/src/templates/partials/dovecot.hbs index a0f4eb1..035dc81 100644 --- a/src/templates/partials/dovecot.hbs +++ b/src/templates/partials/dovecot.hbs @@ -7,8 +7,8 @@ ssl_key = </path/to/private_key {{#if output.usesDhe}} {{#if (minver "2.3.0" form.serverVersion)}} -# {{output.dhCommand}} > /path/to/dhparam.pem -ssl_dh = </path/to/dhparam.pem +# {{output.dhCommand}} > /path/to/dhparam +ssl_dh = </path/to/dhparam {{else}} ssl_dh_parameters_length = {{output.dhParamSize}} {{/if}} diff --git a/src/templates/partials/exim.hbs b/src/templates/partials/exim.hbs index a9e22c7..15abdd3 100644 --- a/src/templates/partials/exim.hbs +++ b/src/templates/partials/exim.hbs @@ -5,8 +5,8 @@ tls_certificate = /path/to/signed_cert_plus_intermediates tls_privatekey = /path/to/private_key {{#if output.usesDhe}} -# {{output.dhCommand}} > /path/to/dhparam.pem -tls_dhparam = /path/to/dhparam.pem +# {{output.dhCommand}} > /path/to/dhparam +tls_dhparam = /path/to/dhparam {{/if}} # {{form.config}} configuration diff --git a/src/templates/partials/haproxy.hbs b/src/templates/partials/haproxy.hbs index 1941bdb..0bc618e 100644 --- a/src/templates/partials/haproxy.hbs +++ b/src/templates/partials/haproxy.hbs @@ -26,8 +26,8 @@ global {{#if output.usesDhe}} {{#if (minver "1.6.0" form.serverVersion)}} - # {{output.dhCommand}} > /path/to/dhparam.pem - ssl-dh-param-file /path/to/dhparam.pem + # {{output.dhCommand}} > /path/to/dhparam + ssl-dh-param-file /path/to/dhparam {{else}} tune.ssl.default-dh-param 2048 {{/if}} diff --git a/src/templates/partials/lighttpd.hbs b/src/templates/partials/lighttpd.hbs index c777075..287c08b 100644 --- a/src/templates/partials/lighttpd.hbs +++ b/src/templates/partials/lighttpd.hbs @@ -21,8 +21,8 @@ $SERVER["socket"] == ":443" { {{#if output.usesDhe}} {{#if (minver "1.4.29" form.serverVersion)}} - # {{output.dhCommand}} > /path/to/dhparam.pem - ssl.dh-file = "/path/to/dhparam.pem" + # {{output.dhCommand}} > /path/to/dhparam + ssl.dh-file = "/path/to/dhparam" {{/if}} {{/if}} diff --git a/src/templates/partials/mysql.hbs b/src/templates/partials/mysql.hbs index 0d43e66..7c2e9c2 100644 --- a/src/templates/partials/mysql.hbs +++ b/src/templates/partials/mysql.hbs @@ -2,7 +2,7 @@ # {{{output.link}}} [mysqld] require_secure_transport = on -ssl-cert = /path/to/signed_cert_plus_intermediates.pem +ssl-cert = /path/to/signed_cert_plus_intermediates ssl-key = /path/to/private_key {{#if output.ciphers.length}} ssl-cipher = {{{join output.ciphers ":"}}} diff --git a/src/templates/partials/nginx.hbs b/src/templates/partials/nginx.hbs index c7f84f0..d6c4bea 100644 --- a/src/templates/partials/nginx.hbs +++ b/src/templates/partials/nginx.hbs @@ -29,8 +29,8 @@ server { {{/if}} {{#if output.usesDhe}} - # {{output.dhCommand}} > /path/to/dhparam.pem - ssl_dhparam /path/to/dhparam.pem; + # {{output.dhCommand}} > /path/to/dhparam + ssl_dhparam /path/to/dhparam; {{/if}} # {{form.config}} configuration diff --git a/src/templates/partials/postfix.hbs b/src/templates/partials/postfix.hbs index bbd1c86..e0dee54 100644 --- a/src/templates/partials/postfix.hbs +++ b/src/templates/partials/postfix.hbs @@ -13,9 +13,9 @@ smtpd_tls_mandatory_ciphers = medium {{/if}} {{#if output.usesDhe}} -# {{output.dhCommand}} > /path/to/dhparam.pem +# {{output.dhCommand}} > /path/to/dhparam # not actually 1024 bits, this applies to all DHE >= 1024 bits -smtpd_tls_dh1024_param_file = /path/to/dhparam.pem +smtpd_tls_dh1024_param_file = /path/to/dhparam {{/if}} {{#if output.ciphers.length}} diff --git a/src/templates/partials/postgresql.hbs b/src/templates/partials/postgresql.hbs index d69d122..278412f 100644 --- a/src/templates/partials/postgresql.hbs +++ b/src/templates/partials/postgresql.hbs @@ -7,8 +7,8 @@ ssl_key_file = '/path/to/private_key' {{#if output.usesDhe}} {{#if (minver "10.0.0" form.serverVersion)}} -# {{output.dhCommand}} > /path/to/dhparam.pem -ssl_dh_params_file = '/path/to/dhparam.pem' +# {{output.dhCommand}} > /path/to/dhparam +ssl_dh_params_file = '/path/to/dhparam' {{/if}} {{/if}} {{#if output.ciphers.length}} |