Merge pull request #1935 from aukesj/master

(MODULES-9668 ) Please make ProxyRequests setting in vhost.pp configurable

CHANGELOG.md

@@ -808,6 +808,7 @@ This release features many improvements and bugfixes, including several new defi
   - passenger_ruby
   - passenger_start_timeout
   - proxy_preserve_host
+  - proxy_requests
   - redirectmatch_dest
   - ssl_crl_check
   - wsgi_chunked_request

HISTORY.md

@@ -698,6 +698,7 @@ This release features many improvements and bugfixes, including several new defi
   - passenger_ruby
   - passenger_start_timeout
   - proxy_preserve_host
+  - proxy_requests
   - redirectmatch_dest
   - ssl_crl_check
   - wsgi_chunked_request

REFERENCE.md

@@ -4657,7 +4657,7 @@ The following parameters are available in the `apache::mod::proxy` class.
 
 ##### `proxy_requests`
 
-Data type: `Any`
+Data type: `Boolean`
 
 Enables forward (standard) proxy requests.
 
@@ -7369,6 +7369,16 @@ X-Forwarded-Host and X-Forwarded-Server) get sent to the backend server.
 
 Default value: `undef`
 
+##### `proxy_requests`
+
+Data type: `Boolean`
+
+Sets the [ProxyRequests Directive](https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyrequests).
+This prarmeter allows or prevents Apache httpd from functioning as a forward proxy server.
+(Setting ProxyRequests to Off does not disable use of the ProxyPass directive.)
+
+Default value: `false`
+
 ##### `proxy_error_override`
 
 Data type: `Any`

manifests/vhost.pp

@@ -1705,6 +1705,7 @@
   $proxy_dest_reverse_match                                                         = undef,
   $proxy_pass                                                                       = undef,
   $proxy_pass_match                                                                 = undef,
+  Boolean $proxy_requests                                                           = false,
   $suphp_addhandler                                                                 = $::apache::params::suphp_addhandler,
   Enum['on', 'off'] $suphp_engine                                                   = $::apache::params::suphp_engine,
   $suphp_configpath                                                                 = $::apache::params::suphp_configpath,

spec/defines/vhost_spec.rb

@@ -279,6 +279,7 @@
                   'setenv' => ['proxy-nokeepalive 1', 'force-proxy-request-1.0 1'],
                 },
               ],
+              'proxy_requests'              => false,
               'suphp_addhandler'            => 'foo',
               'suphp_engine'                => 'on',
               'suphp_configpath'            => '/var/www/html',

templates/vhost/_proxy.erb

@@ -1,8 +1,12 @@
 <% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%>
 
   ## Proxy rules
+<% if @proxy_requests -%>
+  ProxyRequests On
+<% else -%>
   ProxyRequests Off
 <%- end -%>
+<%- end -%>
 <% if @proxy_preserve_host -%>
   ProxyPreserveHost On
 <% else -%>