Compare commits
99 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3dff9e039f | |||
| e2441eb9fd | |||
| 269d0e9956 | |||
| 8ba85164aa | |||
| e7cc7b66e2 | |||
| 54fa8d35b1 | |||
| ffe6bb4ba8 | |||
| 6be95533c4 | |||
| 8d13bee021 | |||
| db6a18f498 | |||
| 6954a16fa2 | |||
| ca7a9c955d | |||
| 852fbd55c6 | |||
| 3a8a843d8c | |||
| 90828d1117 | |||
| 37e8b96bcf | |||
| 306bc41813 | |||
| f6e5da382b | |||
| d7ed7042ec | |||
| 4496a30552 | |||
| ca1a596f85 | |||
| b3edf1bdcc | |||
| c6306aa918 | |||
| d5bbc9a564 | |||
| d2aab8ee4b | |||
| 304217d36e | |||
| 2622397542 | |||
| 702123e39c | |||
| 01ef7707c4 | |||
| 064d39d80b | |||
| 1b93d41421 | |||
| e41c8e30a4 | |||
| 260f988360 | |||
| ca4905220d | |||
| 08c5ff136e | |||
| 8709531717 | |||
| 71f53c3575 | |||
| 2607f1f264 | |||
| a94cab7dc1 | |||
| 694d446402 | |||
| 6074d40643 | |||
| 4b1df94325 | |||
| 232c75d5bf | |||
| 5e860a4896 | |||
| 5b05486b98 | |||
| fb22744fa7 | |||
| af812b7c93 | |||
| 3302ca8871 | |||
| 2c5eff03d5 | |||
| a8a203041f | |||
| a21c9b5fe9 | |||
| 696779450f | |||
| 7c5b3dfa3a | |||
| 74404559f9 | |||
| 11e8fb468b | |||
| ca92ca703f | |||
| f527888db8 | |||
| 0e47a771cc | |||
| ff10cbefc8 | |||
| 3371ba4bae | |||
| 621fb08467 | |||
| 5153b2c94a | |||
| 1e9461cc49 | |||
| 88f48a036c | |||
| b40e052d3f | |||
| a43082ae27 | |||
| c2cd945991 | |||
| 0737327e4b | |||
| f620bf12cd | |||
| 8b3730c61f | |||
| c6d9dcd47b | |||
| d83ba51d81 | |||
| 1a593100b7 | |||
| 414a67c10d | |||
| f92b484011 | |||
| 7af0276944 | |||
| 24aaa8756c | |||
| 07e2beff9b | |||
| 86261e6b76 | |||
| d816582e6f | |||
| 6d1ab0cb3a | |||
| 284b025881 | |||
| 0ca93b56a3 | |||
| 7bcd8de007 | |||
| 34eb950852 | |||
| 46021855a5 | |||
| 29c18ceb9d | |||
| 49d0827b9e | |||
| 07e04c384a | |||
| 579457b4f4 | |||
| 3dac9416ca | |||
| 5b4d3b5627 | |||
| 658e125cd8 | |||
| 1840555573 | |||
| ecdc028226 | |||
| d432bf82f2 | |||
| 211e2c079d | |||
| 1696c4da7b | |||
| b8d5700eba |
@@ -26,3 +26,8 @@ docker-compose.override.yml
|
||||
backup.json
|
||||
app/webapp/override/
|
||||
.rest
|
||||
|
||||
subscription.php
|
||||
location.conf
|
||||
override.conf
|
||||
i18n.override.php
|
||||
+812
-146
File diff suppressed because it is too large
Load Diff
+5
-1
@@ -30,7 +30,7 @@ $i = [
|
||||
'ru' => 'PAC',
|
||||
],
|
||||
'chat' => [
|
||||
'en' => 'discussion group',
|
||||
'en' => 'chat',
|
||||
'ru' => 'чат поддержки',
|
||||
],
|
||||
'back' => [
|
||||
@@ -378,3 +378,7 @@ $i = [
|
||||
'ru' => 'перезагрузка',
|
||||
],
|
||||
];
|
||||
|
||||
if (file_exists(__DIR__ . '/i18n.override.php')) {
|
||||
include __DIR__ . '/i18n.override.php';
|
||||
}
|
||||
|
||||
+5
-1
@@ -38,10 +38,14 @@ switch (true) {
|
||||
|
||||
// adguard cookie
|
||||
case preg_match('~^' . preg_quote("/webapp$hash/check") . '~', $_SERVER['REQUEST_URI']) && $webapp:
|
||||
setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
|
||||
setcookie('c', $hash, 0, '/');
|
||||
echo "/adguard$hash/";
|
||||
break;
|
||||
|
||||
case preg_match('~^' . preg_quote("/pac$hash/sub") . '~', $_SERVER['REQUEST_URI']) && file_exists(__DIR__ . '/subscription.php'):
|
||||
$bot->sub();
|
||||
exit;
|
||||
|
||||
// subs & pac
|
||||
case preg_match('~^' . preg_quote("/pac$hash") . '~', $_SERVER['REQUEST_URI']):
|
||||
if (!empty($t = unserialize(base64_decode(explode('/', $_SERVER['REQUEST_URI'])[2])))) { // fix sing-box import
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
require __DIR__ . '/timezone.php';
|
||||
|
||||
// require __DIR__ . '/debug.php';
|
||||
require __DIR__ . '/bot.php';
|
||||
require __DIR__ . '/config.php';
|
||||
require __DIR__ . '/i18n.php';
|
||||
|
||||
(new Bot($c['key'], $i))->analyzeXray();
|
||||
@@ -72,6 +72,7 @@
|
||||
"uuid": "~uid~",
|
||||
"network": "tcp",
|
||||
"flow": "xtls-rprx-vision",
|
||||
"udp": true,
|
||||
"tls": true,
|
||||
"reality-opts": {
|
||||
"public-key": "~public_key~",
|
||||
@@ -133,6 +134,14 @@
|
||||
"behavior": "domain",
|
||||
"name": "pac"
|
||||
},
|
||||
{
|
||||
"type": "RULE-SET",
|
||||
"list": "~subnet~",
|
||||
"action": "PROXY",
|
||||
"interval": 30,
|
||||
"behavior": "ipcidr",
|
||||
"name": "subnet"
|
||||
},
|
||||
{
|
||||
"type": "MATCH",
|
||||
"action": "DIRECT"
|
||||
|
||||
+4
-1
@@ -11,7 +11,7 @@ events {
|
||||
http {
|
||||
server_names_hash_bucket_size 64;
|
||||
server_tokens off;
|
||||
include include.conf;
|
||||
include override.conf;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
@@ -122,6 +122,7 @@ http {
|
||||
proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
proxy_pass https://ad/dns-query;
|
||||
}
|
||||
include location.conf;
|
||||
}
|
||||
|
||||
#~
|
||||
@@ -210,6 +211,8 @@ http {
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
|
||||
# include location.conf;
|
||||
# }
|
||||
#-domain
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ events {
|
||||
http {
|
||||
server_names_hash_bucket_size 64;
|
||||
server_tokens off;
|
||||
include include.conf;
|
||||
include override.conf;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
@@ -122,6 +122,7 @@ http {
|
||||
proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
proxy_pass https://ad/dns-query;
|
||||
}
|
||||
include location.conf;
|
||||
}
|
||||
|
||||
#~
|
||||
@@ -210,6 +211,8 @@ http {
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
|
||||
# include location.conf;
|
||||
# }
|
||||
#-domain
|
||||
}
|
||||
|
||||
+36
-21
@@ -9,12 +9,12 @@
|
||||
"tag": "tun-in",
|
||||
"domain_strategy": "prefer_ipv4",
|
||||
"interface_name": "sing-tun",
|
||||
"address": ["172.19.0.1\/30"],
|
||||
"address": [
|
||||
"172.19.0.1\/30"
|
||||
],
|
||||
"mtu": 1400,
|
||||
"gso": true,
|
||||
"auto_route": true,
|
||||
"strict_route": true,
|
||||
"sniff": true,
|
||||
"endpoint_independent_nat": false,
|
||||
"stack": "mixed",
|
||||
"platform": {
|
||||
@@ -27,14 +27,9 @@
|
||||
},
|
||||
{
|
||||
"type": "mixed",
|
||||
"tag": "mixed-in",
|
||||
"domain_strategy": "prefer_ipv4",
|
||||
"tag": "in",
|
||||
"listen": "127.0.0.1",
|
||||
"listen_port": 2080,
|
||||
"tcp_fast_open": true,
|
||||
"sniff": true,
|
||||
"sniff_override_destination": false,
|
||||
"users": []
|
||||
"listen_port": 2080
|
||||
}
|
||||
],
|
||||
"dns": {
|
||||
@@ -92,23 +87,28 @@
|
||||
{
|
||||
"type": "direct",
|
||||
"tag": "direct"
|
||||
},
|
||||
{
|
||||
"type": "block",
|
||||
"tag": "block"
|
||||
},
|
||||
{
|
||||
"type": "dns",
|
||||
"tag": "dns-out"
|
||||
}
|
||||
],
|
||||
"route": {
|
||||
"auto_detect_interface": true,
|
||||
"override_android_vpn": true,
|
||||
"rules": [
|
||||
{
|
||||
"action": "sniff"
|
||||
},
|
||||
{
|
||||
"protocol": "dns",
|
||||
"outbound": "dns-out"
|
||||
"action": "hijack-dns"
|
||||
},
|
||||
{
|
||||
"inbound": "in",
|
||||
"action": "resolve",
|
||||
"strategy": "prefer_ipv4"
|
||||
},
|
||||
{
|
||||
"inbound": "in",
|
||||
"action": "sniff",
|
||||
"timeout": "1s"
|
||||
},
|
||||
{
|
||||
"addruleset": true,
|
||||
@@ -129,6 +129,21 @@
|
||||
],
|
||||
"outbound": "~outbound~"
|
||||
},
|
||||
{
|
||||
"addruleset": true,
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "subnet",
|
||||
"interval": "30s",
|
||||
"rules": [
|
||||
{
|
||||
"ip_cidr": "~subnet~"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"outbound": "~outbound~"
|
||||
},
|
||||
{
|
||||
"addruleset": true,
|
||||
"createruleset": [
|
||||
@@ -172,7 +187,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"outbound": "block"
|
||||
"action": "reject"
|
||||
},
|
||||
{
|
||||
"addruleset": true,
|
||||
@@ -192,4 +207,4 @@
|
||||
],
|
||||
"final": "direct"
|
||||
}
|
||||
}
|
||||
}
|
||||
+111
-81
@@ -4,92 +4,122 @@
|
||||
"error": "",
|
||||
"loglevel": "warning"
|
||||
},
|
||||
"inbounds": [{
|
||||
"tag": "socks",
|
||||
"port": 10808,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "socks",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": ["http", "tls"],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}, {
|
||||
"tag": "http",
|
||||
"port": 10809,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "http",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": ["http", "tls"],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}],
|
||||
"outbounds": [{
|
||||
"tag": "~outbound~",
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"vnext": [{
|
||||
"address": "~domain~",
|
||||
"port": 443,
|
||||
"users": [{
|
||||
"id": "~uid~",
|
||||
"alterId": 0,
|
||||
"email": "t@t.tt",
|
||||
"security": "auto",
|
||||
"encryption": "none",
|
||||
"flow": "xtls-rprx-vision"
|
||||
}]
|
||||
}]
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"serverName": "~server_name~",
|
||||
"fingerprint": "chrome",
|
||||
"show": false,
|
||||
"publicKey": "~public_key~",
|
||||
"shortId": "~short_id~",
|
||||
"spiderX": ""
|
||||
"inbounds": [
|
||||
{
|
||||
"tag": "socks",
|
||||
"port": 10808,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "socks",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": [
|
||||
"http",
|
||||
"tls"
|
||||
],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
},
|
||||
"mux": {
|
||||
"enabled": false,
|
||||
"concurrency": -1
|
||||
}
|
||||
}, {
|
||||
"tag": "direct",
|
||||
"protocol": "freedom"
|
||||
}, {
|
||||
"tag": "block",
|
||||
"protocol": "blackhole",
|
||||
"settings": {
|
||||
"response": {
|
||||
"type": "http"
|
||||
{
|
||||
"tag": "http",
|
||||
"port": 10809,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "http",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": [
|
||||
"http",
|
||||
"tls"
|
||||
],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}
|
||||
}],
|
||||
],
|
||||
"outbounds": [
|
||||
{
|
||||
"tag": "direct",
|
||||
"protocol": "freedom"
|
||||
},
|
||||
{
|
||||
"tag": "~outbound~",
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"vnext": [
|
||||
{
|
||||
"address": "~domain~",
|
||||
"port": 443,
|
||||
"users": [
|
||||
{
|
||||
"id": "~uid~",
|
||||
"alterId": 0,
|
||||
"email": "t@t.tt",
|
||||
"security": "auto",
|
||||
"encryption": "none",
|
||||
"flow": "xtls-rprx-vision"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"serverName": "~server_name~",
|
||||
"fingerprint": "chrome",
|
||||
"show": false,
|
||||
"publicKey": "~public_key~",
|
||||
"shortId": "~short_id~",
|
||||
"spiderX": ""
|
||||
}
|
||||
},
|
||||
"mux": {
|
||||
"enabled": false,
|
||||
"concurrency": -1
|
||||
}
|
||||
},
|
||||
{
|
||||
"tag": "block",
|
||||
"protocol": "blackhole",
|
||||
"settings": {
|
||||
"response": {
|
||||
"type": "http"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"routing": {
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": [{
|
||||
"type": "field",
|
||||
"outboundTag": "~outbound~",
|
||||
"domain": "~pac~"
|
||||
}, {
|
||||
"type": "field",
|
||||
"port": "0-65535",
|
||||
"outboundTag": "direct"
|
||||
}]
|
||||
"rules": [
|
||||
{
|
||||
"type": "field",
|
||||
"outboundTag": "block",
|
||||
"domain": "~block~"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"outboundTag": "~outbound~",
|
||||
"domain": "~pac~"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"outboundTag": "~outbound~",
|
||||
"ip": "~subnet~"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"outboundTag": "~outbound~",
|
||||
"domain": "~warp~"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
+39
-1
@@ -22,6 +22,15 @@
|
||||
}
|
||||
},
|
||||
"tag": "vless_tls"
|
||||
},
|
||||
{
|
||||
"listen": "127.0.0.1",
|
||||
"port": 8080,
|
||||
"protocol": "dokodemo-door",
|
||||
"settings": {
|
||||
"address": "127.0.0.1"
|
||||
},
|
||||
"tag": "api"
|
||||
}
|
||||
],
|
||||
"log": {
|
||||
@@ -40,6 +49,35 @@
|
||||
],
|
||||
"routing": {
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": []
|
||||
"rules": [
|
||||
{
|
||||
"inboundTag": [
|
||||
"api"
|
||||
],
|
||||
"outboundTag": "api",
|
||||
"type": "field"
|
||||
}
|
||||
]
|
||||
},
|
||||
"stats": {},
|
||||
"api": {
|
||||
"services": [
|
||||
"StatsService"
|
||||
],
|
||||
"tag": "api"
|
||||
},
|
||||
"policy": {
|
||||
"levels": {
|
||||
"0": {
|
||||
"statsUserUplink": true,
|
||||
"statsUserDownlink": true
|
||||
}
|
||||
},
|
||||
"system": {
|
||||
"statsInboundUplink": true,
|
||||
"statsInboundDownlink": true,
|
||||
"statsOutboundUplink": true,
|
||||
"statsOutboundDownlink": true
|
||||
}
|
||||
}
|
||||
}
|
||||
+16
-7
@@ -42,10 +42,18 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
ng:
|
||||
condition: service_started
|
||||
ad:
|
||||
condition: service_started
|
||||
ss:
|
||||
condition: service_started
|
||||
xr:
|
||||
condition: service_started
|
||||
oc:
|
||||
condition: service_started
|
||||
np:
|
||||
condition: service_started
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
@@ -67,7 +75,8 @@ services:
|
||||
volumes:
|
||||
- ./config/.profile:/root/.ashrc:ro
|
||||
- ./config/nginx.conf:/etc/nginx/nginx.conf
|
||||
- ./config/include.conf:/etc/nginx/include.conf
|
||||
- ./config/override.conf:/etc/nginx/override.conf
|
||||
- ./config/location.conf:/etc/nginx/location.conf
|
||||
- ./config/nginx_default.conf:/nginx_default.conf
|
||||
- ./scripts/start_ng.sh:/start_ng.sh
|
||||
- ./certs/:/certs/
|
||||
@@ -79,9 +88,6 @@ services:
|
||||
- 80:80
|
||||
hostname: nginx
|
||||
container_name: nginx-${VER}
|
||||
depends_on:
|
||||
up:
|
||||
condition: service_started
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
@@ -95,6 +101,9 @@ services:
|
||||
xray:
|
||||
ipv4_address: 10.10.1.2
|
||||
logging: *default-logging
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
php:
|
||||
image: mercurykd/vpnbot-php:1.7
|
||||
build:
|
||||
@@ -147,7 +156,7 @@ services:
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
service:
|
||||
image: mercurykd/vpnbot-php:1.6
|
||||
image: mercurykd/vpnbot-php:1.7
|
||||
build:
|
||||
dockerfile: dockerfile/php.dockerfile
|
||||
args:
|
||||
@@ -432,7 +441,7 @@ services:
|
||||
ipv4_address: 10.10.0.12
|
||||
logging: *default-logging
|
||||
wp:
|
||||
image: mercurykd/vpnbot-wp:1.2
|
||||
image: mercurykd/vpnbot-wp:1.3
|
||||
build:
|
||||
dockerfile: dockerfile/warp.dockerfile
|
||||
args:
|
||||
@@ -442,7 +451,7 @@ services:
|
||||
devices:
|
||||
- /dev/net/tun:/dev/net/tun
|
||||
volumes:
|
||||
- ./config/.profile:/root/.ashrc:ro
|
||||
- ./config/.profile:/root/.bashrc:ro
|
||||
- ./ssh:/ssh
|
||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||
- ./config:/config
|
||||
|
||||
@@ -1,16 +1,6 @@
|
||||
FROM ubuntu:22.04 AS build
|
||||
RUN apt update && apt install -y curl gpg lsb-release \
|
||||
FROM ubuntu:22.04
|
||||
RUN apt update && apt install -y curl gpg socat jq lsb-release openssh-server \
|
||||
&& curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg \
|
||||
&& echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list \
|
||||
&& apt update && apt install -y cloudflare-warp
|
||||
|
||||
FROM alpine:3.17
|
||||
ARG GLIBC_VERSION=2.34-r0
|
||||
COPY --from=build /usr/bin/warp-cli /usr/bin/warp-svc /usr/local/bin/
|
||||
RUN apk add --no-cache dbus-libs wget socat openssh-server jq curl \
|
||||
&& mkdir /tmp/glibc-pkgs \
|
||||
&& for PKG in glibc-$GLIBC_VERSION.apk glibc-bin-$GLIBC_VERSION.apk; do wget -q --directory-prefix /tmp/glibc-pkgs https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/$PKG; done \
|
||||
&& apk add --no-cache --allow-untrusted --force-overwrite /tmp/glibc-pkgs/* \
|
||||
&& rm -rf /tmp/glibc-pkgs \
|
||||
&& /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib \
|
||||
&& apt update && apt install -y cloudflare-warp \
|
||||
&& mkdir /root/.ssh
|
||||
|
||||
@@ -1,9 +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))
|
||||
$(eval IP := $(shell hostname -I | awk '{print $$1}'))
|
||||
bash ./update/update.sh &
|
||||
touch ./override.env ./docker-compose.override.yml
|
||||
touch ./override.env ./docker-compose.override.yml ./config/location.conf ./config/override.conf
|
||||
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
|
||||
@@ -32,7 +32,7 @@ up: # консоль сервиса
|
||||
ad: # консоль сервиса
|
||||
docker compose exec ad /bin/sh
|
||||
wp: # консоль сервиса
|
||||
docker compose exec wp /bin/sh
|
||||
docker compose exec wp bash
|
||||
proxy: # консоль сервиса
|
||||
docker compose exec proxy /bin/sh
|
||||
tg: # консоль сервиса
|
||||
@@ -41,6 +41,8 @@ xr: # консоль сервиса
|
||||
docker compose exec xr /bin/sh
|
||||
oc: # консоль сервиса
|
||||
docker compose exec oc /bin/sh
|
||||
service: # консоль сервиса
|
||||
docker compose exec service /bin/sh
|
||||
clean:
|
||||
docker image prune
|
||||
docker builder prune
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
version: "3"
|
||||
|
||||
services:
|
||||
socat:
|
||||
build:
|
||||
dockerfile: ./dockerfile
|
||||
ports:
|
||||
- 80:80
|
||||
- 443:443
|
||||
- 853:853
|
||||
- ${TGPORT}:${TGPORT}
|
||||
- ${SSPORT}:${SSPORT}
|
||||
- ${SSPORT}:${SSPORT}/udp
|
||||
- ${WGPORT}:${WGPORT}/udp
|
||||
volumes:
|
||||
- ./start_socat.sh:/start_socat.sh
|
||||
command: /bin/sh /start_socat.sh
|
||||
stop_grace_period: 1s
|
||||
@@ -1,2 +0,0 @@
|
||||
FROM alpine:3.18
|
||||
RUN apk add socat htop net-tools
|
||||
@@ -1,11 +0,0 @@
|
||||
b:
|
||||
docker compose build --no-cache
|
||||
u:
|
||||
docker compose up -d --build
|
||||
d:
|
||||
docker compose down
|
||||
ps:
|
||||
docker compose ps
|
||||
e:
|
||||
docker compose exec socat sh
|
||||
r: d u
|
||||
+53
-8
@@ -1,8 +1,53 @@
|
||||
socat TCP-LISTEN:80,fork TCP:{ip}:80 &
|
||||
socat TCP-LISTEN:443,fork TCP:{ip}:443 &
|
||||
socat TCP-LISTEN:853,fork TCP:{ip}:853 &
|
||||
socat TCP-LISTEN:{tg},fork TCP:{ip}:{tg} &
|
||||
socat TCP-LISTEN:{ss},fork TCP:{ip}:{ss} &
|
||||
socat UDP-LISTEN:{ss},fork UDP:{ip}:{ss} &
|
||||
socat UDP-LISTEN:{wg},fork UDP:{ip}:{wg} &
|
||||
tail -f /dev/null
|
||||
#!/bin/bash
|
||||
|
||||
# Параметры (можно менять)
|
||||
PORTS=(80 443 853 ~tg~ ~ss~ ~wg1~ ~wg2~) # Прослушиваемые порты
|
||||
TARGET="~ip~" # Куда перенаправляем трафик
|
||||
TCP_CMD="socat TCP-LISTEN:{PORT},fork,reuseaddr TCP:$TARGET:{PORT}"
|
||||
UDP_CMD="socat UDP-LISTEN:{PORT},fork,reuseaddr UDP:$TARGET:{PORT}"
|
||||
|
||||
# Проверяем, установлен ли socat
|
||||
if ! command -v socat &> /dev/null; then
|
||||
echo "socat не установлен. Устанавливаем..."
|
||||
if [[ -f /etc/debian_version ]]; then
|
||||
sudo apt update && sudo apt install -y socat
|
||||
elif [[ -f /etc/redhat-release ]]; then
|
||||
sudo yum install -y socat
|
||||
else
|
||||
echo "Ошибка: Неизвестный дистрибутив. Установите socat вручную."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Проверяем, заняты ли порты (TCP и UDP)
|
||||
for PORT in "${PORTS[@]}"; do
|
||||
# Проверка TCP
|
||||
if ss -tulnp | grep -q ":$PORT "; then
|
||||
PROCESS=$(ss -tulnp | grep ":$PORT " | awk '{print $7}')
|
||||
echo "Ошибка: Порт $PORT (TCP) занят процессом: $PROCESS"
|
||||
exit 1
|
||||
fi
|
||||
# Проверка UDP
|
||||
if ss -ulnp | grep -q ":$PORT "; then
|
||||
PROCESS=$(ss -ulnp | grep ":$PORT " | awk '{print $6}')
|
||||
echo "Ошибка: Порт $PORT (UDP) занят процессом: $PROCESS"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# Запускаем socat для каждого порта (TCP и UDP)
|
||||
for PORT in "${PORTS[@]}"; do
|
||||
# TCP
|
||||
CMD_TCP=$(echo "$TCP_CMD" | sed "s/{PORT}/$PORT/g")
|
||||
echo "Запуск (TCP): $CMD_TCP"
|
||||
eval "$CMD_TCP &" # Запускаем в фоне
|
||||
|
||||
# UDP
|
||||
CMD_UDP=$(echo "$UDP_CMD" | sed "s/{PORT}/$PORT/g")
|
||||
echo "Запуск (UDP): $CMD_UDP"
|
||||
eval "$CMD_UDP &" # Запускаем в фоне
|
||||
done
|
||||
|
||||
echo "socat запущен для портов: ${PORTS[*]} (TCP и UDP)"
|
||||
echo "Трафик перенаправляется на: $TARGET"
|
||||
echo "Для остановки выполните: pkill socat"
|
||||
@@ -13,8 +13,17 @@ telegram bot to manage servers (inside the bot)
|
||||
---
|
||||
environment: ubuntu 22.04/24.04, debian 11/12
|
||||
|
||||
### Install:
|
||||
## Install:
|
||||
|
||||
```shell
|
||||
wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY master
|
||||
```
|
||||
#### Restart:
|
||||
```shell
|
||||
make r
|
||||
```
|
||||
#### autoload:
|
||||
```shell
|
||||
crontab -e
|
||||
```
|
||||
add `@reboot cd /root/vpnbot && make r` and save
|
||||
|
||||
@@ -2,4 +2,5 @@ cat /ssh/key.pub > /root/.ssh/authorized_keys
|
||||
ssh-keygen -A
|
||||
exec /usr/sbin/sshd -D -e "$@" &
|
||||
php service.php
|
||||
php iplimit.php &
|
||||
php cron.php
|
||||
+4
-3
@@ -1,9 +1,10 @@
|
||||
cat /ssh/key.pub > /root/.ssh/authorized_keys
|
||||
ssh-keygen -A
|
||||
exec /usr/sbin/sshd -D -e "$@" &
|
||||
echo 'HostKeyAlgorithms +ssh-rsa' >> /etc/ssh/sshd_config
|
||||
echo 'PubkeyAcceptedKeyTypes +ssh-rsa' >> /etc/ssh/sshd_config
|
||||
service ssh start
|
||||
off=$(cat /config/pac.json | jq -r .warpoff)
|
||||
key=$(cat /config/pac.json | jq -r .warp)
|
||||
if [ "$off" == 'null' ]
|
||||
if [ "$off" = 'null' ]
|
||||
then
|
||||
warp-svc > /dev/null &
|
||||
sleep 3
|
||||
|
||||
Binary file not shown.
+1
-1
@@ -38,7 +38,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": "launching the bot"/')"
|
||||
> $pwd/update/key
|
||||
> $pwd/update/curl
|
||||
IP=$(curl -s -t 1 2ip.io || curl -s -t 1 ipinfo.io/ip || curl -s -t 1 ifconfig.me) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
|
||||
IP=$(hostname -I | awk '{print $1}') VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
|
||||
bash $pwd/update/update.sh &
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -1,3 +1,71 @@
|
||||
19.07.2025 v2.25
|
||||
- перед запуском обязательно запустить:
|
||||
<pre>touch ./override.env ./docker-compose.override.yml ./config/location.conf ./config/override.conf</pre>
|
||||
- для nginx вместо include.conf теперь override.conf, не затирается
|
||||
- location.conf (by legiz), не затирается
|
||||
- app/i18n.override.php для собственных названий кнопок, не затирается
|
||||
16.07.2025 v2.24
|
||||
- фикс зависания бота из-за пустого статуса warp
|
||||
- скрипт socat.sh для мостов /mirror
|
||||
04.07.2025 v2.23
|
||||
- фикс двойного /id
|
||||
- фикс отображения статы vless на мобилке
|
||||
- страница подписок app/subscription.php
|
||||
18.06.2025 v2.22
|
||||
- фикс определения айпи при запуске
|
||||
11.06.2025 v2.21
|
||||
- пагинация в списках
|
||||
20.05.2025 v2.20
|
||||
- коррекция главного меню
|
||||
- vless: опция обнуления статы ежемесячно
|
||||
17.05.2025 v2.19
|
||||
- фикс падения vless при одинаковом имени пользователей
|
||||
- фикс падения vless при установке таймера для выключенного пользователя
|
||||
- подсветка в меню работы процесса контейнера
|
||||
- overwrite=no для импорта клеш подписки (legiz)
|
||||
18.04.2025 v2.18
|
||||
- фикс отсутствия ssl при первом старте
|
||||
- iplimit уведомляет без отключения пользователя
|
||||
- включение udp в mihomo-шаблоне
|
||||
- удаление лишнего образа пхп
|
||||
07.04.2025 v2.17
|
||||
- фикс циклической перезагрузки панели adguardHome
|
||||
07.04.2025 v2.16
|
||||
- фикс warp
|
||||
07.04.2025 v2.15
|
||||
- миграция поддоменов np/oc вместе в с бэкапом
|
||||
02.03.2025 v2.14
|
||||
- vless ip limit: фикс выключения юзера
|
||||
22.02.2025 v2.13
|
||||
- vless: улучшение сбора статы
|
||||
- vless: фикс добавления правил srs для block outbound
|
||||
11.02.2025 v2.12
|
||||
- vless: хранение статы в отдельном файле
|
||||
- vless ip limit: возможность указать кол-во айпи
|
||||
08.02.2025 v2.11
|
||||
- vless: singbox 1.11
|
||||
07.02.2025 v2.10
|
||||
- vless: ip limit
|
||||
- vless: общая стата
|
||||
- vless: пакетное добавление профилей
|
||||
- vless: при добавлении можно указывать свой uuid (name:uuid, name:uuid, ...)
|
||||
- автоудаление логов
|
||||
- хэш бота сохраняется в настройках и восстанавливается с бэкапом. можно накатывать бэкап на нового бота
|
||||
02.02.2025 v2.9
|
||||
- откат sing-box 1.11
|
||||
02.02.2025 v2.8
|
||||
- vless: корректировка статы юзера
|
||||
- sing-box 1.11
|
||||
29.01.2025 v2.7
|
||||
- vless: сброс статистики юзера
|
||||
24.01.2025 v2.6
|
||||
- правки меню
|
||||
- vless:добавлена возможность маршрутизировать список ip-сетей
|
||||
18.01.2025 v2.5
|
||||
- фикс скачивания шаблона михомо
|
||||
- обновлен singbox.exe
|
||||
- вывод статистики vless пользователей
|
||||
- смягчил паттерн поиска reality degenerate в логах
|
||||
07.01.2025 v2.4
|
||||
- вернул shadowsocks (спасибо за донат)
|
||||
04.01.2025
|
||||
|
||||
Reference in New Issue
Block a user