From 166b200e4eabc11c09890e12b7c209172f13060e Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Tue, 28 Jan 2025 17:43:43 +0100
Subject: [PATCH] edit proxy

---
 manifests/server/proxy.pp           | 10 ++++-----
 templates/haproxy_backend_rule.erb  | 33 +++++++++++++++--------------
 templates/haproxy_frontend_rule.erb |  4 ++--
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp
index a7ad1a2..dcdbc40 100644
--- a/manifests/server/proxy.pp
+++ b/manifests/server/proxy.pp
@@ -43,15 +43,15 @@ define cd_haproxy::server::proxy (
   $haproxy_fqdn     = undef,
   $frontend_name    = undef,
   $frontend_mode    = undef,
-  $fe_use_backend   = [],
+  $fe_use_backend   = '',
   $fe_bind_mode     = undef,
   $frontend_order   = '010',
-  $acl_rule_front   = [],
-  $acl_rule_back    = [],
-  $backend_name     = [],
+  $acl_rule_front   = '',
+  $acl_rule_back    = '',
+  $backend_name     = '',
   $backend_order    = '030',
   $fe_maxconn       = '',
-  $be_server_name   = [],
+  $be_server_name   = '',
   $be_balance       = '',
   $be_mode          = '',
 
diff --git a/templates/haproxy_backend_rule.erb b/templates/haproxy_backend_rule.erb
index 42a77e8..1e39c1d 100644
--- a/templates/haproxy_backend_rule.erb
+++ b/templates/haproxy_backend_rule.erb
@@ -1,23 +1,24 @@
 <% if @fqdn == @haproxy_fqdn -%>
-  <% if !@backend_name_array.empty? -%>
+  <% 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 %>
+      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 -%>
-        <% if !@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.empty? -%>
-          <% @be_server_name_array.each do |be_server_name| -%>
-            server <%= be_server_name %>
-          <% 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 ae5c955..747d5b1 100644
--- a/templates/haproxy_frontend_rule.erb
+++ b/templates/haproxy_frontend_rule.erb
@@ -5,12 +5,12 @@
   <% if @fe_maxconn != '' -%>
     maxconn       <%= @fe_maxconn %>
   <% end -%>
-  <% if !@acl_rule_front_array.empty? -%>
+  <% 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.empty? -%>
+  <% 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 -%>