update version

app/bot.php

@@ -4009,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'),
@@ -5210,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);
 
@@ -5586,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:

version

@@ -1,3 +1,7 @@
+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