Automated backup - 20250729_000001

adwireguard/docker-compose.yml

@@ -14,8 +14,8 @@ services:
       - SERVERURL=will123song.xyz  # 从caddy配置中获取的域名
       - SERVERPORT=51820
       - PEERS=5  # 支持5个客户端
-      - PEERDNS=10.99.99.1  # 使用AdGuard作为DNS
-      - INTERNAL_SUBNET=10.99.99.0
+      - PEERDNS=1.1.1.1,8.8.8.8  # 使用Cloudflare和Google DNS
+      - INTERNAL_SUBNET=10.88.88.0
       - ALLOWEDIPS=0.0.0.0/0
       - LOG_CONFS=true
     volumes:
@@ -26,51 +26,6 @@ services:
     sysctls:
       - net.ipv4.conf.all.src_valid_mark=1
     restart: unless-stopped
-    networks:
-      adwireguard_network:
-        ipv4_address: 10.99.99.2
-
-  # AdGuard Home DNS Server (integrated with WireGuard)
-  adguard:
-    image: adguard/adguardhome:latest
-    container_name: adguard_wg
-    restart: unless-stopped
-    ports:
-      - "3002:3000/tcp"  # Web UI (different port to avoid conflict)
-    volumes:
-      - ./adguard_work:/opt/adguardhome/work
-      - ./adguard_conf:/opt/adguardhome/conf
-    networks:
-      adwireguard_network:
-        ipv4_address: 10.99.99.1
-    depends_on:
-      - wireguard
-
-  # Web管理界面代理 (可选)
-  nginx:
-    image: nginx:alpine
-    container_name: adwireguard_web
-    restart: unless-stopped
-    ports:
-      - "8080:80"
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./web:/usr/share/nginx/html:ro
-    networks:
-      - adwireguard_network
-    depends_on:
-      - adguard
-      - wireguard
 
 volumes:
-  wireguard_config:
-  adguard_work:
-  adguard_conf:
-
-networks:
-  adwireguard_network:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 10.99.99.0/24
-          gateway: 10.99.99.1
+  wireguard_config:

adwireguard/wireguard_config/.donoteditthisfile

@@ -1,7 +1,7 @@
 ORIG_SERVERURL="will123song.xyz"
 ORIG_SERVERPORT="51820"
-ORIG_PEERDNS="10.99.99.1"
+ORIG_PEERDNS="1.1.1.1,8.8.8.8"
 ORIG_PEERS="5"
-ORIG_INTERFACE="10.99.99"
+ORIG_INTERFACE="10.88.88"
 ORIG_ALLOWEDIPS="0.0.0.0/0"
 ORIG_PERSISTENTKEEPALIVE_PEERS=""

adwireguard/wireguard_config/peer1/peer1.conf

@@ -1,8 +1,8 @@
 [Interface]
-Address = 10.99.99.2
+Address = 10.88.88.2
 PrivateKey = eMKDKj+T/bqWPrvhRqPx8en6Vq1BUwDuT/Hhss871HQ=
 ListenPort = 51820
-DNS = 10.99.99.1
+DNS = 1.1.1.1,8.8.8.8
 
 [Peer]
 PublicKey = WBqIC7XpVtjreZt5GF/BLo7DpXqZrbu9gv74pons2gA=

adwireguard/wireguard_config/peer2/peer2.conf

@@ -1,8 +1,8 @@
 [Interface]
-Address = 10.99.99.3
+Address = 10.88.88.3
 PrivateKey = 0LFpFeHETDTVbU8vy3uq2SGNWrBH5gJYU5LKhkHWCUc=
 ListenPort = 51820
-DNS = 10.99.99.1
+DNS = 1.1.1.1,8.8.8.8
 
 [Peer]
 PublicKey = WBqIC7XpVtjreZt5GF/BLo7DpXqZrbu9gv74pons2gA=

adwireguard/wireguard_config/peer3/peer3.conf

@@ -1,8 +1,8 @@
 [Interface]
-Address = 10.99.99.4
+Address = 10.88.88.4
 PrivateKey = KElddZxSWLQXsr8vgWU7CxqFnHuf3s5lS0bj9hqoT3o=
 ListenPort = 51820
