Compare commits
50 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 mercury
|
dc65e65e20 | ||
|
mercury
|
486a2c5959 | ||
|
mercury
|
39643bf681 | ||
|
mercury
|
5f1fc6d912 | ||
|
mercury
|
0538d04397 | ||
|
mercury
|
af9933676d | ||
|
mercury
|
7bfebe8096 | ||
|
mercury
|
ae61a38dbc | ||
|
mercury
|
e727f6552c | ||
|
mercury
|
cfd500d48a | ||
|
mercury
|
ff87ee1055 | ||
|
mercury
|
3375293be5 | ||
|
mercury
|
6e5f198e23 | ||
|
mercury
|
b10aaff459 | ||
|
mercury
|
3271561418 | ||
|
mercury
|
295ee6f2aa | ||
|
mercury
|
7ce7c56c1b | ||
|
mercury
|
dca34de723 | ||
|
mercury
|
eb1ad21c88 | ||
|
mercury
|
a3ca7d9ed8 | ||
|
mercury
|
60ba3cf15c | ||
|
mercury
|
cd8bcbe05a | ||
|
mercury
|
6cc05c88e7 | ||
|
mercury
|
795c357897 | ||
|
mercury
|
e172868f39 | ||
|
mercury
|
4ef38775b0 | ||
|
mercury
|
abdb4d791a | ||
|
mercury
|
6948239144 | ||
|
mercury
|
ff0fd177c7 | ||
|
mercury
|
28e66d46fd | ||
|
mercury
|
edee9c78c5 | ||
|
mercury
|
6ad8b3aa92 | ||
|
mercury
|
31f1825d37 | ||
|
mercury
|
10d84da53e | ||
|
mercury
|
c7cc0f31ad | ||
|
mercury
|
e3ddb642d7 | ||
|
mercury
|
589823e45d | ||
|
mercury
|
0364188fe8 | ||
|
mercury
|
72edcc4757 | ||
|
mercury
|
5988c4fcee | ||
|
mercury
|
a82147eeda | ||
|
mercury
|
6bd21d06c0 | ||
|
mercury
|
3416cda826 | ||
|
mercury
|
2e40daf0c4 | ||
|
mercury
|
9c40b04392 | ||
|
mercury
|
1217ea7a09 | ||
|
mercury
|
7f6d462f22 | ||
|
mercury
|
47876ecdb4 | ||
|
mercury
|
66f03709fc | ||
|
mercury
|
1674f6929e |
+2
-1
@@ -19,4 +19,5 @@ mirror/.env
|
||||
update/*
|
||||
!update/update.sh
|
||||
|
||||
override.env
|
||||
override.env
|
||||
override.html
|
||||
+547
-103
File diff suppressed because it is too large
Load Diff
+6
-2
@@ -262,8 +262,8 @@ $i = [
|
||||
'ru' => 'очистить',
|
||||
],
|
||||
'xray' => [
|
||||
'en' => 'XTLS-Reality',
|
||||
'ru' => 'XTLS-Reality',
|
||||
'en' => 'Xray',
|
||||
'ru' => 'Xray',
|
||||
],
|
||||
'geodb' => [
|
||||
'en' => 'GeoIp/GeoSite',
|
||||
@@ -337,4 +337,8 @@ $i = [
|
||||
'en' => '🟢 have updates',
|
||||
'ru' => '🟢 есть обновления',
|
||||
],
|
||||
'fake html' => [
|
||||
'en' => 'fake html',
|
||||
'ru' => 'фейк заглушка',
|
||||
],
|
||||
];
|
||||
|
||||
+47
-2
@@ -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
|
||||
|
||||
+14
-14
@@ -110,6 +110,20 @@
|
||||
"protocol": "dns",
|
||||
"outbound": "dns-out"
|
||||
},
|
||||
{
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "block",
|
||||
"interval": "15s",
|
||||
"rules": [
|
||||
{
|
||||
"domain_suffix": "~block~"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"outbound": "block"
|
||||
},
|
||||
{
|
||||
"createruleset": [
|
||||
{
|
||||
@@ -133,20 +147,6 @@
|
||||
],
|
||||
"outbound": "proxy"
|
||||
},
|
||||
{
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "block",
|
||||
"interval": "15s",
|
||||
"rules": [
|
||||
{
|
||||
"domain_suffix": "~block~"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"outbound": "block"
|
||||
},
|
||||
{
|
||||
"outbound": "direct"
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ b:
|
||||
u: # запуск контейнеров
|
||||
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
|
||||
IP=$(shell curl 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
|
||||
|
||||
+5
-1
@@ -16,7 +16,11 @@ 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
|
||||
apt install -y docker-ce docker-ce-cli containerd.io
|
||||
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
|
||||
|
||||
+11
-7
@@ -1,14 +1,18 @@
|
||||
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
|
||||
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
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
winsw3.exe install
|
||||
pause
|
||||
@@ -1,2 +0,0 @@
|
||||
winsw3.exe stop
|
||||
winsw3.exe start
|
||||
Binary file not shown.
Binary file not shown.
@@ -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
|
||||
+1
-1
@@ -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 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,68 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user