From baa10d06e20e20c0d387aebd56d348ab35a97c70 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 1 Nov 2025 18:11:47 +0100 Subject: [PATCH] fix haproxy --- vm1/docker-compose.yml | 12 +++++++----- vm1/haproxy.cfg | 15 +++------------ vm2/docker-compose.yml | 12 +++++++----- vm2/haproxy.cfg | 19 +++++-------------- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/vm1/docker-compose.yml b/vm1/docker-compose.yml index ddbf936..ea91adb 100644 --- a/vm1/docker-compose.yml +++ b/vm1/docker-compose.yml @@ -90,18 +90,20 @@ services: - app-network ports: - "21:21" - - "30000-30009:30000-30009" + - "40000-40499:40000-40499" - "8404:8404" keepalived: - image: osixia/keepalived:2.0.20 + image: alpine:latest container_name: keepalived restart: unless-stopped cap_add: - NET_ADMIN + - NET_BROADCAST + - NET_RAW network_mode: host - environment: - KEEPALIVED_PRIORITY: 100 - KEEPALIVED_VIRTUAL_IPS: "${VIP:-192.168.1.210}" + volumes: + - ./keepalived-master.conf:/etc/keepalived/keepalived.conf:ro + command: sh -c "apk add --no-cache keepalived && keepalived -n -l -f /etc/keepalived/keepalived.conf" promtail: image: grafana/promtail:2.9.3 container_name: promtail diff --git a/vm1/haproxy.cfg b/vm1/haproxy.cfg index f3d5f63..ec9b08c 100644 --- a/vm1/haproxy.cfg +++ b/vm1/haproxy.cfg @@ -24,15 +24,6 @@ backend mysql_backend mode tcp server mysql1 192.168.1.201:3306 check -frontend redis_frontend - bind *:6379 - default_backend redis_backend - -backend redis_backend - mode tcp - server redis1 192.168.1.201:6379 check - server redis2 192.168.1.202:6379 check backup - frontend ftp_control bind *:21 default_backend ftp_servers @@ -44,12 +35,12 @@ backend ftp_servers server ftp2 192.168.1.202:21 check frontend ftp_passive - bind *:30000-30009 + bind *:40000-40499 mode tcp default_backend ftp_passive_servers backend ftp_passive_servers mode tcp balance source - server ftp1 ftp-server-1:30000 check - server ftp2 192.168.1.202:30000 check + server ftp1 ftp-server-1:40000 check port 21 + server ftp2 192.168.1.202:40000 check port 21 diff --git a/vm2/docker-compose.yml b/vm2/docker-compose.yml index 43946cc..d628ed3 100644 --- a/vm2/docker-compose.yml +++ b/vm2/docker-compose.yml @@ -67,18 +67,20 @@ services: - app-network ports: - "21:21" - - "30000-30009:30000-30009" + - "40000-40499:40000-40499" - "8404:8404" keepalived: - image: osixia/keepalived:2.0.20 + image: alpine:latest container_name: keepalived restart: unless-stopped cap_add: - NET_ADMIN + - NET_BROADCAST + - NET_RAW network_mode: host - environment: - KEEPALIVED_PRIORITY: 50 - KEEPALIVED_VIRTUAL_IPS: "${VIP:-192.168.1.210}" + volumes: + - ./keepalived-backup.conf:/etc/keepalived/keepalived.conf:ro + command: sh -c "apk add --no-cache keepalived && keepalived -n -l -f /etc/keepalived/keepalived.conf" promtail: image: grafana/promtail:2.9.3 container_name: promtail diff --git a/vm2/haproxy.cfg b/vm2/haproxy.cfg index f3d5f63..f00e8ca 100644 --- a/vm2/haproxy.cfg +++ b/vm2/haproxy.cfg @@ -24,15 +24,6 @@ backend mysql_backend mode tcp server mysql1 192.168.1.201:3306 check -frontend redis_frontend - bind *:6379 - default_backend redis_backend - -backend redis_backend - mode tcp - server redis1 192.168.1.201:6379 check - server redis2 192.168.1.202:6379 check backup - frontend ftp_control bind *:21 default_backend ftp_servers @@ -40,16 +31,16 @@ frontend ftp_control backend ftp_servers mode tcp balance source - server ftp1 ftp-server-1:21 check - server ftp2 192.168.1.202:21 check + server ftp1 192.168.1.201:21 check + server ftp2 ftp-server-2:21 check frontend ftp_passive - bind *:30000-30009 + bind *:40000-40499 mode tcp default_backend ftp_passive_servers backend ftp_passive_servers mode tcp balance source - server ftp1 ftp-server-1:30000 check - server ftp2 192.168.1.202:30000 check + server ftp1 192.168.1.201:40000 check port 21 + server ftp2 ftp-server-2:40000 check port 21