diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index c867923..793c884 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -46,8 +46,8 @@ $frontend_mode = undef, $fe_use_backend = '', $fe_bind_mode = undef, $frontend_order = '010', -$acl_rule = '', -$acl_order = '020', +$acl_rule_front = '', +$acl_rule_back = '', $backend_name = undef, $backend_order = '030', $fe_maxconn = undef, @@ -68,13 +68,6 @@ $hy_acl_rule = 'cd_haproxy/haproxy_acl_rule.erb' order => $frontend_order, } - # create acl section - concat::fragment { "acl_${name}": - target => $hy_main_config, - content => template($hy_acl_rule), - order => $acl_order, - } - # create backend section concat::fragment { "backend_${name}": target => $hy_main_config, diff --git a/templates/haproxy_backend_rule.erb b/templates/haproxy_backend_rule.erb index 090772e..bc37d81 100644 --- a/templates/haproxy_backend_rule.erb +++ b/templates/haproxy_backend_rule.erb @@ -1,5 +1,9 @@ <% if @fqdn == @haproxy_fqdn -%> backend <%= @backend_name %> +<% if @acl_rule_back != '' -%> +<% @acl_rule.each do |acl_rule| -%> +acl <%= acl_rule %> +<% end -%> <% @be_server_name.each do |be_server| -%> server <%= be_server %> <% end end -%> diff --git a/templates/haproxy_frontend_rule.erb b/templates/haproxy_frontend_rule.erb index fa32b69..7468107 100644 --- a/templates/haproxy_frontend_rule.erb +++ b/templates/haproxy_frontend_rule.erb @@ -7,6 +7,10 @@ maxconn <%= @fe_maxconn %> <% end -%> <% if @fe_maxconn == '' -%> <% end -%> +<% if @acl_rule_front != '' -%> +<% @acl_rule.each do |acl_rule| -%> +acl <%= acl_rule %> +<% end -%> <% if @fe_use_backend != '' -%> use_backend <%= @fe_use_backend %>