Merge pull request mozilla#228 from janbrasna/upd/join-output-protocols

Join output protocols
gstrauss · Jan 5, 2024 · 429d1cc · 429d1cc
2 parents a93ea76 + aef4045
commit 429d1cc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/templates/partials/mysql.hbs b/src/templates/partials/mysql.hbs
@@ -7,4 +7,4 @@ ssl-key = /path/to/private_key
 {{#if output.ciphers.length}}
 ssl-cipher = {{{join output.ciphers ":"}}}
 {{/if}}
-tls_version = {{#each output.protocols}}{{this}}{{#unless @last}},{{/unless}}{{/each}}
+tls_version = {{join output.protocols ","}}
diff --git a/src/templates/partials/nginx.hbs b/src/templates/partials/nginx.hbs
@@ -42,7 +42,7 @@ server {
 
 {{/if}}
     # {{form.config}} configuration
-    ssl_protocols{{#each output.protocols}} {{this}}{{/each}};
+    ssl_protocols {{join output.protocols " "}};
 {{#if output.ciphers.length}}
     ssl_ciphers {{{join output.ciphers ":"}}};
 {{/if}}

diff --git a/src/templates/partials/proftpd.hbs b/src/templates/partials/proftpd.hbs
@@ -19,7 +19,7 @@ TLSDHParamFile                /path/to/dhparam
 {{/if}}
 
 # {{form.config}} configuration
-TLSProtocol                  {{#each output.protocols}} {{this}}{{/each}}
+TLSProtocol                   {{join output.protocols " "}}
 {{#if output.ciphers.length}}
 TLSCipherSuite                {{{join output.ciphers ":"}}}
 {{/if}}

diff --git a/src/templates/partials/redis.hbs b/src/templates/partials/redis.hbs
@@ -19,7 +19,7 @@ tls-dh-params-file /path/to/dhparam
 {{/if}}
 
 # {{form.config}} configuration
-tls-protocols "{{#each output.protocols}}{{this}}{{#unless @last}} {{/unless}}{{/each}}"
+tls-protocols "{{join output.protocols " "}}"
 {{#if output.ciphers.length}}
 tls-ciphers {{{join output.ciphers ":"}}}
 {{/if}}

diff --git a/src/templates/partials/tomcat.hbs b/src/templates/partials/tomcat.hbs
@@ -17,7 +17,7 @@
 {{/if}}
         disableSessionTickets="true"
         honorCipherOrder="{{#if output.serverPreferredOrder}}true{{else}}false{{/if}}"
-        protocols="{{#each output.protocols}}{{this}}{{#unless @last}}, {{/unless}}{{/each}}">
+        protocols="{{join output.protocols ", "}}">
 
         <Certificate
             certificateFile="/path/to/signed_certificate"
@@ -26,4 +26,4 @@
     </SSLHostConfig>
 
     <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-</Connector>
+</Connector>