Supporting proxy_http_version within locations

shredder12 · Oct 6, 2015 · 330a393 · 330a393
1 parent 27da00a
commit 330a393
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -78,6 +78,7 @@
 #     different replies.
 #   [*proxy_method*]         - If defined, overrides the HTTP method of the
 #     request to be passed to the backend.
+#   [*proxy_http_version*]      - Sets the proxy http version
 #   [*proxy_set_body*]       - If defined, sets the body passed to the backend.
 #   [*auth_basic*]            - This directive includes testing name and password
 #     with HTTP Basic Authentication.
@@ -174,6 +175,7 @@
   $proxy_cache_use_stale = undef,
   $proxy_cache_valid    = false,
   $proxy_method         = undef,
+  $proxy_http_version   = undef,
   $proxy_set_body       = undef,
   $auth_basic           = undef,
   $auth_basic_user_file = undef,
@@ -295,6 +297,9 @@
   if ($proxy_method != undef) {
     validate_string($proxy_method)
   }
+  if ($proxy_http_version != undef) {
+    validate_string($proxy_http_version)
+  }
   if ($proxy_set_body != undef) {
     validate_string($proxy_set_body)
   }

diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -94,6 +94,7 @@
 #     different replies.
 #   [*proxy_method*]            - If defined, overrides the HTTP method of the
 #     request to be passed to the backend.
+#   [*proxy_http_version*]      - Sets the proxy http version
 #   [*proxy_set_body*]          - If defined, sets the body passed to the backend.
 #   [*auth_basic*]              - This directive includes testing name and
 #      password with HTTP Basic Authentication.
@@ -205,6 +206,7 @@
   $proxy_cache_use_stale        = undef,
   $proxy_cache_valid            = false,
   $proxy_method                 = undef,
+  $proxy_http_version           = undef,
   $proxy_set_body               = undef,
   $resolver                     = [],
   $fastcgi                      = undef,
@@ -345,6 +347,9 @@
   if ($proxy_method != undef) {
     validate_string($proxy_method)
   }
+  if ($proxy_http_version != undef) {
+    validate_string($proxy_http_version)
+  }
   if ($proxy_set_body != undef) {
     validate_string($proxy_set_body)
   }
@@ -550,6 +555,7 @@
       proxy_cache_use_stale       => $proxy_cache_use_stale,
       proxy_cache_valid           => $proxy_cache_valid,
       proxy_method                => $proxy_method,
+      proxy_http_version          => $proxy_http_version,
       proxy_set_header            => $proxy_set_header,
       proxy_set_body              => $proxy_set_body,
       fastcgi                     => $fastcgi,

diff --git a/templates/vhost/locations/proxy.erb b/templates/vhost/locations/proxy.erb
@@ -2,6 +2,9 @@
     proxy_read_timeout    <%= @proxy_read_timeout %>;
     proxy_connect_timeout <%= @proxy_connect_timeout %>;
     proxy_redirect        <%= @proxy_redirect %>;
+<% if @proxy_http_version -%>
+    proxy_http_version    <%= @proxy_http_version %>;
+<% end -%>
 <% if @proxy_method -%>
     proxy_method          <%= @proxy_method %>;
 <% end -%>