-DNS = 10.99.99.1
+DNS = 1.1.1.1,8.8.8.8
 
 [Peer]
 PublicKey = WBqIC7XpVtjreZt5GF/BLo7DpXqZrbu9gv74pons2gA=

adwireguard/wireguard_config/peer4/peer4.conf

@@ -1,8 +1,8 @@
 [Interface]
-Address = 10.99.99.5
+Address = 10.88.88.5
 PrivateKey = WA2IbKsg2rtbYCwJlZjox6nj3beGJEGu2p4qHFWHImQ=
 ListenPort = 51820
-DNS = 10.99.99.1
+DNS = 1.1.1.1,8.8.8.8
 
 [Peer]
 PublicKey = WBqIC7XpVtjreZt5GF/BLo7DpXqZrbu9gv74pons2gA=

adwireguard/wireguard_config/peer5/peer5.conf

@@ -1,8 +1,8 @@
 [Interface]
-Address = 10.99.99.6
+Address = 10.88.88.6
 PrivateKey = eBoR6Lm6Llz8IefrHu94C9Qvc5rfUKxPaVPLmPZgiVc=
 ListenPort = 51820
-DNS = 10.99.99.1
+DNS = 1.1.1.1,8.8.8.8
 
 [Peer]
 PublicKey = WBqIC7XpVtjreZt5GF/BLo7DpXqZrbu9gv74pons2gA=

adwireguard/wireguard_config/wg_confs/wg0.conf

@@ -1,5 +1,5 @@
 [Interface]
-Address = 10.99.99.1
+Address = 10.88.88.1
 ListenPort = 51820
 PrivateKey = YNXol4rvLMXngA0pkxXUkkxANO+GMYArW7usbbpkvV4=
 PostUp = iptables -A FORWARD -i %i -j ACCEPT; iptables -A FORWARD -o %i -j ACCEPT; iptables -t nat -A POSTROUTING -o eth+ -j MASQUERADE
@@ -9,29 +9,29 @@ PostDown = iptables -D FORWARD -i %i -j ACCEPT; iptables -D FORWARD -o %i -j ACC
 # peer1
 PublicKey = fdn1mU/iG6avnWBzy0dKmAxgIFLGWO77KS8nIE15fnE=
 PresharedKey = mP7oNgTh4FAzKRj+Ib53SC7uMO7fhxtEdTPwOuZCwD8=
-AllowedIPs = 10.99.99.2/32
+AllowedIPs = 10.88.88.2/32
 
 [Peer]
 # peer2
 PublicKey = gtav3MLgVRukd/HJ0FFOFRJ7bhx/cU3WwfTQGu79GBY=
 PresharedKey = Wbwh8gE6k63LOjuXAy1sFN6VqoGcgEvq62WONHutD6I=
-AllowedIPs = 10.99.99.3/32
+AllowedIPs = 10.88.88.3/32
 
 [Peer]
 # peer3
 PublicKey = 9g0Q3umKlWhiL3dTmIiMSHXeCc9YXtg5vBTcOar7Bh8=
 PresharedKey = NJotC0A6bO2o8mkpSWvZ1OSdi90jKkVFMSYMakzM+F0=
-AllowedIPs = 10.99.99.4/32
+AllowedIPs = 10.88.88.4/32
 
 [Peer]
 # peer4
 PublicKey = eZEv8DzOwraaUyoeU31fDUQrKzHaPC8EGEWp6JH9xiI=
 PresharedKey = RtXAOz29/zNgr6xcdeyRE3wzzu94QuwYc7AiWBh2Wqw=
-AllowedIPs = 10.99.99.5/32
+AllowedIPs = 10.88.88.5/32
 
 [Peer]
 # peer5
 PublicKey = S2rwMN2aOoC1vsyyMjA3STT3AsYFHAOuglxMn03Ut0U=
 PresharedKey = irzJtDsZhpL7+y9gyUFb7JVNfWQMTwiK3HVEQR7RBYk=
-AllowedIPs = 10.99.99.6/32
+AllowedIPs = 10.88.88.6/32