cloud-hosting-platform/haproxy-manager-base
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing order for haproxy config
All checks were successful
HAProxy Manager Build and Push / Build-and-Push (push) Successful in 39s
Details

Browse Source
This commit is contained in:
jknapp 2025-02-20 15:29:42 -08:00
parent b834a3c484
commit 576666d9da
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
haproxy_manager.py
View File

@ -281,7 +281,8 @@ def generate_config():
# Add Let's Encrypt # Add Let's Encrypt
letsencrypt_acl = template_env.get_template('hap_letsencrypt.tpl').render() letsencrypt_acl = template_env.get_template('hap_letsencrypt.tpl').render()
config_parts.append(letsencrypt_acl) config_parts.append(letsencrypt_acl)
config_acls = []
config_backends = []
# Add domain configurations # Add domain configurations
for domain in domains: for domain in domains:
if not domain['backend_name']: if not domain['backend_name']:
@ -294,7 +295,7 @@ def generate_config():
domain=domain['domain'], domain=domain['domain'],
name=domain['backend_name'] name=domain['backend_name']
) )
config_parts.append(domain_acl) config_acls.append(domain_acl)
print(f"Added ACL for domain: {domain['domain']}") # Debug log print(f"Added ACL for domain: {domain['domain']}") # Debug log
except Exception as e: except Exception as e:
print(f"Error generating domain ACL for {domain['domain']}: {e}") print(f"Error generating domain ACL for {domain['domain']}: {e}")
@ -316,12 +317,16 @@ def generate_config():
ssl_enabled=domain['ssl_enabled'], ssl_enabled=domain['ssl_enabled'],
servers=servers servers=servers
) )
config_parts.append(backend_block) config_backends.append(backend_block)
print(f"Added backend block for: {domain['backend_name']}") # Debug log print(f"Added backend block for: {domain['backend_name']}") # Debug log
except Exception as e: except Exception as e:
print(f"Error generating backend block for {domain['backend_name']}: {e}") print(f"Error generating backend block for {domain['backend_name']}: {e}")
continue continue
# Add ACLS
config_parts.append('\n' .join(config_acls))
# Add Backends
config_parts.append('\n' .join(config_backends))
# Write complete configuration to tmp # Write complete configuration to tmp
temp_config_path = "/etc/haproxy/haproxy.cfg" temp_config_path = "/etc/haproxy/haproxy.cfg"