diff --git a/.gitignore b/.gitignore index 99283d02..f536af86 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ __pycache__/ *.pyo # Pulumi -Pulumi.* *.bak .pulumi/ .pulumi-history/ diff --git a/config/sit/vpn-overlay.yaml b/config/sit/vpn-overlay.yaml index 874565af..dbcd4912 100644 --- a/config/sit/vpn-overlay.yaml +++ b/config/sit/vpn-overlay.yaml @@ -15,8 +15,8 @@ features: # WireGuard Hub 节点配置 hubs: - name: hub-1 - wg_ip: 10.255.0.1 - br_ip: 172.16.0.1 + wg_ip: 172.16.0.1 + br_ip: 10.253.253.1 public_ip: global-proxy.onwalk.net - name: hub2 @@ -28,12 +28,12 @@ hubs: sites: - name: master-1 interface: ens5 - allowed_ips: "10.255.0.0/16,10.253.0.0/16" + allowed_ips: "172.16.0.0/16,10.253.0.0/16" wireguard_peer: hub-1 - wg_ip: 10.255.0.200 - br_ip: 172.16.0.2 - local_ip: 10.255.0.200 - remote_ip: 10.255.0.100 + br_ip: 10.253.253.2 + wg_ip: 172.16.0.10 + local_ip: 172.16.0.10 + remote_ip: 172.16.0.11 vless: enabled: false uuid: "11111111-1111-1111-1111-111111111111" @@ -44,11 +44,11 @@ sites: - name: slave-1 interface: ens5 wireguard_peer: hub-1 - allowed_ips: "10.255.0.0/16,10.253.0.0/16" - br_ip: 172.16.0.3 - wg_ip: 10.255.0.100 - local_ip: 10.255.0.100 - remote_ip: 10.255.0.200 + allowed_ips: "172.16.0.0/16,10.253.0.0/16" + br_ip: 10.253.253.3 + wg_ip: 172.16.0.11 + local_ip: 172.16.0.11 + remote_ip: 172.16.0.10 vless: enabled: false # 此节点不通过 VLESS,直接访问 Hub diff --git a/iac_modules/pulumi/Pulumi.yaml b/iac_modules/pulumi/Pulumi.yaml new file mode 100644 index 00000000..98487e73 --- /dev/null +++ b/iac_modules/pulumi/Pulumi.yaml @@ -0,0 +1,3 @@ +name: modern-container-app +runtime: python +description: Pulumi IaaS 项目,用于 Modern Container App 架构部署