update version

Merge pull request #29 from legiz-ru/dev
sb1.10+tun-inbound + sb-win64-1.10.5
2024-12-26 16:26:34 +04:00 · 2024-12-26 09:46:35 +04:00 · 2024-12-24 16:32:07 +03:00 · 2024-12-24 16:24:58 +03:00 · 2024-12-22 18:48:13 +04:00 · 2024-12-22 18:25:54 +04:00
30 changed files with 2309 additions and 1302 deletions
@@ -22,4 +22,7 @@ update/*
 override.env
 override.html
 override.php
-docker-compose.override.yml
+docker-compose.override.yml
+backup.json
+app/webapp/override/
+.rest
@@ -0,0 +1,13 @@
+<?php
+
+require __DIR__ . '/timezone.php';
+
+require __DIR__ . '/bot.php';
+require __DIR__ . '/config.php';
+require __DIR__ . '/i18n.php';
+if ($c['debug']) {
+    require __DIR__ . '/debug.php';
+}
+
+$bot = new Bot($c['key'], $i);
+echo $bot->export();
@@ -2,8 +2,8 @@

 $i = [
    'warp'             => [
-        'en' => 'warp',
-        'ru' => 'warp',
+        'en' => 'Warp',
+        'ru' => 'Warp',
    ],
    'wg_title'             => [
        'en' => 'Wireguard',
@@ -22,7 +22,7 @@ $i = [
        'ru' => 'AdGuard',
    ],
    'config'               => [
-        'en' => 'config',
+        'en' => 'Settings',
        'ru' => 'настройки',
    ],
    'pac'                  => [
@@ -262,8 +262,12 @@ $i = [
        'ru' => 'очистить',
    ],
    'xray'  => [
-        'en' => 'Xray',
-        'ru' => 'Xray',
+        'en' => 'Vless',
+        'ru' => 'Vless',
+    ],
+    'clash'  => [
+        'en' => 'mihomo',
+        'ru' => 'mihomo',
    ],
    'geodb'  => [
        'en' => 'GeoIp/GeoSite',
@@ -1,128 +1,18 @@
 <?php

 require __DIR__ . '/timezone.php';
-
-// bot
 require __DIR__ . '/config.php';
-if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
-    if ($c['debug']) {
-        require __DIR__ . '/debug.php';
-    }
-    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;
+if ($c['debug']) {
+    require __DIR__ . '/debug.php';
 }
-
-// pac
-if (!empty($t = unserialize(base64_decode(explode('/', $_SERVER['REQUEST_URI'])[2])))) { // fix sing-box import
-    $_GET = array_merge($_GET, $t);
-}
-$type    = $_GET['t'] ?? 'pac';
-$address = $_GET['a'] ?: '127.0.0.1';
-$port    = $_GET['p'] ?: '1080';
-$hash    = $_GET['h'];
-if ($hash == substr(md5($c['key']), 0, 8)) {
-    require __DIR__ . '/bot.php';
-    require __DIR__ . '/i18n.php';
-    $bot = new Bot($c['key'], $i);
-    switch ($type) {
-        case 'mirror':
-            $bot->getMirror();
-            break;
-        case 's':
-        case 'si':
-            $bot->subscription();
-            exit;
-
-        case 'te':
-            if (!empty($_GET['te'])) {
-                $t = $bot->getPacConf()["{$_GET['ty']}templates"][$_GET['te']];
-            } else {
-                $t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
-            }
-            if ($t) {
-                header('Content-Type: text/html');
-                $t = json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-                $name = $_GET['te'] ?: 'origin';
-                $type = $_GET['ty'];
-                echo <<<HTML
-                    <!DOCTYPE HTML>
-                    <html lang="en" style="height:100%">
-                    <head>
-                        <!-- when using the mode "code", it's important to specify charset utf-8 -->
-                        <meta charset="utf-8">
-                        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-                        <link href="jsoneditor.min.css" rel="stylesheet" type="text/css">
-                        <script src="jsoneditor.min.js"></script>
-                        <script src="jquery-3.7.1.min.js"></script>
-                        <script src="https://telegram.org/js/telegram-web-app.js"></script>
-                    </head>
-                    <body style="height:100%">
-                        <div id="jsoneditor" style="height:100%"></div>
-
-                        <script>
-                            jQuery(function($) {
-                                var tg = window.Telegram.WebApp;
-                                // create the editor
-                                const container = document.getElementById("jsoneditor")
-                                const options = {}
-                                const editor = new JSONEditor(container, options)
-                                editor.set({$t})
-                                tg.MainButton.show().setText('{$bot->i18n('save')}').onClick(function (e) {
-                                    var self = this;
-                                    $.ajax({
-                                        url: '/webapp/save?' + tg.initData,
-                                        method: 'POST',
-                                        data: {
-                                            name: '$name',
-                                            type: '$type',
-                                            json: editor.getText()
-                                        },
-                                        dataType: 'json'
-                                    }).done(function (r) {
-                                        if (r.status == true) {
-                                            tg.MainButton.setText('{$bot->i18n('success')}')
-                                            setTimeout(() => {
-                                                tg.close();
-                                            }, 500);
-                                        } else {
-                                            tg.MainButton.setText(r.message);
-                                        }
-                                    }).fail(function (r) {
-                                        tg.MainButton.setText('{$bot->i18n('error')}')
-                                    });
-                                });
-                            });
-                        </script>
-                    </body>
-                    </html>
-                    HTML;
-                exit;
-            }
-
-        default:
-            if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
-                $pac = file_get_contents($file);
-                header('Content-Type: text/plain');
-                echo str_replace([
-                    '~address~',
-                    '~port~',
-                ], [
-                    $address,
-                    $port,
-                ], $pac);
-                exit;
-            }
-            break;
-    }
+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);
+$hash = $bot->getHashBot();
 if (!empty($_GET['hash'])) {
    $t = $_GET;
    unset($t['hash']);
@@ -130,22 +20,127 @@ if (!empty($_GET['hash'])) {
    foreach ($t as $k => $v) {
        $s[] = "$k=$v";
    }
-    $s  = implode("\n", $s);
-    $sk = hash_hmac('sha256', $c['key'], "WebAppData", true);
-    if (hash_hmac('sha256', $s, $sk) == $_GET['hash']) {
-        require __DIR__ . '/bot.php';
-        require __DIR__ . '/i18n.php';
-        $bot = new Bot($c['key'], $i);
-        if (!empty($_POST['json'])) {
-            echo json_encode($bot->saveTemplate($_POST['name'], $_POST['type'], $_POST['json']));
-            die();
-        } else {
-            setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
-            setcookie('a', $bot->adguardBasicAuth(), 0, '/');
-        }
-        die('ok');
-    }
+    $s      = implode("\n", $s);
+    $sk     = hash_hmac('sha256', $c['key'], "WebAppData", true);
+    $webapp = hash_hmac('sha256', $s, $sk) == $_GET['hash'];
 }

-header('500', true, 500);
-exit;
+switch (true) {
+    // tlgrm
+    case 'POST' == $_SERVER['REQUEST_METHOD'] && preg_match('~^/tlgrm~', $_SERVER['REQUEST_URI']) && $_GET['k'] == $c['key']:
+        $bot->input();
+        break;
+
+    // save template
+    case preg_match('~^' . preg_quote("/webapp$hash/save") . '~', $_SERVER['REQUEST_URI']) && $webapp && !empty($_POST['json']):
+        echo json_encode($bot->saveTemplate($_POST['name'], $_POST['type'], $_POST['json']));
+        break;
+
+    // adguard cookie
+    case preg_match('~^' . preg_quote("/webapp$hash/check") . '~', $_SERVER['REQUEST_URI']) && $webapp:
+        setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
+        echo "/adguard$hash/";
+        break;
+
+    // subs & pac
+    case preg_match('~^' . preg_quote("/pac$hash") . '~', $_SERVER['REQUEST_URI']):
+        if (!empty($t = unserialize(base64_decode(explode('/', $_SERVER['REQUEST_URI'])[2])))) { // fix sing-box import
+            $_GET = array_merge($_GET, $t);
+        }
+        $type    = $_GET['t'] ?? 'pac';
+        $address = $_GET['a'] ?: '127.0.0.1';
+        $port    = $_GET['p'] ?: '1080';
+        switch ($type) {
+            case 's':
+            case 'si':
+            case 'cl':
+                $bot->subscription();
+                exit;
+
+            case 'te':
+                if (!empty($_GET['te'])) {
+                    $t = $bot->getPacConf()["{$_GET['ty']}templates"][$_GET['te']];
+                } else {
+                    $t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
+                }
+                if ($t) {
+                    header('Content-Type: text/html');
+                    $t = json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                    $name = $_GET['te'] ?: 'origin';
+                    $type = $_GET['ty'];
+                    echo <<<HTML
+                        <!DOCTYPE HTML>
+                        <html lang="en" style="height:100%">
+                        <head>
+                            <!-- when using the mode "code", it's important to specify charset utf-8 -->
+                            <meta charset="utf-8">
+                            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+                            <link href="/webapp$hash/jsoneditor.min.css" rel="stylesheet" type="text/css">
+                            <script src="/webapp$hash/jsoneditor.min.js"></script>
+                            <script src="/webapp$hash/jquery-3.7.1.min.js"></script>
+                            <script src="https://telegram.org/js/telegram-web-app.js"></script>
+                        </head>
+                        <body style="height:100%">
+                            <div id="jsoneditor" style="height:100%"></div>
+
+                            <script>
+                                jQuery(function($) {
+                                    var tg = window.Telegram.WebApp;
+                                    // create the editor
+                                    const container = document.getElementById("jsoneditor")
+                                    const options = {}
+                                    const editor = new JSONEditor(container, options)
+                                    editor.set({$t})
+                                    tg.MainButton.show().setText('{$bot->i18n('save')}').onClick(function (e) {
+                                        var self = this;
+                                        $.ajax({
+                                            url: '/webapp$hash/save?' + tg.initData,
+                                            method: 'POST',
+                                            data: {
+                                                name: '$name',
+                                                type: '$type',
+                                                json: editor.getText()
+                                            },
+                                            dataType: 'json'
+                                        }).done(function (r) {
+                                            if (r.status == true) {
+                                                tg.MainButton.setText('{$bot->i18n('success')}')
+                                                setTimeout(() => {
+                                                    tg.close();
+                                                }, 500);
+                                            } else {
+                                                tg.MainButton.setText(r.message);
+                                            }
+                                        }).fail(function (r) {
+                                            tg.MainButton.setText('{$bot->i18n('error')}')
+                                        });
+                                    });
+                                });
+                            </script>
+                        </body>
+                        </html>
+                        HTML;
+                    exit;
+                }
+
+            default:
+                if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
+                    $pac = file_get_contents($file);
+                    header('Content-Type: text/plain');
+                    echo str_replace([
+                        '~address~',
+                        '~port~',
+                    ], [
+                        $address,
+                        $port,
+                    ], $pac);
+                    exit;
+                }
+                break;
+        }
+        break;
+
+    default:
+        header('500', true, 500);
+}
@@ -18,6 +18,8 @@ if (!empty($bot->selfupdate)) {
    $bot->offWarp();
 }
 $bot->dontshowcron = 1;
-$bot->adguardSync();
 $bot->sslip();
+$bot->adguardSync();
+$bot->cloakNginx();
+$bot->syncDeny();
 $bot->cleanDocker();
@@ -14,7 +14,7 @@
            $.ajax({
                'url': 'check?' + tg.initData,
            }).done(function (r) {
-                location.replace('/adguard/');
+                location.replace(r);
            }).fail(function (r) {
                location.replace('/');
            });
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Login</title>
-    <style>
-        /* Design based on Blue Login Field of Kevin Sleger https://codepen.io/MurmeltierS/pen/macKb */
-
-        body {
-            background: #44c4e7 url("https://photos-6.dropbox.com/t/2/AAC_bdqR8LMkjEe-HPIf4K1DhtseMLRHPklBSzJSuzglvA/12/5714737/jpeg/1024x768/3/1418346000/0/2/bkg-blur.jpg/CLHm3AIgASgBKAI/b7RrveA2022yJyfO9RyRvv7LjJQESukGHssHUxVThzw") no-repeat center center fixed;
-            background-size: cover;
-            font-family: "Roboto";
-            -webkit-font-smoothing: antialiased;
-            -moz-osx-font-smoothing: grayscale;
-
-            &::before {
-                z-index: -1;
-                content: '';
-                position: fixed;
-                top: 0;
-                left: 0;
-                background: #44c4e7;
-                /* IE Fallback */
-                background: rgba(68, 196, 231, 0.8);
-                width: 100%;
-                height: 100%;
-            }
-        }
-
-        .form {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            background: #fff;
-            width: 285px;
-            margin: -140px 0 0 -182px;
-            padding: 40px;
-            box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
-
-            h2 {
-                margin: 0 0 20px;
-                line-height: 1;
-                color: #44c4e7;
-                font-size: 18px;
-                font-weight: 400;
-            }
-
-            input {
-                outline: none;
-                display: block;
-                width: 100%;
-                margin: 0 0 20px;
-                padding: 10px 15px;
-                border: 1px solid #ccc;
-                color: #ccc;
-                font-family: "Roboto";
-                box-sizing: border-box;
-                font-size: 14px;
-                font-wieght: 400;
-                -webkit-font-smoothing: antialiased;
-                -moz-osx-font-smoothing: grayscale;
-                transition: 0.2s linear;
-
-                &input:focus {
-                    color: #333;
-                    border: 1px solid #44c4e7;
-                }
-            }
-
-            button {
-                cursor: pointer;
-                background: #44c4e7;
-                width: 100%;
-                padding: 10px 15px;
-                border: 0;
-                color: #fff;
-                font-family: "Roboto";
-                font-size: 14px;
-                font-weight: 400;
-
-                &:hover {
-                    background: #369cb8;
-                }
-            }
-        }
-
-        .error,
-        .valid {
-            display: none;
-        }
-    </style>
-    <script src="jquery-3.7.1.min.js"></script>
-</head>
-
-<body>
-    <section class="form animated flipInX">
-        <h2>Login To Your Account</h2>
-        <p class="valid">Valid. Please wait a moment.</p>
-        <p class="error">Error. Please enter correct Username &amp; password.</p>
-        <form class="loginbox" autocomplete="off">
-            <input placeholder="Username" type="text" id="username"></input>
-            <input placeholder="Password" type="password" id="password"></input>
-            <button id="submit">Login</button>
-        </form>
-    </section>
-    <script>
-        $(document).ready(function() {
-            $('#submit').click(function () {
-                event.preventDefault(); // prevent PageReLoad
-                $('.error').css('display', 'block'); // show error msg
-            });
-        });
-    </script>
-</body>
-</html>
@@ -0,0 +1,141 @@
+{
+    "mixed-port": 2080,
+    "allow-lan": true,
+    "tcp-concurrent": true,
+    "enable-process": true,
+    "find-process-mode": "strict",
+    "global-client-fingerprint": "chrome",
+    "mode": "rule",
+    "log-level": "info",
+    "ipv6": false,
+    "keep-alive-interval": 30,
+    "unified-delay": false,
+    "profile": {
+        "store-selected": true,
+        "store-fake-ip": true
+    },
+    "sniffer": {
+        "enable": true,
+        "sniff": {
+            "HTTP": {
+                "ports": [
+                    80,
+                    "8080-8880"
+                ],
+                "override-destination": true
+            },
+            "TLS": {
+                "ports": [
+                    443,
+                    8443
+                ]
+            },
+            "QUIC": {
+                "ports": [
+                    443,
+                    8443
+                ]
+            }
+        }
+    },
+    "tun": {
+        "enable": true,
+        "stack": "mixed",
+        "dns-hijack": [
+            "any:53"
+        ],
+        "auto-route": true,
+        "auto-detect-interface": true,
+        "strict-route": true
+    },
+    "dns": {
+        "enable": true,
+        "listen": ":1053",
+        "prefer-h3": false,
+        "ipv6": false,
+        "enhanced-mode": "fake-ip",
+        "fake-ip-filter": [
+            "~domain~",
+            "+.lan",
+            "+.local"
+        ],
+        "nameserver": [
+            "~dns~"
+        ]
+    },
+    "proxies": [
+        {
+            "name": "~outbound~",
+            "type": "vless",
+            "server": "~domain~",
+            "port": 443,
+            "uuid": "~uid~",
+            "network": "tcp",
+            "flow": "xtls-rprx-vision",
+            "tls": true,
+            "reality-opts": {
+                "public-key": "~public_key~",
+                "short-id": "~short_id~"
+            },
+            "servername": "~server_name~",
+            "client-fingerprint": "chrome"
+        }
+    ],
+    "proxy-groups": [
+        {
+            "name": "PROXY",
+            "type": "select",
+            "proxies": [
+                "~outbound~"
+            ]
+        }
+    ],
+    "add-rule-providers": true,
+    "rule-providers": {},
+    "rules": [
+        {
+            "type": "RULE-SET",
+            "list": "~block~",
+            "action": "REJECT",
+            "interval": 30,
+            "behavior": "domain",
+            "name": "block"
+        },
+        {
+            "type": "RULE-SET",
+            "list": "~process~",
+            "action": "PROXY",
+            "interval": 30,
+            "behavior": "classical",
+            "name": "process"
+        },
+        {
+            "type": "RULE-SET",
+            "list": "~package~",
+            "action": "PROXY",
+            "interval": 30,
+            "behavior": "classical",
+            "name": "package"
+        },
+        {
+            "type": "RULE-SET",
+            "list": "~warp~",
+            "action": "PROXY",
+            "interval": 30,
+            "behavior": "domain",
+            "name": "warp"
+        },
+        {
+            "type": "RULE-SET",
+            "list": "~pac~",
+            "action": "PROXY",
+            "interval": 30,
+            "behavior": "domain",
+            "name": "pac"
+        },
+        {
+            "type": "MATCH",
+            "action": "DIRECT"
+        }
+    ]
+}
@@ -1,197 +1,191 @@
-user  nginx;
-worker_processes  auto;
+user nginx;
+worker_processes auto;

