meta-starlingx: remove the upstream layer

[pti/rtp.git] / meta-starlingx / meta-stx-cloud / recipes-support / puppet / files / puppetlabs-apache / 0001-maint-Fix-conditional-in-vhost-ssl-template.patch

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
deleted file mode 100644 (file)
index 15ed203..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-apache/0001-maint-Fix-conditional-in-vhost-ssl-template.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From aa11baed37639d37adfbb18f5431f597a6cedee8 Mon Sep 17 00:00:00 2001
-From: Bryan Jen <bryan.jen@gmail.com>
-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
-