diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index 030b616..7ad1e8e 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -63,7 +63,7 @@ define cd_haproxy::server::proxy ( $hy_acl_rule = 'cd_haproxy/haproxy_acl_rule.erb' - # Ensure acl_rule_front and acl_rule_back are arrays + # 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, ';') $backend_name_array = split($backend_name, ';') diff --git a/templates/haproxy_backend_rule.erb b/templates/haproxy_backend_rule.erb index 1e39c1d..dcd5bc8 100644 --- a/templates/haproxy_backend_rule.erb +++ b/templates/haproxy_backend_rule.erb @@ -1,24 +1,24 @@ <% if @fqdn == @haproxy_fqdn -%> - <% if @backend_name_array and !@backend_name_array.empty? -%> - <% @backend_name_array.each do |backend_name| -%> - backend <%= backend_name %> - <% if @be_mode != '' -%> - mode <%= @be_mode %> - <% end -%> - <% if @acl_rule_back_array and !@acl_rule_back_array.empty? -%> - <% @acl_rule_back_array.each do |acl_rule| -%> - acl <%= acl_rule %> - <% end -%> - <% end -%> - <% if @be_balance != '' -%> - balance <%= @be_balance %> - <% end -%> - <% if @be_server_name_array and !@be_server_name_array.empty? -%> - <% @be_server_name_array.each do |be_server_name| -%> - server <%= be_server_name %> - <% end -%> - <% end -%> - <% end -%> - <% end -%> +<% if @backend_name_array and !@backend_name_array.empty? -%> +<% @backend_name_array.each do |backend_name| -%> +backend <%= backend_name %> +<% if @be_mode != '' -%> +mode <%= @be_mode %> +<% end -%> +<% if @acl_rule_back_array and !@acl_rule_back_array.empty? -%> +<% @acl_rule_back_array.each do |acl_rule| -%> +acl <%= acl_rule %> +<% end -%> +<% end -%> +<% if @be_balance != '' -%> +balance <%= @be_balance %> +<% end -%> +<% if @be_server_name_array and !@be_server_name_array.empty? -%> +<% @be_server_name_array.each do |be_server_name| -%> +server <%= be_server_name %> +<% end -%> +<% end -%> +<% end -%> +<% end -%> <% end -%> diff --git a/templates/haproxy_frontend_rule.erb b/templates/haproxy_frontend_rule.erb index d6bbfa1..cb76b0c 100644 --- a/templates/haproxy_frontend_rule.erb +++ b/templates/haproxy_frontend_rule.erb @@ -1,18 +1,18 @@ <% if @fqdn == @haproxy_fqdn -%> - frontend <%= @frontend_name %> - mode <%= @frontend_mode %> - bind <%= @fe_bind_mode %> - <% if @fe_maxconn != '' -%> - maxconn <%= @fe_maxconn %> - <% end -%> - <% if @acl_rule_front_array and !@acl_rule_front_array.empty? -%> - <% @acl_rule_front_array.each do |acl_rule| -%> - acl <%= acl_rule %> - <% end -%> - <% end -%> - <% if @fe_use_backend_array and !@fe_use_backend_array.empty? -%> - <% @fe_use_backend_array.each do |fe_use_backend| -%> - use_backend <%= fe_use_backend %> - <% end -%> - <% end -%> +frontend <%= @frontend_name %> +mode <%= @frontend_mode %> +bind <%= @fe_bind_mode %> +<% if @fe_maxconn != '' -%> +maxconn <%= @fe_maxconn %> +<% end -%> +<% if @acl_rule_front_array and !@acl_rule_front_array.empty? -%> +<% @acl_rule_front_array.each do |acl_rule| -%> +acl <%= acl_rule %> +<% end -%> +<% end -%> +<% if @fe_use_backend_array and !@fe_use_backend_array.empty? -%> +<% @fe_use_backend_array.each do |fe_use_backend| -%> +use_backend <%= fe_use_backend %> +<% end -%> +<% end -%> <% end -%>