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%2F0002-maint-Fix-the-vhost-ssl-template-correctly-this-time.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-apache%2F0002-maint-Fix-the-vhost-ssl-template-correctly-this-time.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=38bab57d7099c351249f3c8e9ed1eb12781fb177;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-apache/0002-maint-Fix-the-vhost-ssl-template-correctly-this-time.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-apache/0002-maint-Fix-the-vhost-ssl-template-correctly-this-time.patch deleted file mode 100644 index 38bab57..0000000 --- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-apache/0002-maint-Fix-the-vhost-ssl-template-correctly-this-time.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 90e50eedd7c8ba0d1e1c17ba678525630bb7e023 Mon Sep 17 00:00:00 2001 -From: Bryan Jen -Date: Fri, 16 Dec 2016 15:57:46 +0000 -Subject: [PATCH 2/2] (maint) Fix the vhost ssl template correctly this time - ---- - 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 c92f70c8..e70efebd 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 -