update version

xray log file
scanner: sort ips
2024-11-14 01:13:59 +04:00 · 2024-11-14 00:40:54 +04:00 · 2024-11-14 00:35:15 +04:00 · 2024-11-14 00:24:15 +04:00 · 2024-11-14 00:01:23 +04:00 · 2024-11-13 01:08:25 +04:00
60 changed files with 3522 additions and 569 deletions
@@ -19,4 +19,7 @@ mirror/.env
 update/*
 !update/update.sh

-override.env
+override.env
+override.html
+override.php
+docker-compose.override.yml
@@ -7,5 +7,4 @@ require __DIR__ . '/bot.php';
 require __DIR__ . '/config.php';
 require __DIR__ . '/i18n.php';

-$bot = new Bot($c['key'], $i);
-$bot->cron();
+(new Bot($c['key'], $i))->cron();
@@ -2,8 +2,8 @@

 $i = [
    'warp'             => [
-        'en' => 'Warp',
-        'ru' => 'Warp',
+        'en' => 'warp',
+        'ru' => 'warp',
    ],
    'wg_title'             => [
        'en' => 'Wireguard',
@@ -241,6 +241,10 @@ $i = [
        'en' => 'defaultDNS',
        'ru' => 'дефолтный днс',
    ],
+    'defaultMTU'  => [
+        'en' => 'defaultMTU',
+        'ru' => 'дефолтный MTU',
+    ],
    'debug'  => [
        'en' => 'debug mode',
        'ru' => 'режим отладки',
@@ -258,8 +262,8 @@ $i = [
        'ru' => 'очистить',
    ],
    'xray'  => [
-        'en' => 'XTLS-Reality',
-        'ru' => 'XTLS-Reality',
+        'en' => 'Xray',
+        'ru' => 'Xray',
    ],
    'geodb'  => [
        'en' => 'GeoIp/GeoSite',
@@ -278,8 +282,8 @@ $i = [
        'ru' => 'пагинация',
    ],
    'exchange'  => [
-        'en' => 'open ip',
-        'ru' => 'откр айпи',
+        'en' => 'client isolation',
+        'ru' => 'изоляция клиентов',
    ],
    'ocserv'  => [
        'en' => 'OpenConnect',
@@ -333,4 +337,40 @@ $i = [
        'en' => '🟢 have updates',
        'ru' => '🟢 есть обновления',
    ],
+    'fake html'  => [
+        'en' => 'fake html',
+        'ru' => 'фейк заглушка',
+    ],
+    'expose-iroutes'  => [
+        'en' => 'expose-iroutes',
+        'ru' => 'изоляция клиентов',
+    ],
+    'fill allowed clients'  => [
+        'en' => 'fill allowed clients',
+        'ru' => 'заполнить белый список клиентов',
+    ],
+    'delete allowed clients'  => [
+        'en' => 'delete allowed clients',
+        'ru' => 'очистить белый список клиентов',
+    ],
+    'success'  => [
+        'en' => 'success',
+        'ru' => 'сохранено',
+    ],
+    'error'  => [
+        'en' => 'error',
+        'ru' => 'ошибка',
+    ],
+    'save'  => [
+        'en' => 'save',
+        'ru' => 'сохранить',
+    ],
+    'copy'  => [
+        'en' => 'copy',
+        'ru' => 'копировать',
+    ],
+    'restart'  => [
+        'en' => 'restart',
+        'ru' => 'перезагрузка',
+    ],
 ];
@@ -11,16 +11,22 @@ 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;
 }

 // pac
-$type = $_GET['t'] ?? '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'];
+$port    = $_GET['p'] ?: '1080';
+$hash    = $_GET['h'];
 if ($hash == substr(md5($c['key']), 0, 8)) {
    require __DIR__ . '/bot.php';
    require __DIR__ . '/i18n.php';
@@ -41,8 +47,63 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
                $t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
            }
            if ($t) {
-                header('Content-Type: application/json');
-                echo json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                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;
            }

@@ -75,8 +136,13 @@ if (!empty($_GET['hash'])) {
        require __DIR__ . '/bot.php';
        require __DIR__ . '/i18n.php';
        $bot = new Bot($c['key'], $i);
-        setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
-        setcookie('a', $bot->adguardBasicAuth(), 0, '/');
+        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');
    }
 }
@@ -10,8 +10,7 @@ if ($c['debug']) {
 }

 $bot = new Bot($c['key'], $i);
-$bot->adguardProtect();
-$bot->adguardCheckPswd();
-$bot->setcommands();
-$bot->syncPortClients();
+$bot->cleanQueue();
 $bot->setwebhook();
+$bot->syncPortClients();
+$bot->setcommands();
@@ -12,32 +12,13 @@ if ($c['debug']) {

 $bot = new Bot($c['key'], $i);

-if (!empty($c['admin'])) {
-    $ip = getenv('IP');
-    $rm = explode(':', trim(file_get_contents('/update/reload_message')));
-    $m  = file_get_contents('/update/message');
-    foreach ($c['admin'] as $k => $v) {
-        $r = $bot->send($v, "start $ip");
-        $bot->input['chat']        = $v;
-        $bot->input['message_id']  = $r['result']['message_id'];
-        if (file_exists($bot->update)) {
-            if (!empty($m)) {
-                $bot->send($v, "<pre>$m</pre>", $v == $rm[0] ? $rm[1] : 0);
-            }
-            $r = $bot->send($v, "import settings");
-            $bot->input['chat']        = $v;
-            $bot->input['message_id']  = $r['result']['message_id'];
-            $bot->input['callback_id'] = $r['result']['message_id'];
-            if (empty($flag)) {
-                $bot->importFile($bot->update);
-                unlink($bot->update);
-                $flag = true;
-            }
-        }
-    }
-}
-file_put_contents('/update/message', '');
-file_put_contents('/update/reload_message', '');
+$bot->selfUpdate();
 $bot->restartTG();
+if (!empty($bot->selfupdate)) {
+    $bot->offWarp();
+}
+$bot->dontshowcron = 1;
+$bot->adguardSync();
 $bot->sslip();
+$bot->syncDeny();
 $bot->cleanDocker();
@@ -89,11 +89,14 @@ function start()

    $conf = $bot->getPacConf();

-    $subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
+    if (!empty($conf['subzoneslist'])) {
+        $subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
+    }

    // check && exclude
-    $include = array_filter($conf['includelist'], fn($x) => $x == true);
-    $domains = $include;
+    if (!empty($conf['includelist'])) {
+        $domains = array_filter($conf['includelist'], fn($x) => $x == true);
+    }
    if (empty($domains)) {
        $text = "Empty domains. Delete pac files";
        unlink(__DIR__ . '/zapretlists/mpac');
@@ -146,10 +149,13 @@ function start()
        file_put_contents(__DIR__ . '/zapretlists/pac', $pac);
        $text .= "Create minified pac 100%\n";
    }
-
    // create reverse PAC
-    $domains = array_filter($conf['reverselist'], fn($x) => $x == true);
+    unset($domains);
+    if (!empty($conf['reverselist'])) {
+        $domains = array_filter($conf['reverselist'], fn($x) => $x == true);
+    }
    if (empty($domains)) {
+
        // $text .= "Empty reverse domains. Delete reverse pac files";
        unlink(__DIR__ . '/zapretlists/rmpac');
        unlink(__DIR__ . '/zapretlists/rpac');
@@ -197,6 +203,7 @@ function start()
        file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
        $text .= 'Create minified reverse pac 100%';
    }
+
    endScript($text);
 }

@@ -242,7 +249,6 @@ $load = [
    '-',
    '\\',
 ];
-
 switch ($_SERVER['argv'][1]) {
    case 'start':
        $bot                       = new Bot($c['key'], $i);
@@ -0,0 +1,749 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="240"
+   height="144"
+   id="svg4136"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="jsoneditor-icons.svg">
+  <title
+     id="title6512">JSON Editor Icons</title>
+  <metadata
+     id="metadata4148">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>JSON Editor Icons</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4146" />
+  <sodipodi:namedview
+     pagecolor="#ff63ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1026"
+     id="namedview4144"
+     showgrid="true"
+     inkscape:zoom="4"
+     inkscape:cx="13.229181"
+     inkscape:cy="119.82429"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4136"
+     showguides="false"
+     borderlayer="false"
+     inkscape:showpageshadow="true"
+     showborder="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4640"
+       empspacing="24" />
+  </sodipodi:namedview>
+  <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
+     id="svg_1"
+     height="16"
+     width="16"
+     y="4"
+     x="4" />
+  <rect
+     id="svg_1-7"
+     height="16"
+     width="16"
+     y="3.999995"
+     x="28.000006"
+     style="fill:#ec3f29;fill-opacity:0.94117647;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
+     x="52.000004"
+     y="3.999995"
+     width="16"
+     height="16"
+     id="rect4165" />
+  <rect
+     id="rect4175"
+     height="16"
+     width="16"
+     y="3.9999852"
+     x="172.00002"
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4175-3"
+     height="16"
+     width="16"
+     y="3.999995"
+     x="196"
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0" />
+  <g
+     id="g4299"
+     style="stroke:none">
+    <rect
+       x="7.0000048"
+       y="10.999998"
+       width="9.9999924"
+       height="1.9999986"
+       id="svg_1-1"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+    <rect
+       x="11.000005"
+       y="7.0000114"
+       width="1.9999955"
+       height="9.9999838"
+       id="svg_1-1-1"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+  </g>
+  <g
+     id="g4299-3"
+     transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,19.029435,12.000001)"
+     style="stroke:none">
+    <rect
+       x="7.0000048"
+       y="10.999998"
+       width="9.9999924"
+       height="1.9999986"
+       id="svg_1-1-0"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+    <rect
+       x="11.000005"
+       y="7.0000114"
+       width="1.9999955"
+       height="9.9999838"
+       id="svg_1-1-1-9"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+  </g>
+  <rect
+     id="svg_1-7-5"
+     height="6.9999905"
+     width="6.9999909"
+     y="7.0000048"
+     x="55.000004"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="58"
+     y="10.00001"
+     width="6.9999909"
+     height="6.9999905"
+     id="rect4354" />
+  <rect
+     id="svg_1-7-5-7"
+     height="6.9999905"
+     width="6.9999909"
+     y="10.000005"
+     x="58.000004"
+     style="fill:#ffffff;fill-opacity:1;stroke:#3c80df;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94117647" />
+  <g
+     id="g4378">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
+       x="198"
+       y="10.999999"
+       width="7.9999909"
+       height="1.9999965"
+       id="svg_1-7-5-3" />
+    <rect
+       id="rect4374"
+       height="1.9999946"
+       width="11.999995"
+       y="7.0000005"
+       x="198"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+    <rect
+       id="rect4376"
+       height="1.9999995"
+       width="3.9999928"
+       y="14.999996"
+       x="198"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+  </g>
+  <g
+     transform="matrix(1,0,0,-1,-23.999995,23.999995)"
+     id="g4383">
+    <rect
+       id="rect4385"
+       height="1.9999965"
+       width="7.9999909"
+       y="10.999999"
+       x="198"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
+       x="198"
+       y="7.0000005"
+       width="11.999995"
+       height="1.9999946"
+       id="rect4387" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
+       x="198"
+       y="14.999996"
+       width="3.9999928"
+       height="1.9999995"
+       id="rect4389" />
+  </g>
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-4"
+     width="16"
+     height="16"
+     x="76"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 85.10447,6.0157384 -0.0156,1.4063 c 3.02669,-0.2402 0.33008,3.6507996 2.48438,4.5780996 -2.18694,1.0938 0.49191,4.9069 -2.45313,4.5781 l -0.0156,1.4219 c 5.70828,0.559 1.03264,-5.1005 4.70313,-5.2656 l 0,-1.4063 c -3.61303,-0.027 1.11893,-5.7069996 -4.70313,-5.3124996 z"
+     id="path4351"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 82.78125,5.9984384 0.0156,1.4063 c -3.02668,-0.2402 -0.33007,3.6506996 -2.48437,4.5780996 2.18694,1.0938 -0.49192,4.9069 2.45312,4.5781 l 0.0156,1.4219 c -5.70827,0.559 -1.03263,-5.1004 -4.70312,-5.2656 l 0,-1.4063 c 3.61303,-0.027 -1.11894,-5.7070996 4.70312,-5.3124996 z"
+     id="path4351-9"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-25"
+     width="16"
+     height="16"
+     x="100"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 103.719,5.6719384 0,12.7187996 3.03125,0 0,-1.5313 -1.34375,0 0,-9.6249996 1.375,0 0,-1.5625 z"
+     id="path2987"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 112.2185,5.6721984 0,12.7187996 -3.03125,0 0,-1.5313 1.34375,0 0,-9.6249996 -1.375,0 0,-1.5625 z"
+     id="path2987-1"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-73"
+     width="16"
+     height="16"
+     x="124"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 126.2824,17.602938 1.78957,0 1.14143,-2.8641 5.65364,0 1.14856,2.8641 1.76565,0 -4.78687,-11.1610996 -1.91903,0 z"
+     id="path3780"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccc" />
+  <path
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     d="m 129.72704,13.478838 4.60852,0.01 -2.30426,-5.5497996 z"
+     id="path3782"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-35"
+     width="16"
+     height="16"
+     x="148"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 156.47655,5.8917384 0,2.1797 0.46093,2.3983996 1.82813,0 0.39844,-2.3983996 0,-2.1797 z"
+     id="path5008-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 152.51561,5.8906384 0,2.1797 0.46094,2.3983996 1.82812,0 0.39844,-2.3983996 0,-2.1797 z"
+     id="path5008-2-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <rect
+     id="svg_1-7-2"
+     height="1.9999961"
+     width="11.999996"
+     y="64"
+     x="54"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     id="svg_1-7-2-2"
+     height="2.9999905"
+     width="2.9999907"
+     y="52"
+     x="80.000008"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="85.000008"
+     y="52"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4561" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="80.000008"
+     y="58"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4563" />
+  <rect
+     id="rect4565"
+     height="2.9999905"
+     width="2.9999907"
+     y="58"
+     x="85.000008"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4567"
+     height="2.9999905"
+     width="2.9999907"
+     y="64"
+     x="80.000008"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="85.000008"
+     y="64"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4569" />
+  <circle
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path4571"
+     cx="110.06081"
+     cy="57.939209"
+     r="4.7438836" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="116.64566"
+     y="-31.79752"
+     width="4.229713"
+     height="6.4053884"
+     id="rect4563-2"
+     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+  <path
+     style="fill:#4c4c4c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 125,56 138.77027,56.095 132,64 Z"
+     id="path4613"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path4615"
+     d="M 149,64 162.77027,63.905 156,56 Z"
+     style="fill:#4c4c4c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="54"
+     y="53"
+     width="11.999996"
+     height="1.9999961"
+     id="rect4638" />
+  <rect
+     id="svg_1-7-2-24"
+     height="1.9999957"
+     width="12.99999"
+     y="-56"
+     x="53"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     transform="matrix(0,1,-1,0,0,0)" />
+  <rect
+     transform="matrix(0,1,-1,0,0,0)"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="53"
+     y="-66"
+     width="12.99999"
+     height="1.9999957"
+     id="rect4657" />
+  <rect
+     id="rect4659"
+     height="0.99999291"
+     width="11.999999"
+     y="57"
+     x="54"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="54"
+     y="88.000122"
+     width="11.999996"
+     height="1.9999961"
+     id="rect4661" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="80.000008"
+     y="76.000122"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4663" />
+  <rect
+     id="rect4665"
+     height="2.9999905"
+     width="2.9999907"
+     y="76.000122"
+     x="85.000008"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <rect
+     id="rect4667"
+     height="2.9999905"
+     width="2.9999907"
+     y="82.000122"
+     x="80.000008"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="85.000008"
+     y="82.000122"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4669" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="80.000008"
+     y="88.000122"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4671" />
+  <rect
+     id="rect4673"
+     height="2.9999905"
+     width="2.9999907"
+     y="88.000122"
+     x="85.000008"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <circle
+     r="4.7438836"
+     cy="81.939331"
+     cx="110.06081"
+     id="circle4675"
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#d3d3d3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+     id="rect4677"
+     height="6.4053884"
+     width="4.229713"
+     y="-14.826816"
+     x="133.6163"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:#d3d3d3;stroke-width:0;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path4679"
+     d="m 125,80.000005 13.77027,0.09499 L 132,87.999992 Z"
+     style="fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:#d3d3d3;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:#d3d3d3;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 149,88.0002 162.77027,87.9052 156,80.0002 Z"
+     id="path4681"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <rect
+     id="rect4683"
+     height="1.9999961"
+     width="11.999996"
+     y="77.000122"
+     x="54"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,-1,0,0,0)"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="77.000122"
+     y="-56"
+     width="12.99999"
+     height="1.9999957"
+     id="rect4685" />
+  <rect
+     id="rect4687"
+     height="1.9999957"
+     width="12.99999"
+     y="-66"
+     x="77.000122"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     transform="matrix(0,1,-1,0,0,0)" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="54"
+     y="81.000122"
+     width="11.999999"
+     height="0.99999291"
+     id="rect4689" />
+  <rect
+     id="rect4761-1"
+     height="1.9999945"
+     width="15.99999"
+     y="101"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-0"
+     height="1.9999945"
+     width="15.99999"
+     y="105"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-7"
+     height="1.9999945"
+     width="9"
+     y="109"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1"
+     height="1.9999945"
+     width="12"
+     y="125"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1-4"
+     height="1.9999945"
+     width="10"
+     y="137"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1-4-4"
+     height="1.9999945"
+     width="10"
+     y="129"
+     x="82"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1-4-4-3"
+     height="1.9999945"
+     width="9"
+     y="133"
+     x="82"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.8;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 36.398438,100.0254 c -0.423362,-0.013 -0.846847,0.01 -1.265626,0.062 -1.656562,0.2196 -3.244567,0.9739 -4.507812,2.2266 L 29,100.5991 l -2.324219,7.7129 7.826172,-1.9062 -1.804687,-1.9063 c 1.597702,-1.5308 4.048706,-1.8453 5.984375,-0.7207 1.971162,1.1452 2.881954,3.3975 2.308593,5.5508 -0.573361,2.1533 -2.533865,3.6953 -4.830078,3.6953 l 0,3.0742 c 3.550756,0 6.710442,-2.4113 7.650391,-5.9414 0.939949,-3.5301 -0.618463,-7.2736 -3.710938,-9.0703 -1.159678,-0.6738 -2.431087,-1.0231 -3.701171,-1.0625 z"
+     id="path4138" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.8;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 59.722656,99.9629 c -1.270084,0.039 -2.541493,0.3887 -3.701172,1.0625 -3.092475,1.7967 -4.650886,5.5402 -3.710937,9.0703 0.939949,3.5301 4.09768,5.9414 7.648437,5.9414 l 0,-3.0742 c -2.296214,0 -4.256717,-1.542 -4.830078,-3.6953 -0.573361,-2.1533 0.337432,-4.4056 2.308594,-5.5508 1.935731,-1.1246 4.38863,-0.8102 5.986326,0.7207 l -1.806638,1.9063 7.828128,1.9062 -2.32422,-7.7129 -1.62696,1.7168 c -1.26338,-1.2531 -2.848917,-2.0088 -4.505855,-2.2285 -0.418778,-0.055 -0.842263,-0.076 -1.265625,-0.062 z"
+     id="path4138-1" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 10.5,100 0,2 -2.4999996,0 L 12,107 l 4,-5 -2.5,0 0,-2 -3,0 z"
+     id="path3055-0-77" />
+  <path
+     style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:1.96599996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 4.9850574,108.015 14.0298856,-0.03"
+     id="path5244-5-0-5"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:1.96599996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 4.9849874,132.015 14.0298866,-0.03"
+     id="path5244-5-0-5-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 36.398438,123.9629 c -0.423362,-0.013 -0.846847,0.01 -1.265626,0.062 -1.656562,0.2196 -3.244567,0.9739 -4.507812,2.2266 L 29,124.5366 l -2.324219,7.7129 7.826172,-1.9062 -1.804687,-1.9063 c 1.597702,-1.5308 4.048706,-1.8453 5.984375,-0.7207 1.971162,1.1453 2.881954,3.3975 2.308593,5.5508 -0.573361,2.1533 -2.533864,3.6953 -4.830078,3.6953 l 0,3.0742 c 3.550757,0 6.710442,-2.4093 7.650391,-5.9394 0.939949,-3.5301 -0.618463,-7.2756 -3.710938,-9.0723 -1.159678,-0.6737 -2.431087,-1.0231 -3.701171,-1.0625 z"
+     id="path4138-12" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 59.722656,123.9629 c -1.270084,0.039 -2.541493,0.3888 -3.701172,1.0625 -3.092475,1.7967 -4.650886,5.5422 -3.710937,9.0723 0.939949,3.5301 4.09768,5.9394 7.648437,5.9394 l 0,-3.0742 c -2.296214,0 -4.256717,-1.542 -4.830078,-3.6953 -0.573361,-2.1533 0.337432,-4.4055 2.308594,-5.5508 1.935731,-1.1246 4.38863,-0.8102 5.986326,0.7207 l -1.806638,1.9063 7.828128,1.9062 -2.32422,-7.7129 -1.62696,1.7168 c -1.26338,-1.2531 -2.848917,-2.0088 -4.505855,-2.2285 -0.418778,-0.055 -0.842263,-0.076 -1.265625,-0.062 z"
+     id="path4138-1-3" />
+  <path
+     id="path6191"
+     d="m 10.5,116 0,-2 -2.4999996,0 L 12,109 l 4,5 -2.5,0 0,2 -3,0 z"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 10.5,129 0,-2 -2.4999996,0 L 12,122 l 4,5 -2.5,0 0,2 -3,0 z"
+     id="path6193" />
+  <path
+     id="path6195"
+     d="m 10.5,135 0,2 -2.4999996,0 L 12,142 l 4,-5 -2.5,0 0,-2 -3,0 z"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     inkscape:connector-curvature="0" />
+  <path
+     sodipodi:type="star"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path4500"
+     sodipodi:sides="3"
+     sodipodi:cx="11.55581"
+     sodipodi:cy="60.073242"
+     sodipodi:r1="5.1116104"
+     sodipodi:r2="2.5558052"
+     sodipodi:arg1="0"
+     sodipodi:arg2="1.0471976"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 16.66742,60.073242 -3.833708,2.213392 -3.8337072,2.213393 0,-4.426785 0,-4.426784 3.8337082,2.213392 z"
+     inkscape:transform-center-x="-1.2779026" />
+  <path
+     inkscape:transform-center-x="1.277902"
+     d="m -31.500004,60.073242 -3.833708,2.213392 -3.833707,2.213393 0,-4.426785 0,-4.426784 3.833707,2.213392 z"
+     inkscape:randomized="0"
+     inkscape:rounded="0"
+     inkscape:flatsided="false"
+     sodipodi:arg2="1.0471976"
+     sodipodi:arg1="0"
+     sodipodi:r2="2.5558052"
+     sodipodi:r1="5.1116104"
+     sodipodi:cy="60.073242"
+     sodipodi:cx="-36.611614"
+     sodipodi:sides="3"
+     id="path4502"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     sodipodi:type="star"
+     transform="scale(-1,1)" />
+  <path
+     d="m 16.66742,60.073212 -3.833708,2.213392 -3.8337072,2.213392 0,-4.426784 0,-4.426785 3.8337082,2.213392 z"
+     inkscape:randomized="0"
+     inkscape:rounded="0"
+     inkscape:flatsided="false"
+     sodipodi:arg2="1.0471976"
+     sodipodi:arg1="0"
+     sodipodi:r2="2.5558052"
+     sodipodi:r1="5.1116104"
+     sodipodi:cy="60.073212"
+     sodipodi:cx="11.55581"
+     sodipodi:sides="3"
+     id="path4504"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     sodipodi:type="star"
+     transform="matrix(0,1,-1,0,72.0074,71.7877)"
+     inkscape:transform-center-y="1.2779029" />
+  <path
+     inkscape:transform-center-y="-1.2779026"
+     transform="matrix(0,-1,-1,0,96,96)"
+     sodipodi:type="star"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path4506"
+     sodipodi:sides="3"
+     sodipodi:cx="11.55581"
+     sodipodi:cy="60.073212"
+     sodipodi:r1="5.1116104"
+     sodipodi:r2="2.5558052"
+     sodipodi:arg1="0"
+     sodipodi:arg2="1.0471976"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 16.66742,60.073212 -3.833708,2.213392 -3.8337072,2.213392 0,-4.426784 0,-4.426785 3.8337082,2.213392 z" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path4615-5"
+     d="m 171.82574,65.174193 16.34854,0 -8.17427,-13.348454 z"
+     style="fill:#fbb917;fill-opacity:1;fill-rule:evenodd;stroke:#fbb917;stroke-width:1.65161395;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 179,55 0,6 2,0 0,-6"
+     id="path4300"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 179,62 0,2 2,0 0,-2"
+     id="path4300-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:0.8;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.8"
+     d="M 99.994369,113.0221 102,114.98353 l 7,-6.9558 3,0.97227 2,-1 1,-2 0,-3 -3,3 -3,-3 3,-3 -3,0 -2,1 -1,2 0.99437,3.0221 z"
+     id="path4268"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccccc" />
+  <rect
+     id="rect4175-3-5"
+     height="16"
+     width="16"
+     y="4"
+     x="220"
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0" />
+  <path
+     style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 234,6 0,2 -5,5 0,5 -2,0 0,-5 -5,-5 0,-2"
+     id="path3546"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <g
+     transform="matrix(1.3333328,0,0,-1.5999992,-139.9999,127.19999)"
+     id="g4383-6">
+    <rect
+       id="rect4385-2"
+       height="1.2499905"
+       width="5.9999924"
+       y="12.625005"
+       x="198.00002"
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0"
+       x="198.00002"
+       y="15.125007"
+       width="7.4999928"
+       height="1.2499949"
+       id="rect4387-9" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0"
+       x="198.00002"
+       y="7.6250024"
+       width="2.9999909"
+       height="1.2499905"
+       id="rect4389-1-0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0"
+       x="198.00002"
+       y="10.125004"
+       width="4.4999919"
+       height="1.2499905"
+       id="rect4389-1-9" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.8;fill-rule:evenodd;stroke:none;stroke-width:0.68465352px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 207.00001,16.375004 0,-5.625005 -2.25,0 3,-3.1250014 3,3.1250014 -2.25,0 0,5.625005 -1.5,0"
+       id="path4402"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+  <path
+     style="fill:#ffffff;fill-opacity:0.8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 164,100 0,3 -6,6 0,7 -4,0 0,-7 -6,-6 0,-3"
+     id="path3546-2-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
+     id="svg_1-3"
+     height="16"
+     width="16"
+     y="28"
+     x="4" />
+  <path
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0"
+     id="path4402-5-7"
+     d="m 15,41 0,-7 -4,0 0,3 -5,-4 5,-4 0,3 6,0 0,9"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.68465352px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>
@@ -16,5 +16,8 @@ dns:
 tls:
  certificate_path: /certs/cert_public
  private_key_path: /certs/cert_private
+filtering:
+  safe_search:
+    enabled: false
 log:
  file: /logs/adguard
@@ -31,7 +31,7 @@ http {

    location / {
      root /app;
-      index login.html;
+      index override.html login.html;
      try_files $uri $uri/ =404;
    }
    location /adguard/ {
@@ -48,6 +48,7 @@ http {
    }
    location /pac {
      access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
      proxy_pass http://php;
    }
    location /tlgrm {
@@ -64,6 +65,38 @@ http {
      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/;
@@ -90,7 +123,7 @@ http {

  #   location / {
  #     root /app;
-  #     index login.html;
+  #     index override.html login.html;
  #     try_files $uri $uri/ =404;
  #   }
  #   location /adguard/ {
@@ -107,6 +140,7 @@ http {
  #   }
  #   location /pac {
  #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
  #     proxy_pass http://php;
  #   }
  #   location ~\.well-known {
@@ -124,6 +158,17 @@ http {
  #     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
@@ -31,7 +31,7 @@ http {

    location / {
      root /app;
-      index login.html;
+      index override.html login.html;
      try_files $uri $uri/ =404;
    }
    location /adguard/ {
@@ -48,6 +48,7 @@ http {
    }
    location /pac {
      access_log /logs/nginx_pac_access;
+      proxy_set_header Host $http_host;
      proxy_pass http://php;
    }
    location /tlgrm {
@@ -64,6 +65,38 @@ http {
      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/;
@@ -90,7 +123,7 @@ http {

  #   location / {
  #     root /app;
-  #     index login.html;
+  #     index override.html login.html;
  #     try_files $uri $uri/ =404;
  #   }
  #   location /adguard/ {
@@ -107,6 +140,7 @@ http {
  #   }
  #   location /pac {
  #     access_log /logs/nginx_pac_access;
+  #     proxy_set_header Host $http_host;
  #     proxy_pass http://php;
  #   }
  #   location ~\.well-known {
@@ -124,6 +158,17 @@ http {
  #     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
@@ -180,7 +180,7 @@ server-key = /certs/cert_private
 # the isolation was tested at. If you get random failures on worker processes, try
 # disabling that option and report the failures you, along with system and debugging
 # information at: https://gitlab.com/openconnect/ocserv/issues
-isolate-workers = true
+isolate-workers = false

 # A banner to be displayed on clients after connection
 #banner = "Welcome"
@@ -584,7 +584,7 @@ route = default
 # When set to true, all client's iroutes are made visible to all
 # connecting clients except for the ones offering them. This option
 # only makes sense if config-per-user is set.
-#expose-iroutes = true
+expose-iroutes = false

 # Groups that a client is allowed to select from.
 # A client may belong in multiple groups, and in certain use-cases
@@ -1,99 +1 @@
-{
-    "zapret": false,
-    "excludelist": {
-        "(?:v|w)ul(?:c|k)an": true,
-        "^\\d": true,
-        "^a\\w-": true,
-        "^admiral": true,
-        "^avtomaty": true,
-        "^azart": true,
-        "^azimob": true,
-        "^baltplay": true,
-        "a(?:s|z)ino": true,
-        "adrenalin": true,
-        "alco": true,
-        "bet": true,
-        "prostitut": true,
-        "zenit": true,
-        "zerkalo": true,
-        "777": true
-    },
-    "includelist": {},
-    "reverselist": {},
-    "subzoneslist": {
-        "3dn": false,
-        "3nx": true,
-        "akadns": true,
-        "appspot": true,
-        "azurewebsites": true,
-        "beget": true,
-        "berlogovo": true,
-        "biz": true,
-        "brightcove": true,
-        "cc": true,
-        "cloudfront": true,
-        "co": true,
-        "com": true,
-        "cu": true,
-        "ddns": true,
-        "deviantart": true,
-        "dn": true,
-        "dp": true,
-        "dyndns": true,
-        "edgecastcdn": true,
-        "edu": true,
-        "eu": true,
-        "fastly": true,
-        "force": true,
-        "github": true,
-        "google": true,
-        "googleusercontent": true,
-        "gov": true,
-        "herokuapp": true,
-        "hldns": true,
-        "ho": true,
-        "hopto": true,
-        "hwcdn": true,
-        "i": true,
-        "iboards": true,
-        "in": true,
-        "info": true,
-        "int": true,
-        "itch": true,
-        "keenetic": true,
-        "kiev": true,
-        "kirov": true,
-        "linode": true,
-        "livejournal": true,
-        "maryno": true,
-        "mil": true,
-        "msk": true,
-        "my1": true,
-        "mybb2": true,
-        "ne": true,
-        "net": true,
-        "netdna-ssl": true,
-        "nnov": true,
-        "notion": true,
-        "nov": true,
-        "od": true,
-        "org": true,
-        "pp": true,
-        "pximg": true,
-        "pythonanywhere": true,
-        "ru": true,
-        "scaleway": true,
-        "sl": true,
-        "sl-reverse": true,
-        "spb": true,
-        "tilda": true,
-        "trafficmanager": true,
-        "tut": true,
-        "u-stream": true,
-        "ucoz": true,
-        "v": true,
-        "vercel": true,
-        "wix": true,
-        "wixmp": true
-    }
-}
+{}
@@ -68,26 +68,26 @@
        {
            "flow": "xtls-rprx-vision",
            "packet_encoding": "",
-            "server": "",
+            "server": "~domain~",
            "server_port": 443,
            "tls": {
                "enabled": true,
                "insecure": false,
                "reality": {
                    "enabled": true,
-                    "public_key": "",
-                    "short_id": ""
+                    "public_key": "~public_key~",
+                    "short_id": "~short_id~"
                },
-                "server_name": "",
+                "server_name": "~server_name~",
                "utls": {
                    "enabled": true,
                    "fingerprint": "chrome"
                }
            },
-            "uuid": "",
+            "uuid": "~uid~",
            "type": "vless",
            "domain_strategy": "ipv4_only",
-            "tag": "proxy"
+            "tag": "~outbound~"
        },
        {
            "type": "direct",
@@ -113,7 +113,7 @@
            {
                "createruleset": [
                    {
-                        "name": "selfpac",
+                        "name": "pac",
                        "interval": "15s",
                        "rules": [
                            {
@@ -122,9 +122,68 @@
                        ]
                    }
                ],
-                "outbound": "proxy"
+                "outbound": "~domains_outbound~"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "package",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "package_name": "~package~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~app_outbound~"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "process",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "process_name": "~process~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~process_outbound~"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "block",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~block~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "block"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "warp",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~warp~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~outbound~"
+            },
+            {
+                "outbound": "direct"
            }
        ],
-        "final": "direct"
+        "final": "~final_outbound~"
    }
 }
@@ -11,6 +11,11 @@ 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;
+
    upstream other {
        server ng:443;
    }
@@ -30,7 +35,7 @@ stream {
    map_hash_bucket_size 128;
    map $ssl_preread_server_name $sni_name {
        #domain
-        www.microsoft.com reality;
+        telegram.org reality;
        #domain

        #ocserv
@@ -36,14 +36,14 @@
        }
    }],
    "outbounds": [{
-        "tag": "proxy",
+        "tag": "~outbound~",
        "protocol": "vless",
        "settings": {
            "vnext": [{
-                "address": "",
+                "address": "~domain~",
                "port": 443,
                "users": [{
-                    "id": "",
+                    "id": "~uid~",
                    "alterId": 0,
                    "email": "t@t.tt",
                    "security": "auto",
@@ -56,11 +56,11 @@
            "network": "tcp",
            "security": "reality",
            "realitySettings": {
-                "serverName": "",
+                "serverName": "~server_name~",
                "fingerprint": "chrome",
                "show": false,
-                "publicKey": "",
-                "shortId": "",
+                "publicKey": "~public_key~",
+                "shortId": "~short_id~",
                "spiderX": ""
            }
        },
@@ -84,7 +84,7 @@
        "domainStrategy": "AsIs",
        "rules": [{
            "type": "field",
-            "outboundTag": "proxy",
+            "outboundTag": "~outbound~",
            "domain": "~pac~"
        }, {
            "type": "field",
@@ -18,13 +18,13 @@
            "streamSettings": {
                "network": "tcp",
                "realitySettings": {
-                    "dest": "www.microsoft.com:443",
+                    "dest": "telegram.org:443",
                    "maxClientVer": "",
                    "maxTimeDiff": 0,
                    "minClientVer": "",
                    "privateKey": "",
                    "serverNames": [
-                        "www.microsoft.com"
+                        "telegram.org"
                    ],
                    "shortIds": [],
                    "show": false,
@@ -42,7 +42,8 @@
        }
    ],
    "log": {
-        "loglevel": "info"
+        "loglevel": "info",
+        "access": "/logs/xray"
    },
    "outbounds": [
        {
@@ -16,6 +16,7 @@ networks:
                - subnet: 10.10.1.0/24
 volumes:
    adguard:
+    warp:

 services:
    up:
@@ -28,12 +29,14 @@ 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
            - ./logs/:/logs/
        ports:
-            - 443:443
+            - 443:443/tcp
+            - 443:443/udp
        hostname: upstream
        container_name: upstream-${VER}
        depends_on:
@@ -93,7 +96,7 @@ services:
                ipv4_address: 10.10.1.2
        logging: *default-logging
    php:
-        image: mercurykd/vpnbot-php:1.5
+        image: mercurykd/vpnbot-php:1.6
        build:
            dockerfile: dockerfile/php.dockerfile
            args:
@@ -116,6 +119,7 @@ services:
            - ./update:/update
            - ./.git:/.git
            - ./singbox_windows:/singbox
+            - ./docker-compose.override.yml:/docker/compose
            - /var/run/docker.sock:/var/run/docker.sock:ro
        environment:
            IP: ${IP}
@@ -127,7 +131,7 @@ services:
              required: false
        hostname: php
        container_name: php-${VER}
-        restart: unless-stopped
+        # restart: unless-stopped
        stop_grace_period: 1s
        command: ["/bin/sh", "/start_php.sh"]
        working_dir: /app
@@ -143,7 +147,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:
@@ -191,7 +195,7 @@ services:
            - oc
            - np
    proxy:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
        build:
            dockerfile: dockerfile/shadowsocks.dockerfile
            args:
@@ -301,7 +305,7 @@ services:
                ipv4_address: 10.10.0.14
        logging: *default-logging
    ad:
-        image: mercurykd/vpnbot-ad:1.1
+        image: mercurykd/vpnbot-ad:1.2
        build:
            dockerfile: dockerfile/adguard.dockerfile
            args:
@@ -338,7 +342,7 @@ services:
        entrypoint: ["/bin/sh", "/start_ad.sh"]
        logging: *default-logging
    ss:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
        build:
            dockerfile: dockerfile/shadowsocks.dockerfile
            args:
@@ -399,7 +403,7 @@ services:
                ipv4_address: 10.10.0.8
        logging: *default-logging
    xr:
-        image: mercurykd/vpnbot-xr:1.2
+        image: mercurykd/vpnbot-xr:1.3
        build:
            dockerfile: dockerfile/xray.dockerfile
            args:
@@ -410,6 +414,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:
@@ -509,6 +514,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:
@@ -32,4 +32,6 @@ RUN apk add --no-cache --update php81 \
    && 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"
+RUN apk add openssh \
+    && mkdir /root/.ssh
+    ENV ENV="/root/.ashrc"
@@ -2,16 +2,16 @@ ARG image
 FROM $image
 RUN apk add openssh git xz \
    && mkdir /root/.ssh \
-    && wget https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.15.3/shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
-    && tar -xf shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
-    && wget https://github.com/teddysun/v2ray-plugin/releases/download/v5.7.0/v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
-    && tar -xf v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
+    && wget -O shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz $(wget -q -O - https://api.github.com/repos/shadowsocks/shadowsocks-rust/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep '.x86_64-unknown-linux-musl.tar.xz$') \
+    && tar -xf shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz \
+    && wget -O v2ray-plugin-linux-amd64.tar.gz $(wget -q -O - https://api.github.com/repos/teddysun/v2ray-plugin/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'v2ray-plugin-linux-amd64') \
+    && tar -xf v2ray-plugin-linux-amd64.tar.gz \
    && mv sslocal /usr/bin/ \
    && mv ssserver /usr/bin/ \
    && mv ssmanager /usr/bin/ \
    && mv ssservice /usr/bin/ \
    && mv ssurl /usr/bin/ \
    && mv v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \
-    && rm v2ray-plugin-linux-amd64-v5.7.0.tar.gz\
-    && rm shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz
+    && rm v2ray-plugin-linux-amd64.tar.gz \
+    && rm shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz
 ENV ENV="/root/.ashrc"
@@ -1,6 +1,8 @@
 ARG image
 FROM $image
-RUN apk add --no-cache --virtual .build-deps alpine-sdk git go \
+COPY --from=golang:1.22.3-alpine /usr/local/go/ /usr/local/go/
+ENV PATH="/usr/local/go/bin:${PATH}"
+RUN apk add --no-cache --virtual .build-deps alpine-sdk git \
    && apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq bash htop \
    && git clone https://github.com/amnezia-vpn/amneziawg-go \
    && git clone https://github.com/amnezia-vpn/amneziawg-tools.git \
@@ -2,7 +2,7 @@ ARG image
 FROM $image
 RUN apk add openssh openssl jq \
    && mkdir /root/.ssh \
-    && wget https://github.com/XTLS/Xray-core/releases/download/v1.8.10/Xray-linux-64.zip \
+    && wget -O Xray-linux-64.zip $(wget -q -O - https://api.github.com/repos/XTLS/Xray-core/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'Xray-linux-64.zip$') \
    && unzip Xray-linux-64.zip \
    && mv xray /usr/bin/ \
    && rm Xray-linux-64.zip \
@@ -1,9 +1,10 @@
 b:
 	docker compose build
 u: # запуск контейнеров
+	$(eval IP := $(shell curl -s -t 1 2ip.io || curl -s -t 1 ipinfo.io/ip || curl -s -t 1 ifconfig.me))
 	bash ./update/update.sh &
-	touch ./override.env
-	IP=$(shell curl https://ipinfo.io/ip) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
+	touch ./override.env ./docker-compose.override.yml
+	IP=$(IP) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
 d: # остановка контейнеров
 	-kill -9 $(shell cat ./update/update_pid) > /dev/null
 	docker compose down --remove-orphans
@@ -10,13 +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-compose-plugin
+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
@@ -2,8 +2,11 @@ rm /ssh/key*
 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
-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
-unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
+if [[ -f "/start" && -f "/ssh/key.pub" && -s "/ssh/key.pub" ]]; then
+    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
+    unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
+else
+    exit 1;
+fi
@@ -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
@@ -1,14 +1,21 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-warp-svc > /dev/null &
-sleep 3
-warp-cli --accept-tos registration new
+off=$(cat /config/pac.json | jq -r .warpoff)
 key=$(cat /config/pac.json | jq -r .warp)
-if [ ! -z "$key" ]
+if [ "$off" == 'null' ]
 then
-    warp-cli --accept-tos registration license $key
+    warp-svc > /dev/null &
+    sleep 3
+    if [ ! -f /var/lib/cloudflare-warp/conf.json ]
+    then
+        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
 fi
-warp-cli --accept-tos mode proxy
-warp-cli --accept-tos connect
 socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000
@@ -6,7 +6,7 @@ After=docker.service
 Type=oneshot
 RemainAfterExit=yes
 WorkingDirectory=path
-ExecStartPre=/bin/sh -c "touch ./override.env"
+ExecStartPre=/bin/sh -c "touch ./override.env ./docker-compose.override.yml"
 ExecStart=/bin/sh -c "IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate"
 ExecStartPost=/bin/sh -c "bash ./update/update.sh &"
 ExecStop=/bin/sh -c "docker compose down --remove-orphans"
@@ -1,2 +0,0 @@
-winsw3.exe install
-pause
@@ -1,2 +0,0 @@
-winsw3.exe stop
-winsw3.exe start
@@ -1 +0,0 @@
-winsw3.exe start
@@ -1,2 +0,0 @@
-winsw3.exe status
-pause
@@ -1 +0,0 @@
-winsw3.exe stop
@@ -1,2 +0,0 @@
-winsw3.exe uninstall
-pause
@@ -12,19 +12,22 @@ do
        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": "останавливаю бота"/')"
        docker compose down --remove-orphans
-        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 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": "скачиваю обновление"/')"
-        git fetch
-        if [[ -n "$branch" ]]
+        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": "меняю ветку"/')"
-            git checkout -t origin/$branch || git checkout $branch
+            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 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": "скачиваю обновление"/')"
+            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": "меняю ветку"/')"
+                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": "применяю обновления"/')"
+            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": "применяю обновления"/')"
-        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
@@ -1,3 +1,175 @@
+14.11.2024 v1.99
+- анализ логов и бан айпишников
+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
+- отключение портов контейнеров из меню
+- перезагрузка из меню
+04.11.2024 v1.94
+- xray: возможность перемещать и переименовывать outbound заполняемый ботом
+04.11.2024 v1.93
+- adguardHome: сброс настроек
+- adguardHome: статус работоспособности
+- xray: выбор outbound для списков
+- xray: выбор outbound для final
+- xray: дефолтный домен reality microsoft.com заменен на telegram.org
+- xray: создание шаблона путем копирования оригинала
+- xray: редактирование шаблона прямо в боте
+30.10.2024 v1.92
+- возможность скачать origin шаблон
+30.10.2024 v1.91
+- кнопка nip.io для быстрой смены домена
+27.10.2024 v1.90
+- очередной фикс запуска warp после апдейта
+- правки фраз меню
+26.10.2024 v1.89
+- xray rulesset: фикс меню при отсутствующих правилах
+26.10.2024 v1.88
+- xray rulesset: дублирование кнопок текстом
+- singbox 1.10.1 для windows x64
+- фикс с включенным warp после апдейта
+- фикс с нерабочей кнопкой апдейта, обновится можно через /autoupdate если поймали не рабочую кнопку апдейта
+25.10.2024 v1.87
+- xray: в routes добавлен раздел proxy - зеркало раздела Pac
+25.10.2024 v1.86
+- фикс не срабатывания автобэкапа во время старта
+- adguard: вывод списка разрешенных клиентов
+- adguard: кнопка заполнения разрешенных клиентов - собирает все clientId со всех контейнеров
+- adguard: вывод статуса безопасного поиска
+- warp: при выключении удаляется регистрация deviceid
+24.10.2024 v1.85
+- фикс удаления состояния warp после рестарта
+- возможность перезаписать фразы меню бота через app/override.php
+24.10.2024 v1.84
+- фикс показа ссылки для openconnect
+24.10.2024 v1.83
+- фикс ошибок доступа контейнеров при автообновлении
+23.10.2024 v1.82
+- фикс автобэкапа
+23.10.2024 v1.81
+- фикс краша wireguard после апдейта
+23.10.2024 v1.80
+- фикс пустых правил для singbox
+23.10.2024 v1.79
+- улучшение процесса обновления
+23.10.2024 v1.78
+- фикс двойного импорта при обновлении, когда админов больше одного
+- рестарт бота сбрасывает очередь сообщений от телеграма
+- при старте статус крона не показывается, т.к он еще не успел запуститься
+23.10.2024 v1.77
+- вывод статуса cron
+- фикс с отправкой бэкапа при спецсимволах в названии бота
+- проверка формата времени в автобэкапе
+22.10.2024 v1.76
+- улучшение определения ip бота при старте
+22.10.2024 v1.75
+- openconnect: isolate-workers = false
+21.10.2024 v1.74
+- openconnect: expose-iroutes on/off
+21.10.2024 v1.73
+- openconnect: ограничение контейнера по цпу и памяти
+21.10.2024 v1.72
+- xray: теги в кастомных шаблонах
+21.10.2024 v1.71
+- фикс установки nip.io  при первом запуске
+- фикс инициализации вебпанели adguardHome при первом запуске
+14.10.2024 v1.70
+- xray route: учет регистра в process_name, package_name
+14.10.2024 v1.69
+- xray route: добавлен список process_name
+14.10.2024 v1.68
+- singbox template: package_name -> ruleset
+13.10.2024 v1.67
+- sslip.io -> nip.io
+13.10.2024 v1.66
+- singbox template: изменен порядок правил маршрутизации для package_name
+10.10.2024 v1.65.1
+- фикс создания архива windows service singbox 2
+09.10.2024 v1.65
+- фикс создания архива windows service singbox
+06.10.2024 v1.64.1
+- добавление html заглушки через меню
+06.10.2024 v1.64
+- возможность установить свою html-заглушку
+06.10.2024 v1.63
+- приоритет правила block над остальными в стандартном шаблоне sing-box
+30.09.2024 v1.62
+- импорт профиля xray в karing
+30.09.2024 v1.61.1
+- фикс удаления ключа варпа через ноль
+29.09.2024 v1.61
+- включение/отключение процесса warp
+29.09.2024 v1.60
+- ускорение сборки архива sing-box windows
+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
+- cdn для xray
+17.09.2024 v1.55
+- возможность подменить домен в ссылках на конфиги
+16.09.2024 v1.54.2
+- фикс нэйминга клиентов в adguardHome: замена на uuid
+16.09.2024 v1.54.1
+- фикс нэйминга клиентов в adguardHome
+16.09.2024 v1.54
+- ~dns~ в шаблоне сингбокса подменяятся на https://DOMAIN/dns-query/USERNAME
+- при добавлении пользователя в XRAY, он также добавляется в AdguardHome как сохраненый клиент
+10.09.2024 v1.53
+- домен в endpoint для амнезии
+10.09.2024 v1.52
+- фикс спамящего уведомления о просрочке сертификата
+10.09.2024 v1.51
+- фикс ipinfo
+08.09.2024 v1.50
+- fix import with transport
+08.09.2024 v1.49
+- fix add user xray with transport
+08.09.2024 v1.48
+- fix change xray transport, save private key xray
+08.09.2024 v1.47
+- fix websocket -> reality
+03.09.2024 v1.46.2
+- fix link v2ray
+03.09.2024 v1.46.1
+- fix import
+- fix websocket domain
+03.09.2024 v1.46
+- возможность добавить кастомный поддомен для Letsencrypt
+03.09.2024 v1.45
+- выбор транспорта reality/websocket
+26.08.2024 v1.44
+- qr для xtls
+- фикс действий на элементом списков
+21.08.2024 v1.43
+- singbox:поддержка кастомных outbound для ruleset
+16.08.2024 v1.42.1
+- фикс добавления рулсетов с длинными урл
+16.08.2024 v1.42
+- добавлена возможность сохранять/восстанавливать список доменов/правил маршрутизации
+- изменена ссылка на сингбокс-конфиг для совместимости с клиентом сингбокса (фикс импорта в sing-box)
+- sing-box: добавлена возможность добавлять свои packagename (outbound:proxy)
+- sing-box: добавлена возможность добавлять свои ruleset с указанием outbound и временем обновления
+- sing-box: списки доменов pac/warp/block трансформируются в собственный ruleset и присутствуют в шаблоне origin всегда, даже если они пустые. это дает возможность не ждать перезагрузки конфига клиентом
+09.08.2024 v1.41.1
+- фикс для "удалить все" в списках доменов
+06.08.2024 v1.41
+- возможность очистить РАС лист
+03.08.2024 v1.40
+- возможность менять MTU для Wireguard/Amnezia
+- раздельный qr для AmneziaWG + AmneziaVPN
+18.05.2024 v1.39
+- изменен автобэкап
 04.05.2024 v1.38
 - changelog в сообщении новой версии
 04.05.2024 v1.37.1
Author	SHA1	Message	Date
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
mercury	3d53691106	update version	2024-11-11 16:21:18 +04:00
mercury	5f38e73d6b	fix clientId accounting when filling out the white list	2024-11-11 16:18:29 +04:00
mercury	bb3a807869	stream access log	2024-11-11 14:09:27 +04:00
mercury	3ed487cbce	xray logs	2024-11-11 11:46:11 +04:00
mercury	1d69729bf1	update version	2024-11-09 21:35:43 +04:00
mercury	387f1618b1	~ip~ tag for templates	2024-11-06 23:19:51 +04:00
mercury	9da11e2b35	fix adguard password	2024-11-06 23:06:06 +04:00
mercury	0b95c75005	timeout for check status adguard	2024-11-06 22:35:32 +04:00
mercury	62c4314beb	docker installation	2024-11-05 18:35:31 +04:00
mercury	1dfb3da089	update version	2024-11-04 19:44:47 +04:00
mercury	7358730864	fix update script	2024-11-04 19:37:12 +04:00
mercury	57cd1019f5	fix restart	2024-11-04 19:34:41 +04:00
mercury	dfbcd67f83	restart button	2024-11-04 19:23:15 +04:00
mercury	5016c6bda3	ability to enable/disable ports	2024-11-04 19:06:42 +04:00
mercury	bc3914c3b9	json beautifier when saving template	2024-11-04 17:33:15 +04:00
mercury	4675371f19	update version	2024-11-04 11:50:10 +04:00
mercury	6efe31d404	you can change the position and name of the outbound, filled in by the bot	2024-11-04 01:14:55 +04:00
mercury	700bb96706	update version	2024-11-04 00:19:17 +04:00
mercury	30ae9ba2ea	ability to create and edit templates directly in telegram	2024-11-04 00:06:12 +04:00
mercury	4e92d96812	change the default domain for reality	2024-11-03 23:13:56 +04:00
mercury	bd7a75d6c9	select outbound for rule	2024-11-03 23:12:00 +04:00
mercury	8c666fd284	fix cyclic installation of ssl with an empty domain	2024-11-02 21:48:57 +04:00
mercury	442fbe5105	adguardhome status and reset button	2024-11-02 21:47:45 +04:00
mercury	53392f4cb2	метки для шаблонов	2024-10-31 00:15:00 +04:00
mercury	4ef0de6e1c	ability to download origin template	2024-10-30 23:16:17 +04:00
mercury	1cf24407c0	nip.io button to quickly change domain	2024-10-30 22:39:55 +04:00
mercury	d3470bd8ea	update version	2024-10-27 01:53:55 +04:00
mercury	1fcddf49e3	fixup! fixup! fix warp update	2024-10-27 01:42:25 +04:00
mercury	a0d9bada2b	fixup! fix warp update	2024-10-27 01:32:13 +04:00
mercury	32109c4526	fix warp update	2024-10-27 01:12:29 +04:00
mercury	ca37736cd5	fix menu rulesset with empty rules	2024-10-26 23:14:03 +04:00
mercury	1c4fff50d1	fix menu warp after update	2024-10-26 22:47:43 +04:00
mercury	6ffb4d0a79	update version	2024-10-26 22:41:07 +04:00
mercury	394062cbe0	fix warp off after update	2024-10-26 22:29:07 +04:00
mercury	dd8897575f	fix warp off after update	2024-10-26 22:18:36 +04:00
mercury	9ab05de320	fix update menu	2024-10-26 21:58:10 +04:00
legiz-ru	71f7db5bac	update singbox 1.10.1 windows x64 (#26 )	2024-10-26 19:47:15 +04:00
mercury	237da68f14	duplicate the rulesset list in the message	2024-10-26 14:44:06 +04:00
mercury	961ebf3423	xray->routes->proxy <=> Pac	2024-10-25 21:02:58 +04:00
mercury	ddcaea751f	update version	2024-10-25 18:43:32 +04:00
mercury	ce8cdac7c7	Fix for auto-backup not triggering on the first tick	2024-10-25 18:36:54 +04:00
mercury	00aae6c2f7	adguard: list of allowed clients	2024-10-25 18:12:05 +04:00
mercury	89c0139ef6	show safe search status	2024-10-25 17:38:50 +04:00
mercury	c57053c8a0	copyable warp key	2024-10-25 17:14:52 +04:00
mercury	3cc16469ff	warp registration delete before off	2024-10-25 17:11:46 +04:00
mercury	e06544b00f	update version	2024-10-24 23:45:25 +04:00
mercury	c5b7e1ffdc	warp registration fix	2024-10-24 23:15:44 +04:00
mercury	7d21937f04	ability to override i18n	2024-10-24 22:32:16 +04:00
mercury	16138648ca	fix openconnect link	2024-10-24 21:54:37 +04:00
mercury	ced10f22fa	update version	2024-10-24 00:01:51 +04:00
mercury	18a4ee39fb	improve selfupdate	2024-10-23 23:59:32 +04:00
mercury	4f4777b5ef	improve selfupdate	2024-10-23 23:56:50 +04:00
mercury	dee90b1f4f	improve selfupdate	2024-10-23 23:53:58 +04:00
mercury	01571f50e6	improve selfupdate	2024-10-23 23:29:56 +04:00
mercury	4998893234	fix autobackup	2024-10-23 21:35:17 +04:00
mercury	95f92791b1	update version	2024-10-23 10:08:32 +04:00
mercury	cedfb66ca0	fix autoupdate wireguard crash	2024-10-23 10:05:06 +04:00
mercury	6215836926	fix empty route rules for singbox	2024-10-23 03:01:10 +04:00
mercury	842d76261a	update version	2024-10-23 02:45:17 +04:00
mercury	4c63ae669a	improve selfupdate	2024-10-23 02:32:19 +04:00
mercury	bba1ec9e17	improve selfupdate	2024-10-23 02:25:00 +04:00
mercury	a798df0fd3	improve selfupdate	2024-10-23 02:20:16 +04:00
mercury	d225e7c039	fix double import after update	2024-10-23 02:06:35 +04:00
mercury	3b9b930b48	- autobackup check formate - cron status - fix with sending a backup when there are special characters in the bot name	2024-10-23 01:24:36 +04:00
mercury	bd17e5cd14	improve ip detect on start	2024-10-22 23:55:05 +04:00
mercury	c3975549db	openconnect: isolate-workers = false	2024-10-22 22:42:20 +04:00
mercury	3087bee82d	openconnect: expose-iroutes on/off	2024-10-21 22:19:13 +04:00
mercury	96fbf5a3c3	openconnect: limit cpu and memory	2024-10-21 21:09:50 +04:00
mercury	b32bd960fa	xray: tags for templates	2024-10-21 02:29:19 +04:00
mercury	ba0895ea4c	fix start menu	2024-10-21 01:28:15 +04:00
mercury	68e6e5919d	fixes for first launch	2024-10-21 01:07:05 +04:00
mercury	28c5b9d506	xray route: учет регистра в process_name, package_name	2024-10-14 09:47:19 +04:00
mercury	9cc42fd34a	xray route: добавлен список process_name	2024-10-14 01:11:21 +04:00
mercury	5eef9581c7	singbox template: package_name -> ruleset	2024-10-14 00:38:58 +04:00
mercury	1d9d992361	sslip.io -> nip.io	2024-10-14 00:00:25 +04:00
mercury	e1f14d85e0	порядок правил маршрутизации для singbox	2024-10-13 23:58:02 +04:00
mercury	dc65e65e20	fix create windows service box 2	2024-10-10 00:19:59 +04:00
mercury	486a2c5959	fix create windows service box	2024-10-09 21:03:15 +04:00
mercury	39643bf681	add html fake from settings menu	2024-10-06 23:19:05 +04:00
mercury	5f1fc6d912	override html mock	2024-10-06 21:04:13 +04:00
mercury	0538d04397	sing-box template: block rule first	2024-10-06 20:49:24 +04:00
mercury	af9933676d	karing import url	2024-09-30 17:13:32 +04:00
mercury	7bfebe8096	fix unset warp key	2024-09-30 09:58:48 +04:00
mercury	ae61a38dbc	on/off warp-svc	2024-09-29 16:10:16 +04:00
mercury	e727f6552c	create singbox archive improve	2024-09-29 13:48:26 +04:00
mercury	cfd500d48a	update version	2024-09-23 23:44:32 +04:00
mercury	ff87ee1055	latest docker compose	2024-09-23 23:11:02 +04:00
mercury	3375293be5	fix update start	2024-09-22 21:05:48 +04:00
mercury	6e5f198e23	switch endpoint for wg/amnezia	2024-09-22 14:31:10 +04:00
mercury	b10aaff459	fix domain for cdn	2024-09-22 01:06:02 +04:00
mercury	3271561418	update version	2024-09-19 13:44:35 +04:00
mercury	295ee6f2aa	fix nginx.conf init	2024-09-19 12:11:05 +04:00
mercury	7ce7c56c1b	domain for links -> cdn for xray	2024-09-19 12:02:51 +04:00
mercury	dca34de723	fix config menu	2024-09-17 20:36:51 +04:00
mercury	eb1ad21c88	domain for links	2024-09-17 20:15:34 +04:00
mercury	a3ca7d9ed8	fix naming clients AdgHome + xray	2024-09-16 13:07:32 +04:00
mercury	60ba3cf15c	fix name clients AdguardHome	2024-09-16 12:17:20 +04:00
mercury	cd8bcbe05a	singbox: tls->https+user xray: add user to AdH	2024-09-16 00:06:57 +04:00
mercury	6cc05c88e7	autoupdate command	2024-09-15 01:16:03 +04:00
mercury	795c357897	domain for amnezia	2024-09-15 00:50:46 +04:00
mercury	e172868f39	fix checkcert notify	2024-09-10 15:48:55 +04:00
mercury	4ef38775b0	update version	2024-09-10 15:30:59 +04:00
mercury	abdb4d791a	fix ipinfo case	2024-09-10 15:27:34 +04:00
mercury	6948239144	xray subscriptions: get['cdn'] -> domain without dns	2024-09-08 21:22:38 +04:00
mercury	ff0fd177c7	xray subscriptions: get['cdn'] -> domain	2024-09-08 19:45:02 +04:00
mercury	28e66d46fd	fix import with transport	2024-09-08 16:22:17 +04:00
mercury	edee9c78c5	fix add user xray with transport	2024-09-08 14:54:43 +04:00
mercury	6ad8b3aa92	update version	2024-09-08 12:50:21 +04:00
mercury	31f1825d37	fix change transport	2024-09-08 12:40:51 +04:00
mercury	10d84da53e	fix websocket -> reality	2024-09-08 00:58:37 +04:00
mercury	c7cc0f31ad	fix v2ray links	2024-09-03 19:23:38 +04:00
mercury	e3ddb642d7	fix import, fix ws transport	2024-09-03 18:27:26 +04:00
mercury	589823e45d	custom subdomain	2024-09-03 13:15:34 +04:00
mercury	0364188fe8	chat link	2024-09-03 10:48:15 +04:00
mercury	72edcc4757	websocket transport for xray	2024-09-03 10:19:00 +04:00
mercury	5988c4fcee	display warp+ key	2024-08-27 13:46:08 +04:00
mercury	a82147eeda	update version	2024-08-26 23:23:09 +04:00
mercury	6bd21d06c0	fix list actions	2024-08-26 23:19:31 +04:00
mercury	3416cda826	qr for singbox	2024-08-25 23:30:19 +04:00
mercury	2e40daf0c4	update version	2024-08-21 23:04:58 +04:00
mercury	9c40b04392	custom outbound for ruleset	2024-08-18 20:01:53 +04:00
mercury	1217ea7a09	fix empty packagelist	2024-08-18 11:54:12 +04:00
mercury	7f6d462f22	fix name for short link vless	2024-08-18 02:11:05 +04:00
mercury	47876ecdb4	rule package_name separately	2024-08-18 02:00:09 +04:00
mercury	66f03709fc	Merge branch 'master' into dev	2024-08-16 22:27:14 +04:00
mercury	42aafc6427	update version	2024-08-16 22:26:42 +04:00
mercury	1674f6929e	fix ruleset list key	2024-08-16 22:24:23 +04:00
mercury	5791cabfb5	update version	2024-08-16 12:12:07 +04:00
mercury	49d2d21f41	fix changelist	2024-08-16 11:41:42 +04:00
mercury	5263de514e	fix naming ruleset	2024-08-16 11:24:51 +04:00
mercury	9da810ba3d	fix empty rules route	2024-08-16 02:21:29 +04:00
mercury	b663eca445	routes for sinbox	2024-08-16 02:08:44 +04:00
mercury	f8f95e22ac	backup for domain lists	2024-08-15 10:40:20 +04:00
mercury	30f0f8c5f0	fix selfpac update	2024-08-15 01:07:31 +04:00
mercury	741f402ca1	fix singbox import	2024-08-15 00:13:41 +04:00
mercury	ef3d40c098	update version	2024-08-09 23:59:48 +04:00
mercury	ded85fb79f	fix "delete all"	2024-08-09 23:56:57 +04:00
mercury	b5ca5fbf93	mirror	2024-08-08 17:11:26 +04:00
mercury	570420274e	improve updatepac	2024-08-08 12:45:44 +04:00
mercury	baaf0e2d01	clear pac list button	2024-08-06 21:58:08 +04:00
mercury	be8bec6a7d	fix ocserv pass	2024-08-04 11:51:01 +04:00
mercury	acaec83877	update version	2024-08-03 11:19:00 +04:00
mercury	8cf6c512cb	extended qr for wireguard	2024-08-03 11:14:53 +04:00
mercury	880a8de7e5	set mtu for wg	2024-08-03 10:39:15 +04:00
mercury	9662fc9d55	fix autobackup hint	2024-07-07 15:35:43 +04:00
mercury	561bcb7023	Merge branch 'dev'	2024-06-05 10:37:39 +04:00
mercury	9d7c735f79	Merge branch 'dev' of github.com:mercurykd/vpnbot into dev	2024-06-05 10:36:42 +04:00
mercury	8091eb4971	fix go version	2024-06-05 10:35:15 +04:00
mercury	967353bcd6	Merge branch 'dev'	2024-05-22 17:21:07 +04:00
mercury	9f218c9f32	chmod +x *.sh	2024-05-22 17:19:32 +04:00
mercury	6a6bd3a4d2	delete debug	2024-05-19 21:26:56 +04:00
mercury	bc8b0ff033	Merge branch 'dev'	2024-05-18 17:05:44 +04:00
mercury	624713347a	change autobackup	2024-05-18 17:00:04 +04:00
mercury	52738c0491	update version xray, shadowsocks	2024-05-17 12:56:56 +04:00
runalsh	277b00da87	Remove absolute versions for shadowsocks.dockerfile (#15 ) * added sing-box from repo (#12) * edge repo for sing-box (#13) * added sing-box from repo * add testing repo for sing-box * Revert "added sing-box from repo (#12)" This reverts commit `256e43352a`. * Revert "edge repo for sing-box (#13)" This reverts commit `bb1ac60acc`. * Update shadowsocks.dockerfile --------- Co-authored-by: mercury <mercury.kd@gmail.com>	2024-05-17 12:47:28 +04:00
runalsh	455b9cea07	Remove absolute versions for xray.dockerfile (#16 ) * added sing-box from repo (#12) * edge repo for sing-box (#13) * added sing-box from repo * add testing repo for sing-box * Revert "added sing-box from repo (#12)" This reverts commit `256e43352a`. * Revert "edge repo for sing-box (#13)" This reverts commit `bb1ac60acc`. * Update xray.dockerfile --------- Co-authored-by: mercury <mercury.kd@gmail.com>	2024-05-17 12:46:57 +04:00
mercury	6017bc4008	Merge branch 'dev'	2024-05-04 13:00:53 +04:00
mercury	0c3a6cc90e	Merge branch 'dev'	2024-05-01 18:42:24 +04:00
mercury	c0750c930a	Merge branch 'dev'	2024-05-01 17:53:13 +04:00
mercury	45e1455d48	Revert "edge repo for sing-box (#13 )" This reverts commit `bb1ac60acc`.	2024-04-29 23:13:47 +04:00
mercury	7582dc50c2	Revert "added sing-box from repo (#12 )" This reverts commit `256e43352a`.	2024-04-29 23:13:27 +04:00
runalsh	bb1ac60acc	edge repo for sing-box (#13 ) * added sing-box from repo * add testing repo for sing-box	2024-04-29 20:48:25 +04:00
runalsh	256e43352a	added sing-box from repo (#12 )	2024-04-29 16:06:52 +04:00