diff --git a/dev/compose.yaml b/dev/compose.yaml index 74dcd8b..507b478 100644 --- a/dev/compose.yaml +++ b/dev/compose.yaml @@ -9,7 +9,7 @@ services: environment: POSTGRES_PASSWORD: mysecretpassword volumes: - - postgres_data:/var/lib/postgresql + - postgres_data:/var/lib/postgresql/data healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 5s @@ -51,6 +51,7 @@ services: networks: pve: ipv4_address: 172.30.10.20 + wan6: {} pve1: image: docker.io/dockurr/proxmox @@ -66,6 +67,8 @@ services: volumes: - pve1_data:/var/lib/vz - pve1_config:/var/lib/pve-cluster + - pve1_corosync:/etc/corosync + - pve1_ssh:/root/.ssh - pve_shared:/shared networks: pve: @@ -85,6 +88,8 @@ services: volumes: - pve2_data:/var/lib/vz - pve2_config:/var/lib/pve-cluster + - pve2_corosync:/etc/corosync + - pve2_ssh:/root/.ssh - pve_shared:/shared networks: pve: @@ -104,6 +109,8 @@ services: volumes: - pve3_data:/var/lib/vz - pve3_config:/var/lib/pve-cluster + - pve3_corosync:/etc/corosync + - pve3_ssh:/root/.ssh - pve_shared:/shared networks: pve: @@ -120,6 +127,11 @@ networks: ipam: config: - subnet: 172.30.10.0/24 + wan6: + enable_ipv6: true + ipam: + config: + - subnet: fd42:f17a:57ac:12::/64 volumes: postgres_data: @@ -127,7 +139,13 @@ volumes: pve_shared: pve1_data: pve1_config: + pve1_corosync: + pve1_ssh: pve2_data: pve2_config: + pve2_corosync: + pve2_ssh: pve3_data: pve3_config: + pve3_corosync: + pve3_ssh: diff --git a/dev/gateway/entrypoint.sh b/dev/gateway/entrypoint.sh index b909255..2e8e5ed 100644 --- a/dev/gateway/entrypoint.sh +++ b/dev/gateway/entrypoint.sh @@ -48,4 +48,10 @@ iptables -t nat -C POSTROUTING -o eth0 -j MASQUERADE 2>/dev/null || ip6tables -t nat -C POSTROUTING -o vxlan100 -j MASQUERADE 2>/dev/null || ip6tables -t nat -A POSTROUTING -o vxlan100 -j MASQUERADE +wan6_iface=$(ip -6 -o addr show scope global | awk '/fd42:f17a:57ac:12:/{print $2; exit}') +if [ -n "$wan6_iface" ]; then + ip6tables -t nat -C POSTROUTING -o "$wan6_iface" -j MASQUERADE 2>/dev/null || + ip6tables -t nat -A POSTROUTING -o "$wan6_iface" -j MASQUERADE +fi + exec sleep infinity