Merge branch 'master' into singbox

.gitignore

@@ -19,5 +19,4 @@ mirror/.env
 update/*
 !update/update.sh
 
-override.env
+override.env
-override.html

app/cron.php

@@ -7,4 +7,5 @@ require __DIR__ . '/bot.php';
 require __DIR__ . '/config.php';
 require __DIR__ . '/i18n.php';
 
-(new Bot($c['key'], $i))->cron();
+$bot = new Bot($c['key'], $i);
+$bot->cron();

app/i18n.php

@@ -262,8 +262,8 @@ $i = [
         'ru' => 'очистить',
     ],
     'xray'  => [
-        'en' => 'Xray',
+        'en' => 'Sing-box',
-        'ru' => 'Xray',
+        'ru' => 'Sing-box',
     ],
     'geodb'  => [
         'en' => 'GeoIp/GeoSite',
@@ -337,12 +337,4 @@ $i = [
         'en' => '🟢 have updates',
         'ru' => '🟢 есть обновления',
     ],
-    'fake html'  => [
-        'en' => 'fake html',
-        'ru' => 'фейк заглушка',
-    ],
-    'expose-iroutes'  => [
-        'en' => 'expose-iroutes',
-        'ru' => 'изоляция клиентов',
-    ],
 ];

app/init.php

@@ -10,9 +10,8 @@ if ($c['debug']) {
 }
 
 $bot = new Bot($c['key'], $i);
-$bot->setwebhook();
-$bot->selfUpdate();
-$bot->adguardCheckPswd();
 $bot->adguardProtect();
-$bot->syncPortClients();
+$bot->adguardCheckPswd();
 $bot->setcommands();
+$bot->syncPortClients();
+$bot->setwebhook();

app/service.php

@@ -12,6 +12,32 @@ 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->restartTG();
 $bot->sslip();
 $bot->cleanDocker();

config/nginx.conf

@@ -2,7 +2,6 @@ user  nginx;
 worker_processes  auto;
 
 error_log  /logs/nginx_error;
-pid        /var/run/nginx.pid;
 
 events {
     worker_connections  1024;
@@ -22,8 +21,8 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 10.10.0.2:80 default_server;
+    listen 80 default_server;
-    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
+    listen 443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
@@ -31,7 +30,7 @@ http {
 
     location / {
       root /app;
-      index override.html login.html;
+      index login.html;
       try_files $uri $uri/ =404;
     }
     location /adguard/ {
@@ -48,7 +47,6 @@ http {
     }
     location /pac {
       access_log /logs/nginx_pac_access;
-      proxy_set_header Host $http_host;
       proxy_pass http://php;
     }
     location /tlgrm {
@@ -65,38 +63,6 @@ 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/;
@@ -108,12 +74,11 @@ http {
 
 #-domain
   # server {
-  #   listen 10.10.0.2:80;
+  #   listen 80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 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
@@ -123,7 +88,7 @@ http {
 
   #   location / {
   #     root /app;
-  #     index override.html login.html;
+  #     index login.html;
   #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
@@ -140,7 +105,6 @@ http {
   #   }
   #   location /pac {
   #     access_log /logs/nginx_pac_access;
-  #     proxy_set_header Host $http_host;
   #     proxy_pass http://php;
   #   }
   #   location ~\.well-known {
@@ -158,17 +122,6 @@ 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

config/nginx_default.conf

@@ -2,7 +2,6 @@ user  nginx;
 worker_processes  auto;
 
 error_log  /logs/nginx_error;
-pid        /var/run/nginx.pid;
 
 events {
     worker_connections  1024;
@@ -22,8 +21,8 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 10.10.0.2:80 default_server;
+    listen 80 default_server;
-    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
+    listen 443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
@@ -31,7 +30,7 @@ http {
 
     location / {
       root /app;
-      index override.html login.html;
+      index login.html;
       try_files $uri $uri/ =404;
     }
     location /adguard/ {
@@ -48,7 +47,6 @@ http {
     }
     location /pac {
       access_log /logs/nginx_pac_access;
-      proxy_set_header Host $http_host;
       proxy_pass http://php;
     }
     location /tlgrm {
@@ -65,38 +63,6 @@ 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/;
@@ -108,12 +74,11 @@ http {
 
 #-domain
   # server {
-  #   listen 10.10.0.2:80;
+  #   listen 80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 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
@@ -123,7 +88,7 @@ http {
 
   #   location / {
   #     root /app;
-  #     index override.html login.html;
+  #     index login.html;
   #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
@@ -140,7 +105,6 @@ http {
   #   }
   #   location /pac {
   #     access_log /logs/nginx_pac_access;
-  #     proxy_set_header Host $http_host;
   #     proxy_pass http://php;
   #   }
   #   location ~\.well-known {
@@ -158,17 +122,6 @@ 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

config/ocserv.conf

@@ -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 = false
+isolate-workers = true
 
 # 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 = false
+#expose-iroutes = true
 
 # Groups that a client is allowed to select from.
 # A client may belong in multiple groups, and in certain use-cases

config/pac.json

@@ -1 +1,3 @@
-{}
+{
+    "includelist": []
+}

config/sing.json

@@ -54,54 +54,10 @@
                 "detour": "direct"
             }
         ],
-        "rules": [
-            {
-                "outbound": "any",
-                "server": "dns-direct",
-                "disable_cache": false
-            }
-        ],
         "strategy": "ipv4_only",
         "independent_cache": true
     },
-    "outbounds": [
+    "outbounds": [],
-        {
-            "flow": "xtls-rprx-vision",
-            "packet_encoding": "",
-            "server": "",
-            "server_port": 443,
-            "tls": {
-                "enabled": true,
-                "insecure": false,
-                "reality": {
-                    "enabled": true,
-                    "public_key": "",
-                    "short_id": ""
-                },
-                "server_name": "",
-                "utls": {
-                    "enabled": true,
-                    "fingerprint": "chrome"
-                }
-            },
-            "uuid": "",
-            "type": "vless",
-            "domain_strategy": "ipv4_only",
-            "tag": "proxy"
-        },
-        {
-            "type": "direct",
-            "tag": "direct"
-        },
-        {
-            "type": "block",
-            "tag": "block"
-        },
-        {
-            "type": "dns",
-            "tag": "dns-out"
-        }
-    ],
     "route": {
         "auto_detect_interface": true,
         "override_android_vpn": true,
@@ -110,48 +66,6 @@
                 "protocol": "dns",
                 "outbound": "dns-out"
             },
-            {
-                "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": [
                     {
@@ -175,6 +89,20 @@
                 ],
                 "outbound": "proxy"
             },
+            {
+                "createruleset": [
+                    {
+                        "name": "block",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~block~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "block"
+            },
             {
                 "outbound": "direct"
             }

config/singbox.json

@@ -0,0 +1,26 @@
+{
+    "inbounds": [],
+    "log": {
+        "level": "info"
+    },
+    "outbounds": [
+        {
+            "type": "direct",
+            "tag": "direct"
+        },
+        {
+            "type": "block",
+            "tag": "block"
+        },
+        {
+            "type": "socks",
+            "tag": "warp",
+            "server": "10.10.0.13",
+            "server_port": 4000
+        }
+    ],
+    "route" : {
+        "rules": [],
+        "final": "direct"
+    }
+}

config/upstream.conf

@@ -15,8 +15,12 @@ stream {
         server ng:443;
     }
 
-    upstream reality {
+    upstream si {
-        server xr:443;
+        server si:443;
+    }
+
+    upstream singbox {
+        server 127.0.0.1:4443;
     }
 
     upstream ocserv {
@@ -30,7 +34,7 @@ stream {
     map_hash_bucket_size 128;
     map $ssl_preread_server_name $sni_name {
         #domain
-        www.microsoft.com reality;
+        vk.com singbox;
         #domain
 
         #ocserv
@@ -43,17 +47,22 @@ stream {
         default other;
     }
 
+    server {
+        listen          4443 reuseport proxy_protocol;
+        proxy_pass      si;
+    }
+
     server {
         listen          443 reuseport;
         proxy_pass      $sni_name;
-        proxy_protocol  on;
         ssl_preread     on;
+        proxy_protocol  on;
     }
 
     server {
         listen          443 udp;
         proxy_pass      $sni_name;
-        proxy_protocol  on;
         ssl_preread     on;
+        proxy_protocol  on;
     }
 }

config/xray.json

@@ -1,61 +0,0 @@
-{
-    "inbounds": [
-        {
-            "port": 443,
-            "protocol": "vless",
-            "settings": {
-                "clients": [
-                ],
-                "decryption": "none"
-            },
-            "sniffing": {
-                "destOverride": [
-                    "http",
-                    "tls"
-                ],
-                "enabled": true
-            },
-            "streamSettings": {
-                "network": "tcp",
-                "realitySettings": {
-                    "dest": "www.microsoft.com:443",
-                    "maxClientVer": "",
-                    "maxTimeDiff": 0,
-                    "minClientVer": "",
-                    "privateKey": "",
-                    "serverNames": [
-                        "www.microsoft.com"
-                    ],
-                    "shortIds": [],
-                    "show": false,
-                    "xver": 0
-                },
-                "tcpSettings": {
-                    "acceptProxyProtocol": true
-                },
-                "sockopt": {
-                    "acceptProxyProtocol": true
-                },
-                "security": "reality"
-            },
-            "tag": "vless_tls"
-        }
-    ],
-    "log": {
-        "loglevel": "info"
-    },
-    "outbounds": [
-        {
-            "protocol": "freedom",
-            "tag": "direct"
-        },
-        {
-            "protocol": "blackhole",
-            "tag": "block"
-        }
-    ],
-    "routing": {
-        "domainStrategy": "AsIs",
-        "rules": []
-    }
-}

docker-compose.yml

@@ -10,10 +10,6 @@ networks:
         ipam:
             config:
                 - subnet: 10.10.0.0/24
-    xray:
-        ipam:
-            config:
-                - subnet: 10.10.1.0/24
 volumes:
     adguard:
 
@@ -27,14 +23,13 @@ services:
                 image: ${IMAGE}
         volumes:
             - ./config/.profile:/root/.ashrc:ro
-            - ./config/upstream.conf:/etc/nginx/nginx.conf
             - ./scripts/start_upstream.sh:/start_upstream.sh
             - ./ssh:/ssh
+            - ./config:/config
             - ./config/sshd_config:/etc/ssh/sshd_config
             - ./logs/:/logs/
         ports:
-            - 443:443/tcp
+            - 443:443
-            - 443:443/udp
         hostname: upstream
         container_name: upstream-${VER}
         depends_on:
@@ -64,9 +59,7 @@ services:
                 image: ${IMAGE}
         volumes:
             - ./config/.profile:/root/.ashrc:ro
-            - ./config/nginx.conf:/etc/nginx/nginx.conf
+            - ./config:/config
-            - ./config/include.conf:/etc/nginx/include.conf
-            - ./config/nginx_default.conf:/nginx_default.conf
             - ./scripts/start_ng.sh:/start_ng.sh
             - ./certs/:/certs/
             - ./ssh:/ssh
@@ -90,8 +83,6 @@ services:
         networks:
             default:
                 ipv4_address: 10.10.0.2
-            xray:
-                ipv4_address: 10.10.1.2
         logging: *default-logging
     php:
         image: mercurykd/vpnbot-php:1.5
@@ -128,7 +119,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
@@ -188,7 +179,7 @@ services:
             - ad
             - ss
             - tg
-            - xr
+            - si
             - oc
             - np
     proxy:
@@ -399,20 +390,21 @@ services:
             default:
                 ipv4_address: 10.10.0.8
         logging: *default-logging
-    xr:
+    si:
-        image: mercurykd/vpnbot-xr:1.3
+        image: mercurykd/vpnbot-sb:1.2
         build:
-            dockerfile: dockerfile/xray.dockerfile
+            dockerfile: dockerfile/singbox.dockerfile
             args:
                 image: ${IMAGE}
         volumes:
             - ./config/.profile:/root/.ashrc:ro
             - ./ssh:/ssh
             - ./config/sshd_config:/etc/ssh/sshd_config
-            - ./config/xray.json:/xray.json
+            - ./config:/config
-            - ./scripts/start_xray.sh:/start_xray.sh
+            - ./certs:/certs
-        hostname: xray
+            - ./scripts/start_sing.sh:/start_sing.sh
-        container_name: xray-${VER}
+        hostname: singbox
+        container_name: singbox-${VER}
         depends_on:
             php:
                 condition: service_healthy
@@ -422,12 +414,10 @@ services:
             - path: ./override.env
               required: false
         stop_grace_period: 1s
-        command: ["/bin/sh", "/start_xray.sh"]
+        command: ["/bin/sh", "/start_sing.sh"]
         networks:
             default:
                 ipv4_address: 10.10.0.9
-            xray:
-                ipv4_address: 10.10.1.9
         logging: *default-logging
     oc:
         image: mercurykd/vpnbot-oc:1.2

dockerfile/singbox.dockerfile

@@ -0,0 +1,9 @@
+ARG image
+FROM $image
+RUN apk add openssh openssl jq \
+    && mkdir /root/.ssh \
+    && wget https://github.com/SagerNet/sing-box/releases/download/v1.9.3/sing-box-1.9.3-linux-amd64.tar.gz \
+    && tar -xf sing-box-1.9.3-linux-amd64.tar.gz \
+    && mv sing-box-1.9.3-linux-amd64/sing-box /usr/bin \
+    && rm sing-box-1.9.3-linux-amd64.tar.gz \
+    && rm -rf /sing-box-1.9.3-linux-amd64

dockerfile/xray.dockerfile

@@ -1,12 +0,0 @@
-ARG image
-FROM $image
-RUN apk add openssh openssl jq \
-    && mkdir /root/.ssh \
-    && 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 \
-    && rm geoip.dat \
-    && rm geosite.dat \
-    && chmod +x /usr/bin/xray
-ENV ENV="/root/.ashrc"

makefile

@@ -1,10 +1,9 @@
 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=$(IP) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
+	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
 d: # остановка контейнеров
 	-kill -9 $(shell cat ./update/update_pid) > /dev/null
 	docker compose down --remove-orphans
@@ -37,8 +36,8 @@ proxy: # консоль сервиса
 	docker compose exec proxy /bin/sh
 tg: # консоль сервиса
 	docker compose exec tg /bin/sh
-xr: # консоль сервиса
+si: # консоль сервиса
-	docker compose exec xr /bin/sh
+	docker compose exec si /bin/sh
 oc: # консоль сервиса
 	docker compose exec oc /bin/sh
 clean:

scripts/init.sh

@@ -16,11 +16,7 @@ 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
+apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
-DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
-mkdir -p $DOCKER_CONFIG/cli-plugins
-curl -SL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose
-chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
 git clone https://github.com/mercurykd/vpnbot.git
 cd ./vpnbot
 echo "<?php

scripts/start_ng.sh

@@ -1,8 +1,8 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-sed "s/ss:[0-9]\+/ss:$SSPORT/" /nginx_default.conf > change_port
+sed "s/ss:[0-9]\+/ss:$SSPORT/" /config/nginx_default.conf > change_port
-cat change_port > /nginx_default.conf
+cat change_port > /config/nginx_default.conf
-sed "s/ss:[0-9]\+/ss:$SSPORT/" /etc/nginx/nginx.conf > change_port
+sed "s/ss:[0-9]\+/ss:$SSPORT/" /config/nginx.conf > change_port
-cat change_port > /etc/nginx/nginx.conf
+cat change_port > /config/nginx.conf
-nginx -g "daemon off;"
+nginx -g "daemon off;" -c /config/nginx.conf

scripts/start_php.sh

@@ -2,12 +2,8 @@ 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
-if [[ -f "/start" && -f "/ssh/key.pub" && -s "/ssh/key.pub" ]]; then
+php cron.php &
-    php cron.php &
+unitd --log /logs/unit_error
-    unitd --log /logs/unit_error
+curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
-    curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
+pkill unitd
-    pkill unitd
+unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
-    unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
-else
-    exit 1;
-fi

scripts/start_sing.sh

@@ -0,0 +1,5 @@
+cat /ssh/key.pub > /root/.ssh/authorized_keys
+ssh-keygen -A
+exec /usr/sbin/sshd -D -e "$@" &
+sing-box run -c /config/singbox.json > /dev/null &
+tail -f /dev/null

scripts/start_upstream.sh

@@ -1,4 +1,4 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-nginx -g "daemon off;"
+nginx -g "daemon off;" -c /config/upstream.conf

scripts/start_wp.sh

@@ -1,18 +1,14 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-off=$(cat /config/pac.json | jq -r .warpoff)
+warp-svc > /dev/null &
+sleep 3
+warp-cli --accept-tos registration new
 key=$(cat /config/pac.json | jq -r .warp)
-if [ "$off" == 'null' ]
+if [ ! -z "$key" ]
 then
-    warp-svc > /dev/null &
+    warp-cli --accept-tos registration license $key
-    sleep 3
-    warp-cli --accept-tos registration new
-    if [ ! -z "$key" ]
-    then
-        warp-cli --accept-tos registration license $key
-    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

scripts/start_xray.sh

@@ -1,8 +0,0 @@
-cat /ssh/key.pub > /root/.ssh/authorized_keys
-ssh-keygen -A
-exec /usr/sbin/sshd -D -e "$@" &
-if [ $(cat /xray.json | jq -r '.inbounds[0].settings.clients[0].id' | wc -c) -gt 1 ]
-then
-    xray run -config /xray.json > /dev/null &
-fi
-tail -f /dev/null

singbox_windows/install.cmd

@@ -0,0 +1,2 @@
+winsw3.exe install
+pause

singbox_windows/restart.cmd

@@ -0,0 +1,2 @@
+winsw3.exe stop
+winsw3.exe start

singbox_windows/start.cmd

@@ -0,0 +1 @@
+winsw3.exe start

singbox_windows/status.cmd

@@ -0,0 +1,2 @@
+winsw3.exe status
+pause

singbox_windows/stop.cmd

@@ -0,0 +1 @@
+winsw3.exe stop

singbox_windows/uninstall.cmd

@@ -0,0 +1,2 @@
+winsw3.exe uninstall
+pause

update/update.sh

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

version

@@ -1,86 +1,3 @@
-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
 - фикс действий на элементом списков