diff --git a/app/bot.php b/app/bot.php index dd4a873..cc4e7bd 100644 --- a/app/bot.php +++ b/app/bot.php @@ -2189,8 +2189,8 @@ DNS-over-HTTPS with IP: "settings" => [ 'servers' => [ [ - "address" => "127.0.0.1", - "port" => 111, + "address" => "10.10.0.13", + "port" => 4000, ], ], ], diff --git a/docker-compose.yml b/docker-compose.yml index 078b7ae..102c322 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -490,3 +490,33 @@ services: default: ipv4_address: 10.10.0.12 logging: *default-logging + wp: + image: mercurykd/vpnbot-wp:1 + build: + dockerfile: dockerfile/warp.dockerfile + args: + image: ${IMAGE} + cap_add: + - NET_ADMIN + devices: + - /dev/net/tun:/dev/net/tun + volumes: + - ./config/.profile:/root/.bashrc:ro + - ./ssh:/ssh + - ./config/sshd_config:/etc/ssh/sshd_config + - ./config:/config + - ./certs:/certs + - ./scripts/start_wp.sh:/start_wp.sh + hostname: warp + container_name: warp-${VER} + depends_on: + php: + condition: service_healthy + environment: + TZ: ${TZ} + stop_grace_period: 1s + command: ["/bin/sh", "/start_wp.sh"] + networks: + default: + ipv4_address: 10.10.0.13 + logging: *default-logging diff --git a/dockerfile/warp.dockerfile b/dockerfile/warp.dockerfile new file mode 100644 index 0000000..2a13379 --- /dev/null +++ b/dockerfile/warp.dockerfile @@ -0,0 +1,5 @@ +FROM ubuntu:22.04 +RUN apt update && apt install -y curl gpg socat lsb-release \ + && curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list \ + && apt update && apt install -y cloudflare-warp diff --git a/scripts/start_wp.sh b/scripts/start_wp.sh new file mode 100644 index 0000000..a129d02 --- /dev/null +++ b/scripts/start_wp.sh @@ -0,0 +1,6 @@ +warp-svc > /dev/null & +sleep 3 +warp-cli --accept-tos registration new +warp-cli --accept-tos mode proxy +warp-cli --accept-tos connect +socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000 diff --git a/version b/version index 2209753..3059c37 100644 --- a/version +++ b/version @@ -1,3 +1,6 @@ +15.04.2024 v1.28 +- xtls: список блокировки, список warp +- улучшение отображения таймера 14.04.2024 v1.27.1 - singbox windows: замена winsw на winsw3, + скрипт обновления подписки 13.04.2024 v1.27