Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 321b853d42 | |||
| 8effb72cdc | |||
| bec8f5488e | |||
| f97b0f9228 | |||
| 8e8babe1a6 | |||
| 238c380f23 | |||
| abc2e7c587 | |||
| 3f99d9fbf0 | |||
| 3f1e80c641 | |||
| 5afe6a4777 | |||
| c2cf0bff98 | |||
| 60241aaffb | |||
| 96ff868b10 | |||
| f58c29a66b | |||
| ca922f4612 | |||
| 5a5b1b62b1 | |||
| 0ef34f818d | |||
| d1960d6acb | |||
| 95cba4c8d1 | |||
| 18e2dd53ff | |||
| 3e5b131c16 | |||
| e07d1505e4 | |||
| c140f292e8 | |||
| 7cc100ace5 | |||
| 4938ada85d | |||
| c5b9886470 | |||
| 61d8b899e7 | |||
| 7d81eeeddd | |||
| 3bdebd95ab | |||
| eb4641a58d | |||
| 61900daafd |
+458
-263
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -25,8 +25,8 @@ $bot->cloakNginx();
|
|||||||
$bot->syncDeny();
|
$bot->syncDeny();
|
||||||
$bot->cleanDocker();
|
$bot->cleanDocker();
|
||||||
$bot->dnsttStart();
|
$bot->dnsttStart();
|
||||||
|
$bot->restartHysteria();
|
||||||
$c = $bot->getPacConf();
|
$c = $bot->getPacConf();
|
||||||
$bot->setUpstreamDomain($c['pac']['transport'] != 'Reality' ? 't' : ($c['pac']['reality']['domain'] ?: $c['xray']['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]));
|
$bot->setUpstreamDomain($c['transport'] != 'Reality' ? 't' : $c['reality']['domain']);
|
||||||
$bot->setUpstreamDomainNaive($c['domain']);
|
$bot->setUpstreamDomainNaive($c['domain']);
|
||||||
$bot->setUpstreamDomainOcserv($c['domain']);
|
$bot->setUpstreamDomainOcserv($c['domain']);
|
||||||
$bot->setUpstreamDomainHysteria($c['domain']);
|
|
||||||
|
|||||||
+3
-3
@@ -99,7 +99,7 @@
|
|||||||
"list": "~block~",
|
"list": "~block~",
|
||||||
"action": "REJECT",
|
"action": "REJECT",
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"behavior": "domain",
|
"behavior": "classical",
|
||||||
"name": "block"
|
"name": "block"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -131,7 +131,7 @@
|
|||||||
"list": "~pac~",
|
"list": "~pac~",
|
||||||
"action": "PROXY",
|
"action": "PROXY",
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"behavior": "domain",
|
"behavior": "classical",
|
||||||
"name": "pac"
|
"name": "pac"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -139,7 +139,7 @@
|
|||||||
"list": "~subnet~",
|
"list": "~subnet~",
|
||||||
"action": "PROXY",
|
"action": "PROXY",
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"behavior": "ipcidr",
|
"behavior": "classical",
|
||||||
"name": "subnet"
|
"name": "subnet"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -122,3 +122,4 @@ AllowTcpForwarding yes
|
|||||||
PermitTunnel yes
|
PermitTunnel yes
|
||||||
GatewayPorts yes
|
GatewayPorts yes
|
||||||
X11Forwarding yes
|
X11Forwarding yes
|
||||||
|
LogLevel QUIET
|
||||||
@@ -32,10 +32,6 @@ stream {
|
|||||||
server np:443;
|
server np:443;
|
||||||
}
|
}
|
||||||
|
|
||||||
upstream hysteria {
|
|
||||||
server hy:443;
|
|
||||||
}
|
|
||||||
|
|
||||||
map_hash_bucket_size 128;
|
map_hash_bucket_size 128;
|
||||||
map $ssl_preread_server_name $sni_name {
|
map $ssl_preread_server_name $sni_name {
|
||||||
#domain
|
#domain
|
||||||
@@ -49,10 +45,6 @@ stream {
|
|||||||
#naive
|
#naive
|
||||||
#np.domain naive;
|
#np.domain naive;
|
||||||
#naive
|
#naive
|
||||||
|
|
||||||
#hysteria
|
|
||||||
#hy.domain hysteria;
|
|
||||||
#hysteria
|
|
||||||
default other;
|
default other;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -49,7 +49,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"routing": {
|
"routing": {
|
||||||
"domainStrategy": "AsIs",
|
"domainStrategy": "IPIfNonMatch",
|
||||||
"rules": [
|
"rules": [
|
||||||
{
|
{
|
||||||
"inboundTag": [
|
"inboundTag": [
|
||||||
|
|||||||
+14
-13
@@ -40,22 +40,14 @@ services:
|
|||||||
hostname: upstream
|
hostname: upstream
|
||||||
container_name: upstream-${VER}
|
container_name: upstream-${VER}
|
||||||
depends_on:
|
depends_on:
|
||||||
php:
|
|
||||||
condition: service_healthy
|
|
||||||
ng:
|
ng:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
ad:
|
|
||||||
condition: service_started
|
|
||||||
ss:
|
|
||||||
condition: service_started
|
|
||||||
xr:
|
xr:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
oc:
|
oc:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
np:
|
np:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
hy:
|
|
||||||
condition: service_started
|
|
||||||
env_file:
|
env_file:
|
||||||
- path: ./.env
|
- path: ./.env
|
||||||
required: true # default
|
required: true # default
|
||||||
@@ -106,6 +98,12 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
php:
|
php:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
ad:
|
||||||
|
condition: service_started
|
||||||
|
ss:
|
||||||
|
condition: service_started
|
||||||
|
xr:
|
||||||
|
condition: service_started
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "nginx", "-t"]
|
test: ["CMD", "nginx", "-t"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
@@ -216,7 +214,7 @@ services:
|
|||||||
- dnstt
|
- dnstt
|
||||||
- hy
|
- hy
|
||||||
wg:
|
wg:
|
||||||
image: mercurykd/vpnbot-wg:1.1
|
image: mercurykd/vpnbot-wg:1.2
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/wireguard.dockerfile
|
dockerfile: dockerfile/wireguard.dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -254,7 +252,7 @@ services:
|
|||||||
ipv4_address: 10.10.0.4
|
ipv4_address: 10.10.0.4
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
wg1:
|
wg1:
|
||||||
image: mercurykd/vpnbot-wg:1.1
|
image: mercurykd/vpnbot-wg:1.2
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/wireguard.dockerfile
|
dockerfile: dockerfile/wireguard.dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -327,15 +325,16 @@ services:
|
|||||||
entrypoint: ["/bin/sh", "/start_ad.sh"]
|
entrypoint: ["/bin/sh", "/start_ad.sh"]
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
tg:
|
tg:
|
||||||
image: mercurykd/vpnbot-tg:1.2
|
image: mercurykd/vpnbot-tg:1.3
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/telegram.dockerfile
|
dockerfile: dockerfile/telegram.dockerfile
|
||||||
volumes:
|
volumes:
|
||||||
- ./config/.profile:/root/.ashrc:ro
|
- ./config/.profile:/root/.bashrc:ro
|
||||||
- ./ssh:/ssh
|
- ./ssh:/ssh
|
||||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||||
- ./scripts/start_tg.sh:/start_tg.sh
|
- ./scripts/start_tg.sh:/start_tg.sh
|
||||||
- ./config/mtprotosecret:/mtprotosecret
|
- ./config/mtprotosecret:/mtprotosecret
|
||||||
|
- ./logs/:/logs/
|
||||||
hostname: telegram
|
hostname: telegram
|
||||||
container_name: mtproto-${VER}
|
container_name: mtproto-${VER}
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -450,7 +449,7 @@ services:
|
|||||||
ipv4_address: 10.10.0.12
|
ipv4_address: 10.10.0.12
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
wp:
|
wp:
|
||||||
image: mercurykd/vpnbot-wp:1.4
|
image: mercurykd/vpnbot-wp:1.5
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/warp.dockerfile
|
dockerfile: dockerfile/warp.dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -550,6 +549,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./config/.profile:/root/.ashrc:ro
|
- ./config/.profile:/root/.ashrc:ro
|
||||||
- ./ssh:/ssh
|
- ./ssh:/ssh
|
||||||
|
- ./logs:/logs
|
||||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||||
- ./config/dnstt:/dnstt
|
- ./config/dnstt:/dnstt
|
||||||
- ./scripts/start_dnstt.sh:/start_dnstt.sh
|
- ./scripts/start_dnstt.sh:/start_dnstt.sh
|
||||||
@@ -580,6 +580,7 @@ services:
|
|||||||
- ./ssh:/ssh
|
- ./ssh:/ssh
|
||||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||||
- ./certs:/certs
|
- ./certs:/certs
|
||||||
|
- ./logs:/logs
|
||||||
- ./config:/config
|
- ./config:/config
|
||||||
- ./scripts/start_hysteria.sh:/start_hysteria.sh
|
- ./scripts/start_hysteria.sh:/start_hysteria.sh
|
||||||
hostname: hysteria
|
hostname: hysteria
|
||||||
|
|||||||
@@ -1,13 +1,33 @@
|
|||||||
FROM alpine:3.6
|
# Build stage
|
||||||
RUN apk add --no-cache --virtual .build-deps alpine-sdk linux-headers openssl-dev \
|
FROM ubuntu:22.04 AS builder
|
||||||
&& git clone --single-branch --depth 1 https://github.com/TelegramMessenger/MTProxy.git /mtproxy/sources \
|
|
||||||
&& mkdir /mtproxy/patches && wget -P /mtproxy/patches https://raw.githubusercontent.com/alexdoesh/mtproxy/master/patches/randr_compat.patch \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
&& cd /mtproxy/sources && patch -p0 -i /mtproxy/patches/randr_compat.patch \
|
git \
|
||||||
&& make \
|
build-essential \
|
||||||
&& mkdir /root/.ssh \
|
libssl-dev \
|
||||||
&& cp /mtproxy/sources/objs/bin/mtproto-proxy /usr/bin \
|
zlib1g-dev \
|
||||||
&& rm -rf /mtproxy \
|
ca-certificates \
|
||||||
&& apk del .build-deps\
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
&& apk add --no-cache --update curl openssh \
|
|
||||||
&& ln -s /usr/lib/libcrypto.so.41 /usr/lib/libcrypto.so.1.0.0
|
WORKDIR /src
|
||||||
ENV ENV="/root/.ashrc"
|
RUN git clone --single-branch --depth 1 https://github.com/GetPageSpeed/MTProxy . \
|
||||||
|
&& make -j$(nproc) \
|
||||||
|
&& strip objs/bin/mtproto-proxy
|
||||||
|
|
||||||
|
# Runtime stage - minimal Ubuntu
|
||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
libssl3 \
|
||||||
|
zlib1g \
|
||||||
|
curl \
|
||||||
|
openssh-client \
|
||||||
|
openssh-server \
|
||||||
|
ca-certificates \
|
||||||
|
vim-common \
|
||||||
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
|
&& mkdir -p /root/.ssh /var/run/sshd
|
||||||
|
|
||||||
|
COPY --from=builder /src/objs/bin/mtproto-proxy /usr/local/bin/mtproto-proxy
|
||||||
|
|
||||||
|
ENV PATH="/usr/local/bin:$PATH"
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
FROM ubuntu:22.04
|
FROM ubuntu:22.04
|
||||||
RUN apt update && apt install -y curl gpg socat jq lsb-release openssh-server \
|
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
curl \
|
||||||
|
gpg \
|
||||||
|
socat \
|
||||||
|
jq \
|
||||||
|
lsb-release \
|
||||||
|
openssh-server \
|
||||||
|
ca-certificates \
|
||||||
&& curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg \
|
&& 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 \
|
&& echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/cloudflare-client.list \
|
||||||
&& apt update && apt install -y cloudflare-warp \
|
&& apt-get update && apt-get install -y --no-install-recommends cloudflare-warp \
|
||||||
&& mkdir /root/.ssh
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
|
||||||
|
&& mkdir -p /root/.ssh /var/run/sshd
|
||||||
|
|||||||
@@ -47,15 +47,11 @@ oc: # консоль сервиса
|
|||||||
docker compose exec oc /bin/sh
|
docker compose exec oc /bin/sh
|
||||||
service: # консоль сервиса
|
service: # консоль сервиса
|
||||||
docker compose exec service /bin/sh
|
docker compose exec service /bin/sh
|
||||||
clean:
|
delete:
|
||||||
docker image prune
|
make d
|
||||||
docker builder prune
|
docker system prune -f -a
|
||||||
cleanf:
|
docker volume prune -f -a
|
||||||
docker image prune -f > /dev/null
|
rm -rf /root/vpnbot
|
||||||
docker builder prune -f > /dev/null
|
|
||||||
cleanall:
|
|
||||||
docker image prune -a -f
|
|
||||||
docker builder prune -a -f
|
|
||||||
push:
|
push:
|
||||||
docker compose push
|
docker compose push
|
||||||
s:
|
s:
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
cat /ssh/key.pub > /root/.ssh/authorized_keys
|
cat /ssh/key.pub > /root/.ssh/authorized_keys
|
||||||
ssh-keygen -A
|
ssh-keygen -A
|
||||||
exec /usr/sbin/sshd -D -e "$@" &
|
exec /usr/sbin/sshd -D -e "$@" &
|
||||||
hysteria server -c /config/hysteria.yaml &
|
|
||||||
tail -f /dev/null
|
tail -f /dev/null
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
echo 'root:dummy_passwd'|chpasswd
|
|
||||||
cat /ssh/key.pub > /root/.ssh/authorized_keys
|
cat /ssh/key.pub > /root/.ssh/authorized_keys
|
||||||
ssh-keygen -A
|
ssh-keygen -A
|
||||||
exec /usr/sbin/sshd -D -e "$@" &
|
exec /usr/sbin/sshd -D -e "$@" &
|
||||||
|
|||||||
+4
-2
@@ -14,7 +14,8 @@ then
|
|||||||
echo "ListenPort = $WG1PORT" >> /etc/wireguard/wg0.conf
|
echo "ListenPort = $WG1PORT" >> /etc/wireguard/wg0.conf
|
||||||
else
|
else
|
||||||
sed "s/ListenPort = [0-9]\+/ListenPort = $WG1PORT/" /etc/wireguard/wg0.conf > change_port
|
sed "s/ListenPort = [0-9]\+/ListenPort = $WG1PORT/" /etc/wireguard/wg0.conf > change_port
|
||||||
cat change_port > /etc/wireguard/wg0.conf
|
sed "s|Address = [0-9\.\/ ]\+|Address = $ADDRESS|" change_port > change_address
|
||||||
|
cat change_address > /etc/wireguard/wg0.conf
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
|
if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
|
||||||
@@ -26,7 +27,8 @@ else
|
|||||||
echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
|
echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
|
||||||
else
|
else
|
||||||
sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
|
sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
|
||||||
cat change_port > /etc/wireguard/wg0.conf
|
sed "s|Address = [0-9\.\/ ]\+|Address = $ADDRESS|" change_port > change_address
|
||||||
|
cat change_address > /etc/wireguard/wg0.conf
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT
|
iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT
|
||||||
|
|||||||
@@ -1,3 +1,26 @@
|
|||||||
|
27.03.2026 v2.30
|
||||||
|
- возможность понижать амнезию до 1
|
||||||
|
10.03.2026 v2.29
|
||||||
|
- amnezia 2.0
|
||||||
|
16.12.2025 v2.28.1
|
||||||
|
- фикс шаблона mihomo
|
||||||
|
15.12.2025 v2.28
|
||||||
|
- новый MTProto
|
||||||
|
- hysteria
|
||||||
|
- dnstt (вместо iodine)
|
||||||
|
- xhttp-vless by legiz
|
||||||
|
- возможность отключать поддомены для naive и openconnect (через установку поддомена в 0)
|
||||||
|
- возможность отключать naive и openconnect (через установку пароля в 0)
|
||||||
|
- возможность указывать айпишники в списках block, warp
|
||||||
|
- быстрая команда для добавления бота в крон: make cron
|
||||||
|
- увиличены тайминги пула рулсетов
|
||||||
|
- увиличен тайминг сбора статы с xray-ядра
|
||||||
|
- улучшено логирование: ssh не срет в контейнер, а основной процесс пишет в /logs
|
||||||
|
- улучшены кроны autobackup, autoscan, autoreset
|
||||||
|
- фикс старта upstream
|
||||||
|
- фикс шорт-ссылки для амнезии
|
||||||
|
- фикс папки override для своих заглушек
|
||||||
|
- фикс сброса страницы в списках route
|
||||||
09.11.2025 v2.27
|
09.11.2025 v2.27
|
||||||
- фикс reality
|
- фикс reality
|
||||||
08.11.2025 v2.26
|
08.11.2025 v2.26
|
||||||
|
|||||||
Reference in New Issue
Block a user