update version

app/bot.php

@@ -2088,10 +2088,12 @@ class Bot
     public function adguardSync()
     {
         $pac = $this->getPacConf();
+        $pac['adpswd'] = $pac['adpswd'] ?: substr(hash('md5', time()), 0, 10);
+        $this->setPacConf($pac);
         $ssl = $this->nginxGetTypeCert();
         $c   = yaml_parse_file($this->adguard);
         $this->stopAd();
-        $c['users'][0]['password'] = $pac['adpswd'] ?: password_hash(substr(hash('md5', time()), 0, 10), PASSWORD_DEFAULT);
+        $c['users'][0]['password'] = password_hash($pac['adpswd'], PASSWORD_DEFAULT);
         if (!empty($ssl) && !empty($pac['domain']) && empty($c['tls']['enabled'])) {
             $c['tls']['enabled']     = true;
             $c['tls']['server_name'] = $pac['domain'];
@@ -4007,7 +4009,7 @@ DNS-over-HTTPS with IP:
                     [
                         [
                             'text' => $this->i18n('chat'),
-                            'url'  => "https://t.me/+BYuWVd36cZYwNTMy",
+                            'url'  => "https://t.me/+Wfxg6-nrokBlMmYy",
                         ],
                         [
                             'text' => $this->i18n('donate'),
@@ -5208,6 +5210,7 @@ DNS-over-HTTPS with IP:
             '~process_outbound~' => $pac['process_outbound'] ? 'direct' : $outbound,
             '~domains_outbound~' => $pac['domains_outbound'] ? 'direct' : $outbound,
             '~final_outbound~'   => $pac['final_outbound'] ? $outbound : 'direct',
+            '~ip~'               => $this->ip,
         ]);
         $json = $this->clearEmptyRules($json);
 
@@ -5489,7 +5492,7 @@ DNS-over-HTTPS with IP:
             $text .= "DNS over HTTPS:\n<code>$ip</code>\n<code>$scheme://$domain/dns-query" . ($conf['adguardkey'] ? "/{$conf['adguardkey']}" : '') . "</code>\n\n";
             $text .= "DNS over TLS:\n<code>tls://" . ($conf['adguardkey'] ? "{$conf['adguardkey']}." : '') . "$domain</code>";
         }
-        $status = $this->i18n(exec("JSON=1 dnslookup google.com ad") ? 'on' : 'off');
+        $status = $this->i18n(exec("JSON=1 timeout 2 dnslookup google.com ad") ? 'on' : 'off');
         $safesearch = yaml_parse_file($this->adguard)['filtering']['safe_search']['enabled'];
         $text .= "\n\nstatus: $status\t\tsafesearch: " . $this->i18n($safesearch ? 'on' : 'off');
         $allowedClients = yaml_parse_file($this->adguard)['dns']['allowed_clients'];
@@ -5584,8 +5587,8 @@ DNS-over-HTTPS with IP:
         } else {
             $c['dns']['allowed_clients'] = [];
             $c['dns']['allowed_clients'][] = '10.10.0.0/24';
-            if (!empty($pac['adguardKey'])) {
-                $c['dns']['allowed_clients'][] = $pac['adguardKey'];
+            if (!empty($pac['adguardkey'])) {
+                $c['dns']['allowed_clients'][] = $pac['adguardkey'];
             }
             $c['dns']['allowed_clients'][] = getenv('WGADDRESS');
             $c['dns']['allowed_clients'][] = getenv('WG1ADDRESS');

config/upstream.conf

@@ -11,6 +11,10 @@ events {
 }
 
 stream {
+    log_format basic '$remote_addr [$time_local] '
+                     '$protocol $status $bytes_sent $bytes_received';
+    access_log /logs/upstream_access basic;
+
     upstream other {
         server ng:443;
     }

config/xray.json

@@ -42,7 +42,8 @@
         }
     ],
     "log": {
-        "loglevel": "info"
+        "loglevel": "info",
+        "access": "/logs/xray"
     },
     "outbounds": [
         {

docker-compose.yml

@@ -413,6 +413,7 @@ services:
             - ./config/sshd_config:/etc/ssh/sshd_config
             - ./config/xray.json:/xray.json
             - ./scripts/start_xray.sh:/start_xray.sh
+            - ./logs:/logs
         hostname: xray
         container_name: xray-${VER}
         depends_on:

scripts/init.sh

@@ -10,17 +10,7 @@ apt install -y \
     iproute2 \
     xtables-addons-common \
     xtables-addons-dkms
-mkdir -p /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg
-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_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
+curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
 git clone https://github.com/mercurykd/vpnbot.git
 cd ./vpnbot
 echo "<?php

version

@@ -1,3 +1,10 @@
+11.11.2024 v1.98
+- фикс заполнения clientId при наполнении белого списка клиентов adg
+09.11.2024 v1.97
+- новая ссылка на чат поддержки. пожалуйста не размещайте ее на форумах и чатах во избежание набега leafers https://www.youtube.com/watch?v=9tlNJmjuKD4
+06.11.2024 v1.96
+- фикс пароля adguard
+- таймаоут для проверки статуса adguard
 04.11.2024 v1.95
 - отключение портов контейнеров из меню
 - перезагрузка из меню