summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/vhost/proxy.pp4
-rw-r--r--templates/vhosts/proxy/proxy.erb8
2 files changed, 11 insertions, 1 deletions
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 56b2e1d..6cfdd16 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -28,7 +28,8 @@ define apache::vhost::proxy(
$server_admin = 'absent',
$logmode = 'default',
$mod_security = false,
- $ssl_mode = false
+ $ssl_mode = false,
+ $additional_options = 'absent'
){
# create vhost configuration file
# we use the options field as the target_url
@@ -50,6 +51,7 @@ define apache::vhost::proxy(
mod_security => $mod_security,
options => $target_url,
ssl_mode => $ssl_mode,
+ additional_options => $additional_options,
}
}
diff --git a/templates/vhosts/proxy/proxy.erb b/templates/vhosts/proxy/proxy.erb
index 5d94e69..3251b7d 100644
--- a/templates/vhosts/proxy/proxy.erb
+++ b/templates/vhosts/proxy/proxy.erb
@@ -37,6 +37,10 @@
ProxyPass / <%= options %>/
ProxyPassReverse / <%= options %>/
<%- end -%>
+
+ <%- unless additional_options.to_s == 'absent' then -%>
+ <%= additional_options %>
+ <%- end -%>
</VirtualHost>
<%- end -%>
@@ -74,5 +78,9 @@
ProxyRequests Off
ProxyPass / <%= options %>/
ProxyPassReverse / <%= options %>/
+
+ <%- unless additional_options.to_s == 'absent' then -%>
+ <%= additional_options %>
+ <%- end -%>
</VirtualHost>
<%- end -%>