update version

.gitignore

@@ -20,4 +20,5 @@ update/*
 !update/update.sh
 
 override.env
-override.html
+override.html
+override.php

app/bot.php

@@ -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'));

app/index.php

@@ -11,6 +11,9 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
     require __DIR__ . '/calc.php';
     require __DIR__ . '/bot.php';
     require __DIR__ . '/i18n.php';
+    if (file_exists(__DIR__ . '/override.php')) {
+        include __DIR__ . '/override.php';
+    }
     $bot = new Bot($c['key'], $i);
     $bot->input();
     exit;

docker-compose.yml

@@ -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:

scripts/start_wp.sh

@@ -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

version

@@ -1,3 +1,6 @@
+24.10.2024 v1.85
+- фикс удаления состояния warp после рестарта
+- возможность перезаписать фразы меню бота через app/override.php
 24.10.2024 v1.84
 - фикс показа ссылки для openconnect
 24.10.2024 v1.83