diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index d772187..0e8d1c4 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -41,7 +41,7 @@ define cd_haproxy::server::proxy ( $default_backend = '', $be_option = '', $fe_tcp_request = '', - $fe_req_add = '', + $fe_http_request = '', ) { @@ -53,15 +53,15 @@ define cd_haproxy::server::proxy ( # Ensure acl_rule_front and acl_rule_back are arrays - $acl_rule_front_array = split($acl_rule_front, ';') - $acl_rule_back_array = split($acl_rule_back, ';') - $fe_use_backend_array = split($fe_use_backend,';') - $backend_name_array = split($backend_name, ';') - $be_server_name_array = split($be_server_name, ';') - $be_option_array = split($be_option, ';') - $fe_tcp_request_array = split($fe_tcp_request, ';') - $fe_option_array = split($fe_option, ';') - $fe_req_add_array = split($fe_req_add, ';') + $acl_rule_front_array = split($acl_rule_front, ';') + $acl_rule_back_array = split($acl_rule_back, ';') + $fe_use_backend_array = split($fe_use_backend,';') + $backend_name_array = split($backend_name, ';') + $be_server_name_array = split($be_server_name, ';') + $be_option_array = split($be_option, ';') + $fe_tcp_request_array = split($fe_tcp_request, ';') + $fe_option_array = split($fe_option, ';') + $fe_http_request_array = split($fe_http_request, ';') # create frontend section concat::fragment { "frontend_${name}": diff --git a/templates/haproxy_frontend_rule.erb b/templates/haproxy_frontend_rule.erb index f14c530..b0d3972 100644 --- a/templates/haproxy_frontend_rule.erb +++ b/templates/haproxy_frontend_rule.erb @@ -16,9 +16,9 @@ maxconn <%= @fe_maxconn %> option <%= fe_option %> <% end -%> <% end -%> -<% if @fe_req_add_array and !@fe_req_add_array.empty? -%> -<% @fe_req_add_array.each do |fe_req_add| -%> -reqadd <%= fe_req_add %> +<% if @fe_http_request_array and !@fe_http_request_array.empty? -%> +<% @fe_http_request_array.each do |fe_http_request| -%> +http-request <%= fe_http_request %> <% end -%> <% end -%>