Merge pull request mozilla#264 from mozilla/upd/apache-protocols

Simplify protocol logic for Apache
janbrasna · Oct 17, 2024 · c2d962f · c2d962f
2 parents 1dbb020 + 5af341a
commit c2d962f
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/templates/partials/apache.hbs b/src/templates/partials/apache.hbs
@@ -38,14 +38,10 @@
 </VirtualHost>
 
 # {{form.config}} configuration
-{{#if (minver "2.3.16" form.serverVersion)}}
-SSLProtocol             all {{#unless (includes "SSLv3" output.protocols)}}-SSLv3{{/unless}}
-                            {{~#unless (includes "TLSv1" output.protocols)}} -TLSv1{{/unless}}
-                            {{~#unless (includes "TLSv1.1" output.protocols)}} -TLSv1.1{{/unless}}
-                            {{~#unless (includes "TLSv1.2" output.protocols)}} -TLSv1.2{{/unless}}
-{{else}}
-SSLProtocol             all -SSLv2 {{#unless (includes "SSLv3" output.protocols)}}-SSLv3 {{/unless}}{{#unless (includes "TLSv1" output.protocols)}}-TLSv1{{/unless}}{{#unless (includes "TLSv1.1" output.protocols)}} -TLSv1.1{{/unless}}{{#unless (includes "TLSv1.2" output.protocols)}} -TLSv1.2{{/unless}}
-{{/if}}
+SSLProtocol             all {{#unless (minver "2.3.16" form.serverVersion)}}-SSLv2 {{/unless}}-SSLv3
+                        {{~#unless (includes "TLSv1" output.protocols)}} -TLSv1{{/unless}}
+                        {{~#unless (includes "TLSv1.1" output.protocols)}} -TLSv1.1{{/unless}}
+                        {{~#unless (includes "TLSv1.2" output.protocols)}} -TLSv1.2{{/unless}}
 {{#if output.ciphers.length}}
 SSLCipherSuite          {{{join output.ciphers ":"}}}
 {{/if}}