X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-apache%2F0001-maint-Fix-conditional-in-vhost-ssl-template.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-apache%2F0001-maint-Fix-conditional-in-vhost-ssl-template.patch;h=15ed2039056fb9b79e550e028499c86cbb8a4100;hb=e0634c6eaf2fe2641a0fb90e84a5defb880b1335;hp=0000000000000000000000000000000000000000;hpb=210d0f78485e760dffcdd3f630f59cec797f3f11;p=pti%2Frtp.git diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-apache/0001-maint-Fix-conditional-in-vhost-ssl-template.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-apache/0001-maint-Fix-conditional-in-vhost-ssl-template.patch new file mode 100644 index 0000000..15ed203 --- /dev/null +++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-apache/0001-maint-Fix-conditional-in-vhost-ssl-template.patch @@ -0,0 +1,25 @@ +From aa11baed37639d37adfbb18f5431f597a6cedee8 Mon Sep 17 00:00:00 2001 +From: Bryan Jen +Date: Thu, 15 Dec 2016 23:22:53 +0000 +Subject: [PATCH 1/2] (maint) Fix conditional in vhost ssl template + +--- + templates/vhost/_ssl.erb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb +index 1ca7cbfb..c92f70c8 100644 +--- a/templates/vhost/_ssl.erb ++++ b/templates/vhost/_ssl.erb +@@ -49,7 +49,7 @@ + <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> + SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %> + <%- end -%> +- <%- if not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> ++ <%- if (not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%> + SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %> + <%- end -%> + <% end -%> +-- +2.17.1 +