-error_log  /logs/nginx_error;
-pid        /var/run/nginx.pid;
+error_log /logs/nginx_error;
+pid /var/run/nginx.pid;

 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }

 http {
-  server_names_hash_bucket_size 64;
-  include       include.conf;
-  include       /etc/nginx/mime.types;
-  default_type  application/octet-stream;
+    server_names_hash_bucket_size 64;
+    server_tokens off;
+    include include.conf;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;

-  # Proxy Cache storage - so we can cache the DoH response from the upstream
-  proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;
+    # Proxy Cache storage - so we can cache the DoH response from the upstream
+    proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;

-  real_ip_header      proxy_protocol;
-  real_ip_recursive   on;
-  set_real_ip_from    10.10.0.10;
+    real_ip_header proxy_protocol;
+    real_ip_recursive on;
+    set_real_ip_from 10.10.0.10;

-  server {
-    listen 10.10.0.2:80 default_server;
-    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
-    ssl_certificate /certs/self_public;
-    ssl_certificate_key /certs/self_private;
+    server {
+        listen 80 default_server;

-    access_log /logs/nginx_default_access;
-
-    location / {
-      root /app;
-      index override.html login.html;
-      try_files $uri $uri/ =404;
+        location / {
+            return 301 https://$host$request_uri;
+        }
+        location ~\.well-known {
+            access_log /logs/nginx_certbot_access;
+            root /certs/;
+            try_files $uri =404;
+        }
    }
-    location /adguard/ {
-      access_log /logs/nginx_adguard_access;
-      proxy_pass http://ad:80/;
-      proxy_redirect / /adguard/;
-      proxy_cookie_path / /adguard/;
+
+    server {
+        listen 10.10.0.2:443 ssl http2 proxy_protocol default_server;
+        listen 10.10.1.2:443 ssl http2 default_server;
+        ssl_certificate /certs/self_public;
+        ssl_certificate_key /certs/self_private;
+
+        access_log /logs/nginx_ip_access;
+
+        location = / {
+            root /app;
+            try_files $uri /override.html @auth;
+        }
+
+        location / {
+            root /app;
+            auth_basic "Restricted Content";
+            auth_basic_user_file /app/.htpasswd;
+            try_files $uri =404;
+        }
+        location @auth {
+            root /app;
+            auth_basic "Restricted Content";
+            auth_basic_user_file /app/.htpasswd;
+            try_files $uri =404;
+        }
+
+        location /tlgrm {
+            access_log /logs/nginx_tlgrm_access;
+            proxy_pass http://php;
+        }
+
+        location @php {
+            proxy_pass http://php;
+        }
+
+        location /adguard/ {
+        }
+
+        location /webapp {
+            access_log /logs/nginx_webapp_access;
+            alias /app;
+            index index.html;
+            try_files $uri $uri/ @php;
+        }
+
+        location /pac {
+            access_log /logs/nginx_pac_access;
+            proxy_set_header Host $http_host;
+            proxy_pass http://php;
+        }
+
+        location /ws {
+            proxy_pass http://xr:443;
+            proxy_redirect off;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_read_timeout 5d;
+        }
+        location /dns-query {
+            access_log /logs/nginx_doh_access;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-Proto https;
+            proxy_set_header X-Forwarded-For $remote_addr;
+            proxy_set_header X-Forwarded-Host $remote_addr;
+            proxy_cache doh_cache;
+            proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+            proxy_pass https://ad/dns-query;
+        }
    }
-    location /webapp {
-      access_log /logs/nginx_webapp_access;
-      alias /app;
-      index index.html;
-      try_files $uri $uri/ /pac?$query_string;
-    }
-    location /pac {
-      access_log /logs/nginx_pac_access;
-      proxy_set_header Host $http_host;
-      proxy_pass http://php;
-    }
-    location /tlgrm {
-      access_log /logs/nginx_tlgrm_access;
-      proxy_pass http://php;
-    }
-    location /v2ray {
-      access_log /logs/nginx_v2ray_access;
-      proxy_redirect off;
-      proxy_buffering off;
-      proxy_http_version 1.1;
-      proxy_pass http://ss:8388/;
-      proxy_set_header Host $http_host;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-    }
-    location /ws {
-        proxy_pass http://xr:443;
-        proxy_redirect off;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_read_timeout 5d;
-    }
-#-ssl
-#   # The DoH server block
-#   location /dns-query {
-#     access_log /logs/nginx_doh_access;
-#     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
-#     proxy_http_version 1.1;
-#     proxy_set_header Connection "";
-#     proxy_set_header  Host $host;
-#     proxy_set_header  X-Real-IP $remote_addr;
-#     proxy_set_header  X-Forwarded-Proto https;
-#     proxy_set_header  X-Forwarded-For $remote_addr;
-#     proxy_set_header  X-Forwarded-Host $remote_addr;

-#     # Enable Cache, and set the cache_key to include the request_body
-#     proxy_cache doh_cache;
-#     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+    #~

-#     # proxy pass to the dohloop upstream
-#     proxy_pass https://ad/dns-query;
-#   }
-#-ssl
-    location ~\.well-known {
-      access_log /logs/nginx_certbot_access;
-      root /certs/;
-      try_files $uri =404;
-    }
-  }
+    #-domain
+    # server {
+    #     server_name domain;
+    #     listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    #     listen 10.10.1.2:443 ssl http2;
+    #     ssl_certificate /certs/cert_public;
+    #     ssl_certificate_key /certs/cert_private;

-#~
+    #     access_log /logs/nginx_domain_access;

-#-domain
-  # server {
-  #   listen 10.10.0.2:80;
-  #   server_name ;
-#-domain
-#-ssl
-    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
-    # listen 10.10.1.2:443 ssl http2;
-    # ssl_certificate /certs/cert_public;
-    # ssl_certificate_key /certs/cert_private;
-#-ssl
+    #     location = / {
+    #         root /app;
+    #         try_files $uri /override.html @auth;
+    #     }

-#-domain
-  #   access_log /logs/nginx_domain_access;
+    #     location / {
+    #         root /app;
+    #         auth_basic "Restricted Content";
+    #         auth_basic_user_file /app/.htpasswd;
+    #         try_files $uri =404;
+    #     }
+    #     location @auth {
+    #         root /app;
+    #         auth_basic "Restricted Content";
+    #         auth_basic_user_file /app/.htpasswd;
+    #         try_files $uri =404;
+    #     }

-  #   location / {
-  #     root /app;
-  #     index override.html login.html;
-  #     try_files $uri $uri/ =404;
-  #   }
-  #   location /adguard/ {
-  #     access_log /logs/nginx_adguard_access;
-  #     proxy_pass http://ad:80/;
-  #     proxy_redirect / /adguard/;
-  #     proxy_cookie_path / /adguard/;
-  #   }
-  #   location /webapp {
-  #     access_log /logs/nginx_webapp_access;
-  #     alias /app;
-  #     index index.html;
-  #     try_files $uri $uri/ /pac?$query_string;
-  #   }
-  #   location /pac {
-  #     access_log /logs/nginx_pac_access;
-  #     proxy_set_header Host $http_host;
-  #     proxy_pass http://php;
-  #   }
-  #   location ~\.well-known {
-  #     access_log /logs/nginx_certbot_access;
-  #     root /certs/;
-  #     try_files $uri =404;
-  #   }
-  #   location /v2ray {
-  #     access_log /logs/nginx_v2ray_access;
-  #     proxy_redirect off;
-  #     proxy_buffering off;
-  #     proxy_http_version 1.1;
-  #     proxy_pass http://ss:8388/;
-  #     proxy_set_header Host $http_host;
-  #     proxy_set_header Upgrade $http_upgrade;
-  #     proxy_set_header Connection "upgrade";
-  #   }
-  #   location /ws {
-  #       proxy_pass http://xr:443;
-  #       proxy_redirect off;
-  #       proxy_http_version 1.1;
-  #       proxy_set_header Upgrade $http_upgrade;
-  #       proxy_set_header Connection "upgrade";
-  #       proxy_set_header Host $host;
-  #       proxy_set_header X-Real-IP $remote_addr;
-  #       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  #       proxy_read_timeout 5d;
-  #    }
-#-domain
-#-ssl
-  #   # The DoH server block
-  #   location /dns-query {
-  #     access_log /logs/nginx_doh_access;
-  #     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
-  #     proxy_http_version 1.1;
-  #     proxy_set_header Connection "";
-  #     proxy_set_header  Host $host;
-  #     proxy_set_header  X-Real-IP $remote_addr;
-  #     proxy_set_header  X-Forwarded-Proto https;
-  #     proxy_set_header  X-Forwarded-For $remote_addr;
-  #     proxy_set_header  X-Forwarded-Host $remote_addr;
+    #     location @php {
+    #         proxy_pass http://php;
+    #     }

-  #     # Enable Cache, and set the cache_key to include the request_body
-  #     proxy_cache doh_cache;
-  #     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+    #     location /adguard/ {
+    #     }

-  #     # proxy pass to the dohloop upstream
-  #     proxy_pass https://ad/dns-query;
-  #   }
-#-ssl
-#-domain
-  # }
-#-domain
+    #     location /webapp {
+    #         access_log /logs/nginx_webapp_access;
+    #         alias /app;
+    #         index index.html;
+    #         try_files $uri $uri/ @php;
+    #     }
+
+    #     location /pac {
+    #         access_log /logs/nginx_pac_access;
+    #         proxy_set_header Host $http_host;
+    #         proxy_pass http://php;
+    #     }
+
+    #     location /ws {
+    #         proxy_pass http://xr:443;
+    #         proxy_redirect off;
+    #         proxy_http_version 1.1;
+    #         proxy_set_header Upgrade $http_upgrade;
+    #         proxy_set_header Connection "upgrade";
+    #         proxy_set_header Host $host;
+    #         proxy_set_header X-Real-IP $remote_addr;
+    #         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #         proxy_read_timeout 5d;
+    #     }
+    #     location /dns-query {
+    #         access_log /logs/nginx_doh_access;
+    #         proxy_http_version 1.1;
+    #         proxy_set_header Connection "";
+    #         proxy_set_header Host $host;
+    #         proxy_set_header X-Real-IP $remote_addr;
+    #         proxy_set_header X-Forwarded-Proto https;
+    #         proxy_set_header X-Forwarded-For $remote_addr;
+    #         proxy_set_header X-Forwarded-Host $remote_addr;
+    #         proxy_cache doh_cache;
+    #         proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+    #         proxy_pass https://ad/dns-query;
+    #     }
+    # }
+    #-domain
 }
@@ -1,197 +1,191 @@
-user  nginx;
-worker_processes  auto;
+user nginx;
+worker_processes auto;

-error_log  /logs/nginx_error;
-pid        /var/run/nginx.pid;
+error_log /logs/nginx_error;
+pid /var/run/nginx.pid;

 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }

 http {
-  server_names_hash_bucket_size 64;
-  include       include.conf;
-  include       /etc/nginx/mime.types;
-  default_type  application/octet-stream;
+    server_names_hash_bucket_size 64;
+    server_tokens off;
+    include include.conf;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;

-  # Proxy Cache storage - so we can cache the DoH response from the upstream
-  proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;
+    # Proxy Cache storage - so we can cache the DoH response from the upstream
+    proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;

-  real_ip_header      proxy_protocol;
-  real_ip_recursive   on;
-  set_real_ip_from    10.10.0.10;
+    real_ip_header proxy_protocol;
+    real_ip_recursive on;
+    set_real_ip_from 10.10.0.10;

-  server {
-    listen 10.10.0.2:80 default_server;
-    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
-    ssl_certificate /certs/self_public;
-    ssl_certificate_key /certs/self_private;
+    server {
+        listen 80 default_server;

-    access_log /logs/nginx_default_access;
-
-    location / {
-      root /app;
-      index override.html login.html;
-      try_files $uri $uri/ =404;
+        location / {
+            return 301 https://$host$request_uri;
+        }
+        location ~\.well-known {
+            access_log /logs/nginx_certbot_access;
+            root /certs/;
+            try_files $uri =404;
+        }
    }
-    location /adguard/ {
-      access_log /logs/nginx_adguard_access;
-      proxy_pass http://ad:80/;
-      proxy_redirect / /adguard/;
-      proxy_cookie_path / /adguard/;
+
+    server {
+        listen 10.10.0.2:443 ssl http2 proxy_protocol default_server;
+        listen 10.10.1.2:443 ssl http2 default_server;
+        ssl_certificate /certs/self_public;
+        ssl_certificate_key /certs/self_private;
+
+        access_log /logs/nginx_ip_access;
+
+        location = / {
+            root /app;
+            try_files $uri /override.html @auth;
+        }
+
+        location / {
+            root /app;
+            auth_basic "Restricted Content";
+            auth_basic_user_file /app/.htpasswd;
+            try_files $uri =404;
+        }
+        location @auth {
+            root /app;
+            auth_basic "Restricted Content";
+            auth_basic_user_file /app/.htpasswd;
+            try_files $uri =404;
+        }
+
+        location /tlgrm {
+            access_log /logs/nginx_tlgrm_access;
+            proxy_pass http://php;
+        }
+
+        location @php {
+            proxy_pass http://php;
+        }
+
+        location /adguard/ {
+        }
+
+        location /webapp {
+            access_log /logs/nginx_webapp_access;
+            alias /app;
+            index index.html;
+            try_files $uri $uri/ @php;
+        }
+
+        location /pac {
+            access_log /logs/nginx_pac_access;
+            proxy_set_header Host $http_host;
+            proxy_pass http://php;
+        }
+
+        location /ws {
+            proxy_pass http://xr:443;
+            proxy_redirect off;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_read_timeout 5d;
+        }
+        location /dns-query {
+            access_log /logs/nginx_doh_access;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-Proto https;
+            proxy_set_header X-Forwarded-For $remote_addr;
+            proxy_set_header X-Forwarded-Host $remote_addr;
+            proxy_cache doh_cache;
+            proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+            proxy_pass https://ad/dns-query;
+        }
    }
-    location /webapp {
-      access_log /logs/nginx_webapp_access;
-      alias /app;
-      index index.html;
-      try_files $uri $uri/ /pac?$query_string;
-    }
-    location /pac {
-      access_log /logs/nginx_pac_access;
-      proxy_set_header Host $http_host;
-      proxy_pass http://php;
-    }
-    location /tlgrm {
-      access_log /logs/nginx_tlgrm_access;
-      proxy_pass http://php;
-    }
-    location /v2ray {
-      access_log /logs/nginx_v2ray_access;
-      proxy_redirect off;
-      proxy_buffering off;
-      proxy_http_version 1.1;
-      proxy_pass http://ss:8388/;
-      proxy_set_header Host $http_host;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-    }
-    location /ws {
-        proxy_pass http://xr:443;
-        proxy_redirect off;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_read_timeout 5d;
-    }
-#-ssl
-#   # The DoH server block
-#   location /dns-query {
-#     access_log /logs/nginx_doh_access;
-#     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
-#     proxy_http_version 1.1;
-#     proxy_set_header Connection "";
-#     proxy_set_header  Host $host;
-#     proxy_set_header  X-Real-IP $remote_addr;
-#     proxy_set_header  X-Forwarded-Proto https;
-#     proxy_set_header  X-Forwarded-For $remote_addr;
-#     proxy_set_header  X-Forwarded-Host $remote_addr;

-#     # Enable Cache, and set the cache_key to include the request_body
-#     proxy_cache doh_cache;
-#     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+    #~

-#     # proxy pass to the dohloop upstream
-#     proxy_pass https://ad/dns-query;
-#   }
-#-ssl
-    location ~\.well-known {
-      access_log /logs/nginx_certbot_access;
-      root /certs/;
-      try_files $uri =404;
-    }
-  }
+    #-domain
+    # server {
+    #     server_name domain;
+    #     listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    #     listen 10.10.1.2:443 ssl http2;
+    #     ssl_certificate /certs/cert_public;
+    #     ssl_certificate_key /certs/cert_private;

-#~
+    #     access_log /logs/nginx_domain_access;

-#-domain
-  # server {
-  #   listen 10.10.0.2:80;
-  #   server_name ;
-#-domain
-#-ssl
-    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
-    # listen 10.10.1.2:443 ssl http2;
-    # ssl_certificate /certs/cert_public;
-    # ssl_certificate_key /certs/cert_private;
-#-ssl
+    #     location = / {
+    #         root /app;
+    #         try_files $uri /override.html @auth;
+    #     }

-#-domain
-  #   access_log /logs/nginx_domain_access;
+    #     location / {
+    #         root /app;
+    #         auth_basic "Restricted Content";
+    #         auth_basic_user_file /app/.htpasswd;
+    #         try_files $uri =404;
+    #     }
+    #     location @auth {
+    #         root /app;
+    #         auth_basic "Restricted Content";
+    #         auth_basic_user_file /app/.htpasswd;
+    #         try_files $uri =404;
+    #     }

-  #   location / {
-  #     root /app;
-  #     index override.html login.html;
-  #     try_files $uri $uri/ =404;
-  #   }
-  #   location /adguard/ {
-  #     access_log /logs/nginx_adguard_access;
-  #     proxy_pass http://ad:80/;
-  #     proxy_redirect / /adguard/;
-  #     proxy_cookie_path / /adguard/;
-  #   }
-  #   location /webapp {
-  #     access_log /logs/nginx_webapp_access;
-  #     alias /app;
-  #     index index.html;
-  #     try_files $uri $uri/ /pac?$query_string;
-  #   }
-  #   location /pac {
-  #     access_log /logs/nginx_pac_access;
-  #     proxy_set_header Host $http_host;
-  #     proxy_pass http://php;
-  #   }
-  #   location ~\.well-known {
-  #     access_log /logs/nginx_certbot_access;
-  #     root /certs/;
-  #     try_files $uri =404;
-  #   }
-  #   location /v2ray {
-  #     access_log /logs/nginx_v2ray_access;
-  #     proxy_redirect off;
-  #     proxy_buffering off;
-  #     proxy_http_version 1.1;
-  #     proxy_pass http://ss:8388/;
-  #     proxy_set_header Host $http_host;
-  #     proxy_set_header Upgrade $http_upgrade;
-  #     proxy_set_header Connection "upgrade";
-  #   }
-  #   location /ws {
-  #       proxy_pass http://xr:443;
-  #       proxy_redirect off;
-  #       proxy_http_version 1.1;
-  #       proxy_set_header Upgrade $http_upgrade;
-  #       proxy_set_header Connection "upgrade";
-  #       proxy_set_header Host $host;
-  #       proxy_set_header X-Real-IP $remote_addr;
-  #       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  #       proxy_read_timeout 5d;
-  #    }
-#-domain
-#-ssl
-  #   # The DoH server block
-  #   location /dns-query {
-  #     access_log /logs/nginx_doh_access;
-  #     # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
-  #     proxy_http_version 1.1;
-  #     proxy_set_header Connection "";
-  #     proxy_set_header  Host $host;
-  #     proxy_set_header  X-Real-IP $remote_addr;
-  #     proxy_set_header  X-Forwarded-Proto https;
-  #     proxy_set_header  X-Forwarded-For $remote_addr;
-  #     proxy_set_header  X-Forwarded-Host $remote_addr;
+    #     location @php {
+    #         proxy_pass http://php;
+    #     }

-  #     # Enable Cache, and set the cache_key to include the request_body
-  #     proxy_cache doh_cache;
-  #     proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+    #     location /adguard/ {
+    #     }

-  #     # proxy pass to the dohloop upstream
-  #     proxy_pass https://ad/dns-query;
-  #   }
-#-ssl
-#-domain
-  # }
-#-domain
+    #     location /webapp {
+    #         access_log /logs/nginx_webapp_access;
+    #         alias /app;
+    #         index index.html;
+    #         try_files $uri $uri/ @php;
+    #     }
+
+    #     location /pac {
+    #         access_log /logs/nginx_pac_access;
+    #         proxy_set_header Host $http_host;
+    #         proxy_pass http://php;
+    #     }
+
+    #     location /ws {
+    #         proxy_pass http://xr:443;
+    #         proxy_redirect off;
+    #         proxy_http_version 1.1;
+    #         proxy_set_header Upgrade $http_upgrade;
+    #         proxy_set_header Connection "upgrade";
+    #         proxy_set_header Host $host;
+    #         proxy_set_header X-Real-IP $remote_addr;
+    #         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #         proxy_read_timeout 5d;
+    #     }
+    #     location /dns-query {
+    #         access_log /logs/nginx_doh_access;
+    #         proxy_http_version 1.1;
+    #         proxy_set_header Connection "";
+    #         proxy_set_header Host $host;
+    #         proxy_set_header X-Real-IP $remote_addr;
+    #         proxy_set_header X-Forwarded-Proto https;
+    #         proxy_set_header X-Forwarded-For $remote_addr;
+    #         proxy_set_header X-Forwarded-Host $remote_addr;
+    #         proxy_cache doh_cache;
+    #         proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
+    #         proxy_pass https://ad/dns-query;
+    #     }
+    # }
+    #-domain
 }
@@ -505,7 +505,7 @@ ipv4-netmask = 255.255.255.0

 # Whether to tunnel all DNS queries via the VPN. This is the default
 # when a default route is set.
-#tunnel-all-dns = true
+tunnel-all-dns = true

 # The advertised DNS server. Use multiple lines for
 # multiple servers.
@@ -397,7 +397,7 @@ zend.exception_string_param_max_len = 0
 ; threat in any way, but it makes it possible to determine whether you use PHP
 ; on your server or not.
 ; https://php.net/expose-php
-expose_php = On
+expose_php = Off

 ;;;;;;;;;;;;;;;;;;;
 ; Resource Limits ;
@@ -1955,5 +1955,3 @@ opcache.enable=1
 opcache.jit_buffer_size=128M
 opcache.enable_cli=1
 pcre.jit=1
-
-
@@ -9,7 +9,7 @@
            "tag": "tun-in",
            "domain_strategy": "prefer_ipv4",
            "interface_name": "sing-tun",
-            "inet4_address": "172.19.0.1\/30",
+            "address": ["172.19.0.1\/30"],
            "mtu": 1400,
            "gso": true,
            "auto_route": true,
@@ -111,10 +111,15 @@
                "outbound": "dns-out"
            },
            {
+                "addruleset": true,
+                "outbound": "direct"
+            },
+            {
+                "addruleset": true,
                "createruleset": [
                    {
                        "name": "pac",
-                        "interval": "15s",
+                        "interval": "30s",
                        "rules": [
                            {
                                "domain_suffix": "~pac~"
@@ -122,13 +127,14 @@
                        ]
                    }
                ],
-                "outbound": "~domains_outbound~"
+                "outbound": "~outbound~"
            },
            {
+                "addruleset": true,
                "createruleset": [
                    {
                        "name": "package",
-                        "interval": "15s",
+                        "interval": "30s",
                        "rules": [
                            {
                                "package_name": "~package~"
@@ -136,13 +142,14 @@
                        ]
                    }
                ],
-                "outbound": "~app_outbound~"
+                "outbound": "~outbound~"
            },
            {
+                "addruleset": true,
                "createruleset": [
                    {
                        "name": "process",
-                        "interval": "15s",
+                        "interval": "30s",
                        "rules": [
                            {
                                "process_name": "~process~"
@@ -150,13 +157,14 @@
                        ]
                    }
                ],
-                "outbound": "~process_outbound~"
+                "outbound": "~outbound~"
            },
            {
+                "addruleset": true,
                "createruleset": [
                    {
                        "name": "block",
-                        "interval": "15s",
+                        "interval": "30s",
                        "rules": [
                            {
                                "domain_suffix": "~block~"
@@ -167,10 +175,11 @@
                "outbound": "block"
            },
            {
+                "addruleset": true,
                "createruleset": [
                    {
                        "name": "warp",
-                        "interval": "15s",
+                        "interval": "30s",
                        "rules": [
                            {
                                "domain_suffix": "~warp~"
@@ -179,11 +188,8 @@
                    }
                ],
                "outbound": "~outbound~"
-            },
-            {
-                "outbound": "direct"
            }
        ],
-        "final": "~final_outbound~"
+        "final": "direct"
    }
-}
+}
@@ -3,7 +3,7 @@
    "server_port": 8388,
    "local_address": "0.0.0.0",
    "local_port": 1080,
-    "password": "test",
+    "password": "",
    "timeout": 120,
    "method": "chacha20-ietf-poly1305",
    "no_delay": true,
@@ -1,7 +1,7 @@
 {
    "server": "0.0.0.0",
    "server_port": 8388,
-    "password": "test",
+    "password": "",
    "timeout": 120,
    "method": "chacha20-ietf-poly1305",
    "no_delay": true,
@@ -11,6 +11,7 @@ events {
 }

 stream {
+    include /etc/nginx/deny;
    log_format basic '$remote_addr [$time_local] '
                     '$protocol $status $bytes_sent $bytes_received';
    access_log /logs/upstream_access basic;
@@ -34,7 +35,7 @@ stream {
    map_hash_bucket_size 128;
    map $ssl_preread_server_name $sni_name {
        #domain
-        telegram.org reality;
+        t reality;
        #domain

        #ocserv
@@ -16,27 +16,10 @@
                "enabled": true
            },
            "streamSettings": {
-                "network": "tcp",
-                "realitySettings": {
-                    "dest": "telegram.org:443",
-                    "maxClientVer": "",
-                    "maxTimeDiff": 0,
-                    "minClientVer": "",
-                    "privateKey": "",
-                    "serverNames": [
-                        "telegram.org"
-                    ],
-                    "shortIds": [],
-                    "show": false,
-                    "xver": 0
-                },
-                "tcpSettings": {
-                    "acceptProxyProtocol": true
-                },
-                "sockopt": {
-                    "acceptProxyProtocol": true
-                },
-                "security": "reality"
+                "network": "ws",
+                "wsSettings": {
+                    "path": "/ws"
+                }
            },
            "tag": "vless_tls"
        }
@@ -59,4 +42,4 @@
        "domainStrategy": "AsIs",
        "rules": []
    }
-}
+}
@@ -29,6 +29,7 @@ services:
        volumes:
            - ./config/.profile:/root/.ashrc:ro
            - ./config/upstream.conf:/etc/nginx/nginx.conf
+            - ./config/deny:/etc/nginx/deny
            - ./scripts/start_upstream.sh:/start_upstream.sh
            - ./ssh:/ssh
            - ./config/sshd_config:/etc/ssh/sshd_config
@@ -43,8 +44,6 @@ services:
                condition: service_healthy
            ad:
                condition: service_started
-            ss:
-                condition: service_started
        env_file:
            - path: ./.env
              required: true # default
@@ -95,7 +94,7 @@ services:
                ipv4_address: 10.10.1.2
        logging: *default-logging
    php:
-        image: mercurykd/vpnbot-php:1.5
+        image: mercurykd/vpnbot-php:1.7
        build:
            dockerfile: dockerfile/php.dockerfile
            args:
@@ -146,7 +145,7 @@ services:
            timeout: 5s
            retries: 5
    service:
-        image: mercurykd/vpnbot-php:1.5
+        image: mercurykd/vpnbot-php:1.6
        build:
            dockerfile: dockerfile/php.dockerfile
            args:
@@ -159,7 +158,9 @@ services:
            - ./ssh:/ssh
            - ./app:/app
            - ./logs/:/logs/
+            - ./version:/version
            - ./update:/update
+            - ./.git:/.git
            - ./scripts/start_service.sh:/start_service.sh
            - /var/run/docker.sock:/var/run/docker.sock:ro
        environment:
@@ -184,45 +185,13 @@ services:
            - up
            - ng
            - php
-            - proxy
            - wg
            - wg1
            - ad
-            - ss
            - tg
            - xr
            - oc
            - np
-    proxy:
-        image: mercurykd/vpnbot-ss:1.2
-        build:
-            dockerfile: dockerfile/shadowsocks.dockerfile
-            args:
-                image: ${IMAGE}
-        volumes:
-            - ./config/.profile:/root/.ashrc:ro
-            - ./config/sslocal.json:/config.json
-            - ./ssh:/ssh
-            - ./config/sshd_config:/etc/ssh/sshd_config
-            - ./scripts/start_proxy.sh:/start_proxy.sh
-        hostname: proxy
-        container_name: proxy-${VER}
-        depends_on:
-            php:
-                condition: service_healthy
-        networks:
-            default:
-                ipv4_address: 10.10.0.3
-        environment:
-            TZ: ${TZ}
-        env_file:
-            - path: ./.env
-              required: true # default
-            - path: ./override.env
-              required: false
-        stop_grace_period: 1s
-        command: ["/bin/sh", "/start_proxy.sh"]
-        logging: *default-logging
    wg:
        image: mercurykd/vpnbot-wg:1.1
        build:
@@ -244,8 +213,6 @@ services:
        depends_on:
            php:
                condition: service_healthy
-        ports:
-            - ${WGPORT}:${WGPORT}/udp
        env_file:
            - path: ./.env
              required: true # default
@@ -284,8 +251,6 @@ services:
        depends_on:
            php:
                condition: service_healthy
-        ports:
-            - ${WG1PORT}:${WG1PORT}/udp
        env_file:
            - path: ./.env
              required: true # default
@@ -304,13 +269,11 @@ services:
                ipv4_address: 10.10.0.14
        logging: *default-logging
    ad:
-        image: mercurykd/vpnbot-ad:1.2
+        image: mercurykd/vpnbot-ad:1.3
        build:
            dockerfile: dockerfile/adguard.dockerfile
            args:
                image: ${IMAGE}
-        ports:
-            - 853:853
        volumes:
            - ./config/.profile:/root/.ashrc:ro
            - type: volume
@@ -340,37 +303,6 @@ services:
            - NET_ADMIN
        entrypoint: ["/bin/sh", "/start_ad.sh"]
        logging: *default-logging
-    ss:
-        image: mercurykd/vpnbot-ss:1.2
-        build:
-            dockerfile: dockerfile/shadowsocks.dockerfile
-            args:
-                image: ${IMAGE}
-        volumes:
-            - ./config/.profile:/root/.ashrc:ro
-            - ./config/ssserver.json:/config.json
-            - ./ssh:/ssh
-            - ./config/sshd_config:/etc/ssh/sshd_config
-            - ./scripts/start_ss.sh:/start_ss.sh
-        hostname: shadowsocks
-        container_name: shadowsocks-${VER}
-        depends_on:
-            php:
-                condition: service_healthy
-        ports:
-            - ${SSPORT}:${SSPORT}/tcp
-            - ${SSPORT}:${SSPORT}/udp
-        env_file:
-            - path: ./.env
-              required: true # default
-            - path: ./override.env
-              required: false
-        stop_grace_period: 1s
-        command: ["/bin/sh", "/start_ss.sh"]
-        networks:
-            default:
-                ipv4_address: 10.10.0.6
-        logging: *default-logging
    tg:
        image: mercurykd/vpnbot-tg:1.1
        build:
@@ -386,8 +318,6 @@ services:
        depends_on:
            php:
                condition: service_healthy
-        ports:
-            - ${TGPORT}:${TGPORT}
        environment:
            IP: ${IP}
        env_file:
@@ -402,7 +332,7 @@ services:
                ipv4_address: 10.10.0.8
        logging: *default-logging
    xr:
-        image: mercurykd/vpnbot-xr:1.3
+        image: mercurykd/vpnbot-xr:1.4
        build:
            dockerfile: dockerfile/xray.dockerfile
            args:
@@ -22,14 +22,17 @@ RUN apk add --no-cache --update php81 \
    curl \
    git \
    py3-qt5 \
-    && wget https://github.com/ameshkov/dnslookup/releases/download/v1.9.1/dnslookup-linux-amd64-v1.9.1.tar.gz \
-    && tar -xf dnslookup-linux-amd64-v1.9.1.tar.gz \
+    && mkdir /root/.ssh \
+    && wget https://github.com/ameshkov/dnslookup/releases/download/v1.11.1/dnslookup-linux-amd64-v1.11.1.tar.gz \
+    && tar -xf dnslookup-linux-amd64-v1.11.1.tar.gz \
    && mv linux-amd64/dnslookup /usr/bin \
-    && rm dnslookup-linux-amd64-v1.9.1.tar.gz \
+    && rm dnslookup-linux-amd64-v1.11.1.tar.gz \
    && rm -rf /linux-amd64 \
-    && wget https://github.com/SagerNet/sing-box/releases/download/v1.8.11/sing-box-1.8.11-linux-amd64.tar.gz \
-    && tar -xf sing-box-1.8.11-linux-amd64.tar.gz \
-    && mv sing-box-1.8.11-linux-amd64/sing-box /usr/bin \
-    && rm sing-box-1.8.11-linux-amd64.tar.gz \
-    && rm -rf /sing-box-1.8.11-linux-amd64
-ENV ENV="/root/.ashrc"
+    && wget https://github.com/SagerNet/sing-box/releases/download/v1.10.3/sing-box-1.10.3-linux-amd64.tar.gz \
+    && tar -xf sing-box-1.10.3-linux-amd64.tar.gz \
+    && mv sing-box-1.10.3-linux-amd64/sing-box /usr/bin \
+    && rm sing-box-1.10.3-linux-amd64.tar.gz \
+    && rm -rf /sing-box-1.10.3-linux-amd64 \
+    && wget https://github.com/MetaCubeX/mihomo/releases/download/v1.18.10/mihomo-linux-amd64-v1.18.10.gz \
+    && gunzip mihomo-linux-amd64-v1.18.10.gz \
+    && mv mihomo-linux-amd64-v1.18.10 /usr/bin/mihomo
@@ -59,4 +59,12 @@ c:
 	git checkout .
 	git reset
 webhook:
-	docker compose exec php php checkwebhook.php
+	docker compose exec php php checkwebhook.php
+reset:
+	make d
+	git reset --hard
+	git clean -fd
+	docker volume rm vpnbot_adguard vpnbot_warp
+	make u
+backup:
+	docker compose exec php php backup.php > backup.json
@@ -1,28 +1,37 @@
 telegram bot to manage servers (inside the bot)

-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/d5a81237-5215-41db-87e5-20734120cc9c" width="200">
+<img src="https://github.com/user-attachments/assets/ec5faa51-987c-461a-a973-d94c7edf7115" width="300">

-### XTLS-Reality
+### VLESS (Reality OR Websocket)
 - change secret
 - qr/config
 - change fake domain
 - multiple users
- subscriptions with routing
+- subscriptions with routing (xray, sing-box, mihomo)
 - routing templates per user
+- routing via rulesets (sing-box, mihomo)
 - steal from yourself
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/39bdf4e0-96a6-4257-b61e-30a14122e236" width="200">
+- add domains to warp
+
+### Main menu VLESS:
+<img src="https://github.com/user-attachments/assets/80d2f671-fade-4819-a96a-efa253741ffd" width="300">
+
+### User menu VLESS:
+<img src="https://github.com/user-attachments/assets/5c3c5b5e-1931-4e98-a472-d303bac61a4e" width="300">

 ### NaiveProxy
 - change login
 - change password
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/2127a4af-0436-452c-bfe2-c750dd5dbc06" width="200">
+<img src="https://github.com/mercurykd/vpnbot/assets/30900414/2127a4af-0436-452c-bfe2-c750dd5dbc06" width="300">

 ### OpenConnect
 - change secret
 - change password
 - change dns
 - add user
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/a4ffc04f-965a-439b-862b-210b98e1f87d" width="200">
+- add ip subnet
+- expose-iroutes (lan between users)
+<img src="https://github.com/user-attachments/assets/c3a8a78e-fe99-423c-a626-610b333a2a56" width="300">

 ### Wireguard / Amnezia
 - create
@@ -31,31 +40,38 @@ telegram bot to manage servers (inside the bot)
 - timer
 - torrent blocking
 - qr/config
+- AmneziaVPN vpn:// link
 - statistics
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/51a79c93-8083-40ba-a14b-a6ef19f00531" width="200">
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/fd6ffd9f-bd75-479c-8dca-ea6c0b938b6c" width="200">
+<img src="https://github.com/mercurykd/vpnbot/assets/30900414/51a79c93-8083-40ba-a14b-a6ef19f00531" width="300">
+<img src="https://github.com/mercurykd/vpnbot/assets/30900414/fd6ffd9f-bd75-479c-8dca-ea6c0b938b6c" width="300">

 ### Shadowsocks + v2ray
 - change password
 - on/off v2ray
 - qr
 - short link
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/fbe39617-63ae-4536-8ab0-e4269ed8784a" width="200">
+<img src="https://github.com/mercurykd/vpnbot/assets/30900414/fbe39617-63ae-4536-8ab0-e4269ed8784a" width="300">

 ### AdguardHome
 - change password
 - change upstream dns
 - check dns
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/a7d4ba52-494b-429f-a3e2-08c68c8353c4" width="200">
+- check safesearch
+- add custom clientID for DNSoverTLS (DOT)
+- fill allowed clients (WG/AWG + OpenConnect + VLESS)
+- custom ID for each user VLESS
+<img src="https://github.com/user-attachments/assets/1dcdd9f9-f781-4ec2-8e32-01ce6095e0a3" width="300">

 ### PAC
 - the ability to create your own PAC available by url with the ability to substitute the final ip and port
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/5343e009-1b21-450f-918d-b811b98a0549" width="200">
+- Shadowsocks Android PAC
+- add [antifilter-community](https://community.antifilter.download/) or [ru-bundle](https://github.com/legiz-ru/sb-rule-sets/blob/main/ru-bundle.lst) domain lists
+<img src="https://github.com/user-attachments/assets/8d039dbb-6478-43a8-811a-4279e766c884" width="300">

 ### MTProto
 - change secret
 - qr/config
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/411696d8-172a-4dac-b6b7-4a6da3adfab2" width="200">
+<img src="https://github.com/user-attachments/assets/d37b2e1c-f991-4e1c-8060-1b547eea8fe2" width="300">

 ### Settings
 - add/change admin
@@ -63,10 +79,12 @@ telegram bot to manage servers (inside the bot)
 - import/export all settings
 - domain binding
 - obtain ssl for domain
-<img src="https://github.com/mercurykd/vpnbot/assets/30900414/431ec09d-9c14-4c74-b8f6-e49c142132e8" width="200">
+- fake html for domain
+- ports block
+<img src="https://github.com/user-attachments/assets/82b78014-eaa2-4b4c-bc90-77f58d03d57c" width="300">

 ---
-environment: ubuntu 18.04/20.04/22.04, debian 11/12
+environment: ubuntu 22.04/24.04, debian 11/12

 ### Install:

@@ -1,5 +0,0 @@
-make d
-rm /etc/systemd/resolved.conf.d/adguardhome.conf
-mv /etc/resolv.conf.backup /etc/resolv.conf
-systemctl reload-or-restart systemd-resolved
-make u
@@ -1,8 +0,0 @@
-mkdir /etc/systemd/resolved.conf.d
-echo "[Resolve]
-DNS=127.0.0.1
-DNSStubListener=no" > /etc/systemd/resolved.conf.d/adguardhome.conf
-mv /etc/resolv.conf /etc/resolv.conf.backup
-ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-systemctl reload-or-restart systemd-resolved
-make d u
@@ -3,7 +3,6 @@ ssh-keygen -m PEM -t rsa -f /ssh/key -N ''
 openssl req -newkey rsa:2048 -sha256 -nodes -x509 -days 365 -keyout /certs/self_private -out /certs/self_public  -subj "/C=NN/ST=N/L=N/O=N/CN=$IP"
 php init.php
 if [[ -f "/start" && -f "/ssh/key.pub" && -s "/ssh/key.pub" ]]; then
-    php cron.php &
    unitd --log /logs/unit_error
    curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
    pkill unitd
@@ -1 +1,5 @@
-php service.php
+cat /ssh/key.pub > /root/.ssh/authorized_keys
+ssh-keygen -A
+exec /usr/sbin/sshd -D -e "$@" &
+php service.php
+php cron.php
@@ -10,23 +10,23 @@ do
    if [[ -n "$cmd" ]]
    then
        key=$(cat $pwd/update/key)
-        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": "останавливаю бота"/')"
+        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": "stopping the bot"/')"
        docker compose down --remove-orphans
        if [[ "$cmd" == "1" ]]
        then
-            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": "очищаю директорию"/')"
+            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": "clearing the directory"/')"
            git reset --hard && git clean -fd
-            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": "скачиваю обновление"/')"
+            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": "downloading the update"/')"
            git fetch
            if [[ -n "$branch" ]]
            then
-                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": "меняю ветку"/')"
+                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": "changing branch"/')"
                git checkout -t origin/$branch || git checkout $branch
            fi
-            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": "применяю обновления"/')"
+            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": "applying updates"/')"
            git pull > ./update/message
        fi
-        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": "запускаю бота"/')"
+        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": "launching the bot"/')"
        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
@@ -1,3 +1,85 @@
+26.12.2024 v2.1
+- обновление версии singbox и конфига под него
+22.12.2024 v2.0
+!!! версия не совместима с предыдущими, возможно прийдется накатывать руками. старые конфиги (кроме вг) не будут работать! перед обновлением:
+- включить все порты или удалить docker-compose.override.yml
+- переключить vless на вебсокет
+- запустить обновление, если бот запуститься:
+- перевыпустить сертификаты
+- все ссылки на конфиги будут новыми (старые не будут работать)
+- переключить vless на нужный режим (передернуть тумблер)
+- включить нужные вам порты (по умолчанию включено только 80 и 443)
+
+что нового:
+- по умолчанию включены только 80, 443 порты
+- у каждого инстанса бота теперь индивидуальные ссылки и поддомены
+- отключены заголовки в ответах по которым можно было идентифицировать бота
+- стандартная заглушка на главной заменена на basic auth. если есть override.html - то покажет его
+- любая ссылка 'не по адресам бота' выдает непроходимый basic auth
+- поддомены np и oc теперь у каждого индивидуальные
+- выпилен shadowsocks (10.10.0.3 прокси теперь нет)
+- добавлен direct rule в origin-singbox шаблон
+- заменены значки для silence mode анализатора логов
+- переработано главное меню аля дашбоард
+- куча отрефакторенного кода - возможны баги
+
+19.12.2024 v1.115
+- генерация устойчивого пароля shadowsocks, если он равен test или пуст
+19.12.2024 v1.114
+- убран дефолтный пароль у shadowsocks
+13.12.2024 v1.113
+- обновлен adguardHome
+- фикс краша adg при удалении dns-upstream из бота
+10.12.2024 v1.112
+- mihomo: встроенные списки теперь отдаются через rule-providers(т.е подгружаются ядром без обновления конфига)
+- обновлены ядра
+09.12.2024 v1.111
+- mihomo: фикс rule-providers format
+06.12.2024 v1.110
+- ruleset для mihomo
+28.11.2024 v1.109
+- фикс автоскана
+- добавление clash-шаблонов
+21.11.2024 v1.108
+- xray: addruleset для direct
+- openconnect:ограничение формата при добавлении подсети
+- новый механизм сверки ip для анализатора айпи
+- мелкие фиксы меню и текста
+21.11.2024 v1.107
+- xray: добавлены теги ~cdndomain~, ~directdomain~
+- xray: возможность менять имя главного аутбаунда(тот аутбаунд который заполняет бот, в шаблонах идет как ~outbound~) для клиентских конфигов
+- xray: в шаблонах теперь надо явно указывать ключ addruleset в route -> rules, чтобы бот заполнил их правилами из списка ruleset (см origin шаблон)
+- openconnect: добавлена маршрутизация (список подсетей общий с wireguard)
+- ip ban: фикс обработки подсетей в белом/черном списках
+- ip ban: в белый список можно импортировать адреса от telegram, gcore, cloudflare
+- добавлена в игнор папка app/webapp/override. она не будет перезатираться после обновления, туда можно положить ваши ресурсы к override.html
+- <code>make backup</code> - сохранит в корень backup.json
+- <code>make reset</code> - обнуляет все настройки
+18.11.2024 v1.106
+- фикс отвала бота при пустых логах телеги
+17.11.2024 v1.105
+- фикс установки домена при первом запуске
+16.11.2024 v1.104
+- единая механика закрепления бэкапа
+- фикс текста уведомления о новой версии
+16.11.2024 v1.103
+- фикс уведомления о новой версии
+16.11.2024 v1.102
+- переделан раздел списка ip под управление кнопками
+- возможность добавить свои айпи в blocklist/whitelist
+15.11.2024 v1.101
+- кнопка добавления https://github.com/legiz-ru/sb-rule-sets/raw/main/ru-bundle.lst
+- переделан раздел списка ip для читаемости
+15.11.2024 v1.100
+- несколько режимов silence для сканера
+- анализ сканера скидывает файл всех найденных айпи
+- команда /searchLogs (пока только для айпи)
+- логи переехали в меню сканера
+- обновление текстов и подсказок
+14.11.2024 v1.99.1
+- анализ логов и бан айпишников, фиксы
+14.11.2024 v1.99
+- анализ логов и бан айпишников
 11.11.2024 v1.98
 - фикс заполнения clientId при наполнении белого списка клиентов adg
 09.11.2024 v1.97
Author	SHA1	Message	Date
mercury	d633799f11	update version	2024-12-26 16:26:34 +04:00
Konstantin	ead66c3951	Merge pull request #29 from legiz-ru/dev sb1.10+tun-inbound + sb-win64-1.10.5	2024-12-26 09:46:35 +04:00
legiz-ru	bd7742d8b2	update tun inbound (changes in sb 1.10+) change inet4_address to address https://sing-box.sagernet.org/migration/#tun-address-fields-are-merged	2024-12-24 16:32:07 +03:00
legiz-ru	ac593629a8	update singbox 1.10.5 windows x64	2024-12-24 16:24:58 +03:00
mercury	9932ee1e00	update version	2024-12-22 18:48:13 +04:00
mercury	1a6e9f43e8	show branch	2024-12-22 18:25:54 +04:00
mercury	76373ffcf2	fix first start nginx	2024-12-22 16:57:27 +04:00
mercury	43c59a9ed6	cloak main	2024-12-22 16:24:42 +04:00
mercury	8b3c6ca547	cloak static	2024-12-22 15:32:27 +04:00
mercury	63654e7ad7	cloak donate	2024-12-22 15:23:58 +04:00
mercury	dcb4f72f07	fix cloak DoT	2024-12-22 15:16:35 +04:00
mercury	90afbbedb0	cloak DoH	2024-12-22 15:04:19 +04:00
mercury	1964ed0079	fix adguard	2024-12-22 14:58:02 +04:00
mercury	2525181655	fix nginx	2024-12-22 14:39:58 +04:00
mercury	ef690349fd	fix change transport xray	2024-12-22 14:33:00 +04:00
mercury	2c1db5f233	cloak xray	2024-12-22 13:32:01 +04:00
mercury	554d7f3a25	fix cloak nginx	2024-12-21 20:39:17 +04:00
mercury	f2a1ec1b71	cloak nginx	2024-12-21 20:12:21 +04:00
mercury	04f1bf564c	cloak for np/oc subdomain	2024-12-21 01:09:17 +04:00
mercury	1116f8ec75	delete backup shadowsocks	2024-12-21 01:04:18 +04:00
mercury	f8e5b54a98	fix tlgrm handle	2024-12-20 03:25:35 +04:00
mercury	3929032e7a	fix add domain and ssl	2024-12-20 02:46:09 +04:00
mercury	057917a24a	delete x-powered-by php	2024-12-20 01:12:21 +04:00
mercury	941fc05e21	fix tlgrm location	2024-12-20 00:57:21 +04:00
mercury	797088a328	improve nginx config	2024-12-20 00:52:49 +04:00
mercury	45614eaf3b	delete shadowsocks	2024-12-20 00:21:55 +04:00
mercury	47113b4940	hide ports	2024-12-19 23:42:27 +04:00
mercury	3febfe1d3d	Merge branch 'dev' into stealth	2024-12-19 20:38:41 +04:00
mercury	90084c37ff	shadowsocks password generation	2024-12-19 01:13:31 +04:00
mercury	b49f088256	fix default password for shadowsocks	2024-12-19 00:15:41 +04:00
mercury	09a0f77863	update version	2024-12-13 16:00:03 +04:00
mercury	8c65f8e538	update adguardhome version	2024-12-13 01:24:59 +04:00
mercury	32e49088c2	fix delete upstream	2024-12-12 23:21:17 +04:00
Konstantin	f666762dfa	Merge pull request #28 from legiz-ru:dev Update readme.md	2024-12-12 14:31:41 +04:00
legiz-ru	a1778e6be8	Update readme.md	2024-12-12 13:26:33 +03:00
Konstantin	4b61e38b6b	Merge pull request #27 from legiz-ru:dev fix behavior clash.json	2024-12-11 02:38:47 +04:00
legiz-ru	270968e4ac	fix behavior clash.json	2024-12-11 00:32:11 +03:00
mercury	3349e3b306	mihomo: new rule-set generation scheme	2024-12-10 22:55:17 +04:00
mercury	3e53000065	update version	2024-12-10 17:16:05 +04:00
mercury	18ceb51f4e	mihomo: rules -> rule-providers update core's	2024-12-10 17:13:38 +04:00
mercury	99bce7a988	update version	2024-12-09 14:30:26 +04:00
mercury	446a5d7150	mihomo: rule-providers add format	2024-12-09 13:32:25 +04:00
mercury	855f516936	update version	2024-12-06 23:39:12 +04:00
mercury	e1c13480d1	mihomo: fix empty rules	2024-12-06 23:36:43 +04:00
mercury	bd5e10fa23	naming: clash -> mihomo	2024-12-06 23:12:22 +04:00
mercury	3627b389b4	mihomo: added yaml support	2024-12-06 22:26:00 +04:00
mercury	f3f9cb5348	fix ruleset for mihomo	2024-12-06 22:11:12 +04:00
mercury	1527b9f856	added rule-set for clash	2024-12-04 00:08:32 +04:00
mercury	f896b307ea	removed check when adding a subnet to openconnect	2024-11-28 20:11:05 +04:00
mercury	8ba7ddedee	update version	2024-11-28 20:04:53 +04:00
mercury	19ef567873	fix createruleset	2024-11-28 19:51:21 +04:00
mercury	4f4e36e1cb	doh ip exclude for analyze ip	2024-11-28 15:17:42 +04:00
mercury	6267931475	fix bug createruleset for singbox	2024-11-28 12:59:06 +04:00
mercury	7e2d90e7da	update prioritet clash rules	2024-11-28 10:36:10 +04:00
mercury	28906176f5	update clash links	2024-11-28 00:21:22 +04:00
mercury	968d72ce81	autoscan call fix	2024-11-28 00:12:12 +04:00
mercury	66e204e5ba	import url for clash	2024-11-27 23:37:39 +04:00
mercury	36e8acd2aa	xray: template for clash	2024-11-27 22:00:30 +04:00
mercury	cdc20adccd	consistent template logic	2024-11-27 16:52:30 +04:00
mercury	8ad00bc47a	update version	2024-11-21 18:09:25 +04:00
mercury	4902eb53ce	fix addruleset for direct	2024-11-21 16:04:09 +04:00
mercury	253cceb44c	fix analyze ip autoban	2024-11-21 12:13:02 +04:00
mercury	9d53f2896c	fix analyze memory	2024-11-21 11:49:29 +04:00
mercury	550a8ad3b7	fix ip/32 analyze	2024-11-21 01:37:22 +04:00
mercury	e2f84b0ee7	update version	2024-11-21 00:39:07 +04:00
mercury	b394e769c6	роутинг для openconnect	2024-11-21 00:24:50 +04:00
mercury	7d8dc1dd2d	duplicating the list of subnets for openconnect	2024-11-20 20:59:25 +04:00
mercury	34b1de5132	import telegram, gcore, cloudflare ip	2024-11-20 20:58:17 +04:00
mercury	12b5d84afc	IP analyzer takes into account subnets	2024-11-20 17:12:08 +04:00
mercury	c3d90ada83	addruleset and additional tags	2024-11-20 15:55:10 +04:00
mercury	dbe3f290ea	commands reset and backup	2024-11-20 15:46:03 +04:00
mercury	b56b48e080	override ignore	2024-11-20 15:45:02 +04:00
mercury	21b7a4816f	fix bot dump when telegram logs are empty	2024-11-18 00:31:53 +04:00
mercury	51ecb815ba	fix domain installation on first launch	2024-11-17 19:32:54 +04:00
mercury	66cee61d41	allow telegram ip	2024-11-17 15:08:01 +04:00
mercury	66225917fe	fix ip menu	2024-11-16 16:45:36 +04:00
mercury	be227f6a33	update version	2024-11-16 01:13:53 +04:00
mercury	37d392a240	update backup	2024-11-16 01:10:47 +04:00
mercury	565573cfc2	fix notify update	2024-11-16 00:51:09 +04:00
mercury	3813f43b92	update bot from notify	2024-11-16 00:45:30 +04:00
mercury	f34427c13c	fix notification about new version	2024-11-16 00:42:22 +04:00
mercury	c2219e3657	ability to add your IPs to blocklist/whitelist	2024-11-16 00:34:22 +04:00
mercury	0d7426e785	improve analyze ip	2024-11-16 00:11:19 +04:00
mercury	c56fe4ff78	blocklist improve add https://github.com/legiz-ru/sb-rule-sets/raw/main/ru-bundle.lst button	2024-11-15 11:49:20 +04:00
mercury	b0e6835ac9	improve scanner	2024-11-15 01:04:06 +04:00
mercury	f29d366aef	scaner: fix regex	2024-11-14 16:47:55 +04:00
mercury	9eb15b9b45	update version	2024-11-14 15:37:06 +04:00
mercury	954cfe0346	improve ip ban	2024-11-14 14:32:49 +04:00
mercury	b3366edb6e	Merge branch 'dev' into stealth	2024-11-14 02:36:55 +04:00
mercury	0d21eadcaa	fix input timer autoscan	2024-11-14 02:35:51 +04:00
mercury	1edc9e8608	fix input timer autoscan	2024-11-14 02:32:03 +04:00
mercury	8a3d9c1007	server headers off	2024-11-14 01:44:31 +04:00
mercury	f0b43e791d	update version	2024-11-14 01:13:59 +04:00
mercury	0297417a63	xray log file	2024-11-14 00:40:54 +04:00
mercury	7449e8bba3	scanner: sort ips	2024-11-14 00:35:15 +04:00
mercury	ad7351dc9a	improve logs	2024-11-14 00:24:15 +04:00
mercury	5c5c537d62	scanner: allow/deny lists	2024-11-14 00:01:23 +04:00
mercury	edc877f149	limit message for scanner	2024-11-13 01:08:25 +04:00
mercury	ea07b0da42	scanner init	2024-11-13 00:59:34 +04:00