update version

app/bot.php

@@ -343,6 +343,9 @@ class Bot
             case preg_match('~^/switchTorrent (\d+)$~', $this->input['callback'], $m):
                 $this->switchTorrent($m[1]);
                 break;
+            case preg_match('~^/switchEndpoint (\d+)$~', $this->input['callback'], $m):
+                $this->switchEndpoint($m[1]);
+                break;
             case preg_match('~^/switchAmnezia (-?\d+)$~', $this->input['callback'], $m):
                 $this->switchAmnezia($m[1]);
                 break;
@@ -1537,6 +1540,14 @@ class Bot
         $this->menu('wg', $page);
     }
 
+    public function switchEndpoint($page = 0)
+    {
+        $c = $this->getPacConf();
+        $c[$this->getInstanceWG(1) . 'endpoint'] = $c[$this->getInstanceWG(1) . 'endpoint'] ? 0 : 1;
+        $this->setPacConf($c);
+        $this->menu('wg', $page);
+    }
+
     public function iptablesWG()
     {
         $c = $this->getPacConf();
@@ -2675,6 +2686,7 @@ DNS-over-HTTPS with IP:
         $dns     = $c[$this->getInstanceWG(1) . 'dns'];
         $mtu     = $c[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
         $am      = $c[$this->getInstanceWG(1) . 'amnezia'];
+        $end     = $c[$this->getInstanceWG(1) . 'endpoint'];
         $data    = [
             [
                 [
@@ -2706,6 +2718,12 @@ DNS-over-HTTPS with IP:
                     'callback_data' => "/defaultMTU $page",
                 ],
             ],
+            [
+                [
+                    'text'          => $this->i18n('endpoint') . ': ' . ($end ? $this->ip : $this->getDomain()),
+                    'callback_data' => "/switchEndpoint $page",
+                ],
+            ],
             [
                 [
                     'text'          =>  $this->i18n('add peer'),
@@ -5849,7 +5867,7 @@ DNS-over-HTTPS with IP:
                 $conf[] = '';
                 $conf[] = $peer['# PublicKey'] ? '# [Peer]' : '[Peer]';
                 if (!empty($peer['Endpoint'])) {
-                    $peer['Endpoint'] = $this->getDomain() . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
+                    $peer['Endpoint'] = ($this->getPacConf()[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
                 }
                 foreach ($peer as $k => $v) {
                     $conf[] = "$k = $v";

scripts/init.sh

@@ -16,7 +16,11 @@ echo \
   "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') \
   $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
 apt update
-apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+apt install -y docker-ce docker-ce-cli containerd.io
+DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
+mkdir -p $DOCKER_CONFIG/cli-plugins
+curl -SL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose
+chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
 git clone https://github.com/mercurykd/vpnbot.git
 cd ./vpnbot
 echo "<?php

update/update.sh

@@ -24,7 +24,7 @@ do
         curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "применяю обновления"/')"
         git pull > ./update/message
         curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "запускаю бота"/')"
-        IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose up -d --force-recreate
+        IP=$(curl ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
         bash $pwd/update/update.sh &
         > $pwd/update/key
         > $pwd/update/curl

version

@@ -1,3 +1,9 @@
+23.09.2024 v1.59
+- docker compose v2.29.6 (при установке бота)
+22.09.2024 v1.58
+- фикс запуска бота с правильными параметрами после обновления
+22.09.2024 v1.57
+- выбор типа endpoint для wireguard/amnezia
 22.09.2024 v1.56.2
 - фикс разных доменов при указании cdn для xray
 19.09.2024 v1.56.1