diff --git a/warzone-phone b/warzone-phone index 6f4e8eb..09a18b0 160000 --- a/warzone-phone +++ b/warzone-phone @@ -1 +1 @@ -Subproject commit 6f4e8eb9f6df1c498cf4c0befbf9f2db5fb4c0d5 +Subproject commit 09a18b086bf0d0bf6a4a4eae4f0b27f80e381f25 diff --git a/warzone/deploy/docker/Dockerfile.wzp b/warzone/deploy/docker/Dockerfile.wzp index f4b0979..61491e6 100644 --- a/warzone/deploy/docker/Dockerfile.wzp +++ b/warzone/deploy/docker/Dockerfile.wzp @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y cmake pkg-config libssl-dev && rm -rf / WORKDIR /build -# Copy warzone-phone workspace +# Copy warzone-phone workspace (feature/wzp-web-variants branch) COPY warzone-phone/Cargo.toml warzone-phone/Cargo.lock ./warzone-phone/ COPY warzone-phone/crates ./warzone-phone/crates diff --git a/warzone/deploy/docker/docker-compose.yml b/warzone/deploy/docker/docker-compose.yml index 7ccaa1a..d742845 100644 --- a/warzone/deploy/docker/docker-compose.yml +++ b/warzone/deploy/docker/docker-compose.yml @@ -63,6 +63,8 @@ services: ipv4_address: 172.28.0.10 # ─── WZP web bridge (browser WS ↔ QUIC relay) ─── + # No --tls (Caddy handles TLS), no --auth-url (Caddy terminates) + # Variants: ?variant=pure|hybrid|full wzp-web: build: context: ../../.. diff --git a/warzone/scripts/deploy-chat.sh b/warzone/scripts/deploy-chat.sh index 46ad0a4..0b7199f 100755 --- a/warzone/scripts/deploy-chat.sh +++ b/warzone/scripts/deploy-chat.sh @@ -175,7 +175,7 @@ do_deploy() { echo "[1/4] Cloning repos on VPS..." ssh_cmd "rm -rf $DEPLOY_DIR && \ git clone --depth 1 -b $GIT_BRANCH $GIT_FC $DEPLOY_DIR && \ - git clone --depth 1 $GIT_WZP $DEPLOY_DIR/warzone-phone" + git clone --depth 1 -b feature/wzp-web-variants $GIT_WZP $DEPLOY_DIR/warzone-phone" echo "[2/4] Updating Caddyfile domain..." ssh_cmd "sed -i 's/voip.manko.yoga/$DOMAIN/g' $DOCKER_DIR/Caddyfile"