Skip to content

Commit 02bac6b

Browse files
committed
haproxy Unify the fallback_local frontend name accross http and https
1 parent a898c26 commit 02bac6b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

packaging/aleph-vm/etc/haproxy/haproxy-aleph.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ backend bk_http
108108
# For HTTP - Use Host header
109109
use-server %[var(txn.host),lower,map(/etc/haproxy/http_domains.map)] if { var(txn.host) -m found }
110110
http-request set-header Host %[req.hdr(host)]
111-
server web1 127.0.0.1:4020
111+
server fallback_local 127.0.0.1:4020
112112

113113
# Default to fallback to the aleph-vm supervisor
114114
# Backend to terminate TLS for fallback (uses internal http frontend)

src/aleph/vm/haproxy.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ def update_haproxy_backends(socket_path, backend_name, map_file_path, weight=1):
272272
servers_to_remove = set(current_servers) - processed_servers
273273
# Do not remove the fallback server
274274
servers_to_remove.discard("fallback_local")
275+
servers_to_remove.discard("web1")
275276
if servers_to_remove:
276277
logger.info(f"Removing {len(servers_to_remove)} servers no longer in map file")
277278
for server_name in servers_to_remove:

0 commit comments

Comments
 (0)