From 3484c3416772c5f80b94906cb79aa79d8802c6e6 Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Sat, 8 Feb 2025 14:11:23 +0100
Subject: [PATCH] update proxy and tmplate

---
 manifests/server/proxy.pp          |  8 +++-----
 templates/haproxy_backend_rule.erb | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp
index 741c9b2..5950457 100644
--- a/manifests/server/proxy.pp
+++ b/manifests/server/proxy.pp
@@ -76,11 +76,9 @@ define cd_haproxy::server::proxy (
   # Create backend sections dynamically based on $backend_configs
   $backend_configs.each |$index, $backend_config| {
     concat::fragment { "backend_${name}_${index}":
-      target    =>  $hy_main_config,
-      content   =>  template($hy_backendrule),
-      order     =>  $backend_order,
-      # Use variables from the backend config for each backend
-      variables => $backend_config,
+      target  =>  $hy_main_config,
+      content =>  template($hy_backendrule),
+      order   =>  "${backend_order}${index}",  # Ensure unique order for each backend
     }
   }
 
diff --git a/templates/haproxy_backend_rule.erb b/templates/haproxy_backend_rule.erb
index 5a754c0..1df262a 100644
--- a/templates/haproxy_backend_rule.erb
+++ b/templates/haproxy_backend_rule.erb
@@ -1,20 +1,20 @@
 <% if @fqdn == @haproxy_fqdn -%>
-<% if @backend_name != '' -%>
-backend   <%= @backend_name %>
+<% if backend_name != '' -%>
+backend   <%= backend_name %>
 <% end -%>
-<% if @be_mode != '' -%>
-mode      <%= @be_mode %>
+<% if be_mode != '' -%>
+mode      <%= be_mode %>
 <% end -%>
-<% if @be_balance != '' -%>
-balance   <%= @be_balance %>
+<% if be_balance != '' -%>
+balance   <%= be_balance %>
 <% end -%>
-<% if @be_option_array and !@be_option_array.empty? -%>
-<% @be_option_array.each do |be_option| -%>
+<% if be_option_array and !be_option_array.empty? -%>
+<% be_option_array.each do |be_option| -%>
 option    <%= be_option %>
 <% end -%>
 <% end -%>
-<% if @be_server_name_array and !@be_server_name_array.empty? -%>
-<% @be_server_name_array.each do |be_server_name| -%>
+<% 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 -%>