warp registration fix

This commit is contained in:
mercury
2024-10-24 23:15:44 +04:00
parent 7d21937f04
commit c5b7e1ffdc
3 changed files with 13 additions and 6 deletions
+5 -3
View File
@@ -4661,9 +4661,11 @@ DNS-over-HTTPS with IP:
} else {
$this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
sleep(3);
$this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
if (!empty($p['warp'])) {
$this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
if (empty($this->ssh('[ -f "/var/lib/cloudflare-warp/conf.json" ] && echo 1', 'wp'))) {
$this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
if (!empty($p['warp'])) {
$this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
}
}
$this->send($this->input['chat'], 'Proxy mode: ' . $this->ssh('warp-cli --accept-tos mode proxy 2>&1', 'wp'));
$this->send($this->input['chat'], 'Connect: ' . $this->ssh('warp-cli --accept-tos connect 2>&1', 'wp'));
+2
View File
@@ -16,6 +16,7 @@ networks:
- subnet: 10.10.1.0/24
volumes:
adguard:
warp:
services:
up:
@@ -510,6 +511,7 @@ services:
- ./config:/config
- ./certs:/certs
- ./scripts/start_wp.sh:/start_wp.sh
- warp:/var/lib/cloudflare-warp
hostname: warp
container_name: warp-${VER}
depends_on:
+6 -3
View File
@@ -7,10 +7,13 @@ if [ "$off" == 'null' ]
then
warp-svc > /dev/null &
sleep 3
warp-cli --accept-tos registration new
if [ ! -z "$key" ]
if [ ! -f /var/lib/cloudflare-warp/conf.json ]
then
warp-cli --accept-tos registration license $key
warp-cli --accept-tos registration new
if [ ! -z "$key" ]
then
warp-cli --accept-tos registration license $key
fi
fi
warp-cli --accept-tos mode proxy
warp-cli --accept-tos connect