From 7341c24bc9cea06e7b79f7e5a0547f054eb64822 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sat, 22 Feb 2025 14:21:19 +0100 Subject: [PATCH] add backend options --- manifests/server/proxy.pp | 2 ++ templates/haproxy_backend_rule.erb | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index f0a70ad..591d803 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -46,6 +46,8 @@ define cd_haproxy::server::proxy ( $be_stick_table = '', $be_stick_on = '', $be_http_check = '', + $be_http_request = '', + $be_acl_rule = '', ) { diff --git a/templates/haproxy_backend_rule.erb b/templates/haproxy_backend_rule.erb index e12bb95..35c4d8a 100644 --- a/templates/haproxy_backend_rule.erb +++ b/templates/haproxy_backend_rule.erb @@ -2,26 +2,32 @@ <% if @backend_configs and !@backend_configs.empty? -%> <% @backend_configs.each do |backend_config| -%> -backend <%= backend_config['backend_name'] %> -mode <%= backend_config['be_mode'] %> +backend <%= backend_config['backend_name'] %> +mode <%= backend_config['be_mode'] %> <% if backend_config['be_balance'] and backend_config['be_balance'] != '' -%> -balance <%= backend_config['be_balance'] %> +balance <%= backend_config['be_balance'] %> <% end -%> <% if backend_config['be_option'] and backend_config['be_option'] != '' -%> -option <%= backend_config['be_option'] %> +option <%= backend_config['be_option'] %> <% end -%> <% if backend_config['be_stick_table'] and backend_config['be_stick_table'] != '' -%> -stick-table <%= backend_config['be_stick_table'] %> +stick-table <%= backend_config['be_stick_table'] %> <% end -%> <% if backend_config['be_stick_on'] and backend_config['be_stick_on'] != '' -%> -stick on <%= backend_config['be_stick_on'] %> +stick on <%= backend_config['be_stick_on'] %> <% end -%> <% if backend_config['be_http_check'] and backend_config['be_http_check'] != '' -%> -http-check <%= backend_config['be_http_check'] %> +http-check <%= backend_config['be_http_check'] %> +<% end -%> +<% if backend_config['be_acl_rule'] and backend_config['be_acl_rule'] != '' -%> +acl <%= backend_config['be_acl_rule'] %> +<% end -%> +<% if backend_config['be_http_request'] and backend_config['be_http_request'] != '' -%> +http-request <%= backend_config['be_http_request'] %> <% end -%> <% if backend_config['be_server_name_array'] and !backend_config['be_server_name_array'].empty? -%> <% backend_config['be_server_name_array'].each do |be_server_name| -%> -server <%= be_server_name %> +server <%= be_server_name %> <% end -%> <% end -%> <% end -%>