confdroid/confdroid_haproxy
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

update proxy and tmplate

Browse Source
This commit is contained in:
Arne Teuke
2025-02-08 15:01:43 +01:00
parent c61d7089f5
commit 780aff787a
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/server/proxy.pp
View File

@@ -72,19 +72,13 @@ define cd_haproxy::server::proxy (
order => $frontend_order, order => $frontend_order,
} }
# Flag to ensure backends are only created once # Ensure backends are only created once
$backends_created = false ensure_resource('concat::fragment', "backends_${name}", {
'target' => $hy_main_config,
'content' => template($hy_backendrule),
'order' => $backend_order,
})
unless $backends_created {
$backend_configs.each |$index, $backend_config| {
concat::fragment { "backend_${name}_${index}":
target => $hy_main_config,
content => template($hy_backendrule),
order => "${backend_order}${index}",
}
}
$backends_created = true
}
# # create backend section # # create backend section
# concat::fragment { "backend_${name}": # concat::fragment { "backend_${name}":

12
templates/haproxy_backend_rule.erb
View File

@@ -1,20 +1,8 @@
<% if @fqdn == @haproxy_fqdn -%> <% if @fqdn == @haproxy_fqdn -%>
<% if @backend_configs and !@backend_configs.empty? -%> <% if @backend_configs and !@backend_configs.empty? -%>
<% @backend_configs.each do |backend_config| -%> <% @backend_configs.each do |backend_config| -%>
<% if backend_config['backend_name'] != '' -%>
backend <%= backend_config['backend_name'] %> backend <%= backend_config['backend_name'] %>
<% end -%>
<% if backend_config['be_mode'] != '' -%>
mode <%= backend_config['be_mode'] %> mode <%= backend_config['be_mode'] %>
<% end -%>
<% if backend_config['be_balance'] != '' -%>
balance <%= backend_config['be_balance'] %>
<% end -%>
<% if backend_config['be_option_array'] and !backend_config['be_option_array'].empty? -%>
<% backend_config['be_option_array'].each do |be_option| -%>
option <%= be_option %>
<% end -%>
<% end -%>
<% if backend_config['be_server_name_array'] and !backend_config['be_server_name_array'].empty? -%> <% 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| -%> <% backend_config['be_server_name_array'].each do |be_server_name| -%>
server <%= be_server_name %> server <%= be_server_name %>