Compare commits
94 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e1f14d85e0 | |||
| dc65e65e20 | |||
| 486a2c5959 | |||
| 39643bf681 | |||
| 5f1fc6d912 | |||
| 0538d04397 | |||
| af9933676d | |||
| 7bfebe8096 | |||
| ae61a38dbc | |||
| e727f6552c | |||
| cfd500d48a | |||
| ff87ee1055 | |||
| 3375293be5 | |||
| 6e5f198e23 | |||
| b10aaff459 | |||
| 3271561418 | |||
| 295ee6f2aa | |||
| 7ce7c56c1b | |||
| dca34de723 | |||
| eb1ad21c88 | |||
| a3ca7d9ed8 | |||
| 60ba3cf15c | |||
| cd8bcbe05a | |||
| 6cc05c88e7 | |||
| 795c357897 | |||
| e172868f39 | |||
| 4ef38775b0 | |||
| abdb4d791a | |||
| 6948239144 | |||
| ff0fd177c7 | |||
| 28e66d46fd | |||
| edee9c78c5 | |||
| 6ad8b3aa92 | |||
| 31f1825d37 | |||
| 10d84da53e | |||
| c7cc0f31ad | |||
| e3ddb642d7 | |||
| 589823e45d | |||
| 0364188fe8 | |||
| 72edcc4757 | |||
| 5988c4fcee | |||
| a82147eeda | |||
| 6bd21d06c0 | |||
| 3416cda826 | |||
| 2e40daf0c4 | |||
| 9c40b04392 | |||
| 1217ea7a09 | |||
| 7f6d462f22 | |||
| 47876ecdb4 | |||
| 66f03709fc | |||
| 42aafc6427 | |||
| 1674f6929e | |||
| 5791cabfb5 | |||
| 49d2d21f41 | |||
| 5263de514e | |||
| 9da810ba3d | |||
| b663eca445 | |||
| f8f95e22ac | |||
| 30f0f8c5f0 | |||
| 741f402ca1 | |||
| ef3d40c098 | |||
| ded85fb79f | |||
| b5ca5fbf93 | |||
| 570420274e | |||
| baaf0e2d01 | |||
| be8bec6a7d | |||
| acaec83877 | |||
| 8cf6c512cb | |||
| 880a8de7e5 | |||
| 9662fc9d55 | |||
| 561bcb7023 | |||
| 9d7c735f79 | |||
| 8091eb4971 | |||
| 967353bcd6 | |||
| 9f218c9f32 | |||
| 6a6bd3a4d2 | |||
| bc8b0ff033 | |||
| 624713347a | |||
| 52738c0491 | |||
| 277b00da87 | |||
| 455b9cea07 | |||
| 88f8c1c4c2 | |||
| 6017bc4008 | |||
| 6631ea5cc2 | |||
| 09d49fd0fb | |||
| 6766a56440 | |||
| 0c3a6cc90e | |||
| 4fb039ffc4 | |||
| 0b7ae110fc | |||
| c0750c930a | |||
| 45e1455d48 | |||
| 7582dc50c2 | |||
| bb1ac60acc | |||
| 256e43352a |
+2
-1
@@ -19,4 +19,5 @@ mirror/.env
|
|||||||
update/*
|
update/*
|
||||||
!update/update.sh
|
!update/update.sh
|
||||||
|
|
||||||
override.env
|
override.env
|
||||||
|
override.html
|
||||||
+1121
-192
File diff suppressed because it is too large
Load Diff
+12
-4
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
$i = [
|
$i = [
|
||||||
'warp' => [
|
'warp' => [
|
||||||
'en' => 'Warp',
|
'en' => 'warp',
|
||||||
'ru' => 'Warp',
|
'ru' => 'warp',
|
||||||
],
|
],
|
||||||
'wg_title' => [
|
'wg_title' => [
|
||||||
'en' => 'Wireguard',
|
'en' => 'Wireguard',
|
||||||
@@ -241,6 +241,10 @@ $i = [
|
|||||||
'en' => 'defaultDNS',
|
'en' => 'defaultDNS',
|
||||||
'ru' => 'дефолтный днс',
|
'ru' => 'дефолтный днс',
|
||||||
],
|
],
|
||||||
|
'defaultMTU' => [
|
||||||
|
'en' => 'defaultMTU',
|
||||||
|
'ru' => 'дефолтный MTU',
|
||||||
|
],
|
||||||
'debug' => [
|
'debug' => [
|
||||||
'en' => 'debug mode',
|
'en' => 'debug mode',
|
||||||
'ru' => 'режим отладки',
|
'ru' => 'режим отладки',
|
||||||
@@ -258,8 +262,8 @@ $i = [
|
|||||||
'ru' => 'очистить',
|
'ru' => 'очистить',
|
||||||
],
|
],
|
||||||
'xray' => [
|
'xray' => [
|
||||||
'en' => 'XTLS-Reality',
|
'en' => 'Xray',
|
||||||
'ru' => 'XTLS-Reality',
|
'ru' => 'Xray',
|
||||||
],
|
],
|
||||||
'geodb' => [
|
'geodb' => [
|
||||||
'en' => 'GeoIp/GeoSite',
|
'en' => 'GeoIp/GeoSite',
|
||||||
@@ -333,4 +337,8 @@ $i = [
|
|||||||
'en' => '🟢 have updates',
|
'en' => '🟢 have updates',
|
||||||
'ru' => '🟢 есть обновления',
|
'ru' => '🟢 есть обновления',
|
||||||
],
|
],
|
||||||
|
'fake html' => [
|
||||||
|
'en' => 'fake html',
|
||||||
|
'ru' => 'фейк заглушка',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
+6
-3
@@ -17,10 +17,13 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// pac
|
// 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';
|
$address = $_GET['a'] ?: '127.0.0.1';
|
||||||
$port = $_GET['p'] ?: '1080';
|
$port = $_GET['p'] ?: '1080';
|
||||||
$hash = $_GET['h'];
|
$hash = $_GET['h'];
|
||||||
if ($hash == substr(md5($c['key']), 0, 8)) {
|
if ($hash == substr(md5($c['key']), 0, 8)) {
|
||||||
require __DIR__ . '/bot.php';
|
require __DIR__ . '/bot.php';
|
||||||
require __DIR__ . '/i18n.php';
|
require __DIR__ . '/i18n.php';
|
||||||
|
|||||||
+12
-6
@@ -89,11 +89,14 @@ function start()
|
|||||||
|
|
||||||
$conf = $bot->getPacConf();
|
$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
|
// check && exclude
|
||||||
$include = array_filter($conf['includelist'], fn($x) => $x == true);
|
if (!empty($conf['includelist'])) {
|
||||||
$domains = $include;
|
$domains = array_filter($conf['includelist'], fn($x) => $x == true);
|
||||||
|
}
|
||||||
if (empty($domains)) {
|
if (empty($domains)) {
|
||||||
$text = "Empty domains. Delete pac files";
|
$text = "Empty domains. Delete pac files";
|
||||||
unlink(__DIR__ . '/zapretlists/mpac');
|
unlink(__DIR__ . '/zapretlists/mpac');
|
||||||
@@ -146,10 +149,13 @@ function start()
|
|||||||
file_put_contents(__DIR__ . '/zapretlists/pac', $pac);
|
file_put_contents(__DIR__ . '/zapretlists/pac', $pac);
|
||||||
$text .= "Create minified pac 100%\n";
|
$text .= "Create minified pac 100%\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
// create reverse PAC
|
// 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)) {
|
if (empty($domains)) {
|
||||||
|
|
||||||
// $text .= "Empty reverse domains. Delete reverse pac files";
|
// $text .= "Empty reverse domains. Delete reverse pac files";
|
||||||
unlink(__DIR__ . '/zapretlists/rmpac');
|
unlink(__DIR__ . '/zapretlists/rmpac');
|
||||||
unlink(__DIR__ . '/zapretlists/rpac');
|
unlink(__DIR__ . '/zapretlists/rpac');
|
||||||
@@ -197,6 +203,7 @@ function start()
|
|||||||
file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
|
file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
|
||||||
$text .= 'Create minified reverse pac 100%';
|
$text .= 'Create minified reverse pac 100%';
|
||||||
}
|
}
|
||||||
|
|
||||||
endScript($text);
|
endScript($text);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -242,7 +249,6 @@ $load = [
|
|||||||
'-',
|
'-',
|
||||||
'\\',
|
'\\',
|
||||||
];
|
];
|
||||||
|
|
||||||
switch ($_SERVER['argv'][1]) {
|
switch ($_SERVER['argv'][1]) {
|
||||||
case 'start':
|
case 'start':
|
||||||
$bot = new Bot($c['key'], $i);
|
$bot = new Bot($c['key'], $i);
|
||||||
|
|||||||
+47
-2
@@ -31,7 +31,7 @@ http {
|
|||||||
|
|
||||||
location / {
|
location / {
|
||||||
root /app;
|
root /app;
|
||||||
index login.html;
|
index override.html login.html;
|
||||||
try_files $uri $uri/ =404;
|
try_files $uri $uri/ =404;
|
||||||
}
|
}
|
||||||
location /adguard/ {
|
location /adguard/ {
|
||||||
@@ -48,6 +48,7 @@ http {
|
|||||||
}
|
}
|
||||||
location /pac {
|
location /pac {
|
||||||
access_log /logs/nginx_pac_access;
|
access_log /logs/nginx_pac_access;
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
proxy_pass http://php;
|
proxy_pass http://php;
|
||||||
}
|
}
|
||||||
location /tlgrm {
|
location /tlgrm {
|
||||||
@@ -64,6 +65,38 @@ http {
|
|||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "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 {
|
location ~\.well-known {
|
||||||
access_log /logs/nginx_certbot_access;
|
access_log /logs/nginx_certbot_access;
|
||||||
root /certs/;
|
root /certs/;
|
||||||
@@ -90,7 +123,7 @@ http {
|
|||||||
|
|
||||||
# location / {
|
# location / {
|
||||||
# root /app;
|
# root /app;
|
||||||
# index login.html;
|
# index override.html login.html;
|
||||||
# try_files $uri $uri/ =404;
|
# try_files $uri $uri/ =404;
|
||||||
# }
|
# }
|
||||||
# location /adguard/ {
|
# location /adguard/ {
|
||||||
@@ -107,6 +140,7 @@ http {
|
|||||||
# }
|
# }
|
||||||
# location /pac {
|
# location /pac {
|
||||||
# access_log /logs/nginx_pac_access;
|
# access_log /logs/nginx_pac_access;
|
||||||
|
# proxy_set_header Host $http_host;
|
||||||
# proxy_pass http://php;
|
# proxy_pass http://php;
|
||||||
# }
|
# }
|
||||||
# location ~\.well-known {
|
# location ~\.well-known {
|
||||||
@@ -124,6 +158,17 @@ http {
|
|||||||
# proxy_set_header Upgrade $http_upgrade;
|
# proxy_set_header Upgrade $http_upgrade;
|
||||||
# proxy_set_header Connection "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
|
#-domain
|
||||||
#-ssl
|
#-ssl
|
||||||
# # The DoH server block
|
# # The DoH server block
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ http {
|
|||||||
|
|
||||||
location / {
|
location / {
|
||||||
root /app;
|
root /app;
|
||||||
index login.html;
|
index override.html login.html;
|
||||||
try_files $uri $uri/ =404;
|
try_files $uri $uri/ =404;
|
||||||
}
|
}
|
||||||
location /adguard/ {
|
location /adguard/ {
|
||||||
@@ -48,6 +48,7 @@ http {
|
|||||||
}
|
}
|
||||||
location /pac {
|
location /pac {
|
||||||
access_log /logs/nginx_pac_access;
|
access_log /logs/nginx_pac_access;
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
proxy_pass http://php;
|
proxy_pass http://php;
|
||||||
}
|
}
|
||||||
location /tlgrm {
|
location /tlgrm {
|
||||||
@@ -64,6 +65,38 @@ http {
|
|||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "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 {
|
location ~\.well-known {
|
||||||
access_log /logs/nginx_certbot_access;
|
access_log /logs/nginx_certbot_access;
|
||||||
root /certs/;
|
root /certs/;
|
||||||
@@ -90,7 +123,7 @@ http {
|
|||||||
|
|
||||||
# location / {
|
# location / {
|
||||||
# root /app;
|
# root /app;
|
||||||
# index login.html;
|
# index override.html login.html;
|
||||||
# try_files $uri $uri/ =404;
|
# try_files $uri $uri/ =404;
|
||||||
# }
|
# }
|
||||||
# location /adguard/ {
|
# location /adguard/ {
|
||||||
@@ -107,6 +140,7 @@ http {
|
|||||||
# }
|
# }
|
||||||
# location /pac {
|
# location /pac {
|
||||||
# access_log /logs/nginx_pac_access;
|
# access_log /logs/nginx_pac_access;
|
||||||
|
# proxy_set_header Host $http_host;
|
||||||
# proxy_pass http://php;
|
# proxy_pass http://php;
|
||||||
# }
|
# }
|
||||||
# location ~\.well-known {
|
# location ~\.well-known {
|
||||||
@@ -124,6 +158,17 @@ http {
|
|||||||
# proxy_set_header Upgrade $http_upgrade;
|
# proxy_set_header Upgrade $http_upgrade;
|
||||||
# proxy_set_header Connection "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
|
#-domain
|
||||||
#-ssl
|
#-ssl
|
||||||
# # The DoH server block
|
# # The DoH server block
|
||||||
|
|||||||
+37
-1
@@ -110,19 +110,55 @@
|
|||||||
"protocol": "dns",
|
"protocol": "dns",
|
||||||
"outbound": "dns-out"
|
"outbound": "dns-out"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"package_name": [
|
||||||
|
],
|
||||||
|
"outbound": "proxy"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"process_name": [
|
||||||
|
],
|
||||||
|
"outbound": "proxy"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"createruleset": [
|
"createruleset": [
|
||||||
{
|
{
|
||||||
"name": "selfpac",
|
"name": "block",
|
||||||
|
"interval": "15s",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"domain_suffix": "~block~"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outbound": "block"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"createruleset": [
|
||||||
|
{
|
||||||
|
"name": "pac",
|
||||||
"interval": "15s",
|
"interval": "15s",
|
||||||
"rules": [
|
"rules": [
|
||||||
{
|
{
|
||||||
"domain_suffix": "~pac~"
|
"domain_suffix": "~pac~"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "warp",
|
||||||
|
"interval": "15s",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"domain_suffix": "~warp~"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"outbound": "proxy"
|
"outbound": "proxy"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"outbound": "direct"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"final": "direct"
|
"final": "direct"
|
||||||
|
|||||||
+11
-8
@@ -19,7 +19,7 @@ volumes:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
up:
|
up:
|
||||||
image: mercurykd/vpnbot-up:1.1
|
image: mercurykd/vpnbot-ng:1.1
|
||||||
build:
|
build:
|
||||||
context: dockerfile
|
context: dockerfile
|
||||||
dockerfile: nginx.dockerfile
|
dockerfile: nginx.dockerfile
|
||||||
@@ -191,7 +191,7 @@ services:
|
|||||||
- oc
|
- oc
|
||||||
- np
|
- np
|
||||||
proxy:
|
proxy:
|
||||||
image: mercurykd/vpnbot-ss:1.1
|
image: mercurykd/vpnbot-ss:1.2
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/shadowsocks.dockerfile
|
dockerfile: dockerfile/shadowsocks.dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -338,7 +338,7 @@ services:
|
|||||||
entrypoint: ["/bin/sh", "/start_ad.sh"]
|
entrypoint: ["/bin/sh", "/start_ad.sh"]
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
ss:
|
ss:
|
||||||
image: mercurykd/vpnbot-ss:1.1
|
image: mercurykd/vpnbot-ss:1.2
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/shadowsocks.dockerfile
|
dockerfile: dockerfile/shadowsocks.dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -399,7 +399,7 @@ services:
|
|||||||
ipv4_address: 10.10.0.8
|
ipv4_address: 10.10.0.8
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
xr:
|
xr:
|
||||||
image: mercurykd/vpnbot-xr:1.2
|
image: mercurykd/vpnbot-xr:1.3
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/xray.dockerfile
|
dockerfile: dockerfile/xray.dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -493,7 +493,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.1
|
image: mercurykd/vpnbot-wp:1.2
|
||||||
build:
|
build:
|
||||||
dockerfile: dockerfile/warp.dockerfile
|
dockerfile: dockerfile/warp.dockerfile
|
||||||
args:
|
args:
|
||||||
@@ -503,7 +503,7 @@ services:
|
|||||||
devices:
|
devices:
|
||||||
- /dev/net/tun:/dev/net/tun
|
- /dev/net/tun:/dev/net/tun
|
||||||
volumes:
|
volumes:
|
||||||
- ./config/.profile:/root/.bashrc:ro
|
- ./config/.profile:/root/.ashrc:ro
|
||||||
- ./ssh:/ssh
|
- ./ssh:/ssh
|
||||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||||
- ./config:/config
|
- ./config:/config
|
||||||
@@ -514,8 +514,11 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
php:
|
php:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
environment:
|
env_file:
|
||||||
TZ: ${TZ}
|
- path: ./.env
|
||||||
|
required: true # default
|
||||||
|
- path: ./override.env
|
||||||
|
required: false
|
||||||
stop_grace_period: 1s
|
stop_grace_period: 1s
|
||||||
command: ["/bin/sh", "/start_wp.sh"]
|
command: ["/bin/sh", "/start_wp.sh"]
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -2,16 +2,16 @@ ARG image
|
|||||||
FROM $image
|
FROM $image
|
||||||
RUN apk add openssh git xz \
|
RUN apk add openssh git xz \
|
||||||
&& mkdir /root/.ssh \
|
&& 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 \
|
&& 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-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
|
&& tar -xf shadowsocks-rust.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 \
|
&& 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-v5.7.0.tar.gz \
|
&& tar -xf v2ray-plugin-linux-amd64.tar.gz \
|
||||||
&& mv sslocal /usr/bin/ \
|
&& mv sslocal /usr/bin/ \
|
||||||
&& mv ssserver /usr/bin/ \
|
&& mv ssserver /usr/bin/ \
|
||||||
&& mv ssmanager /usr/bin/ \
|
&& mv ssmanager /usr/bin/ \
|
||||||
&& mv ssservice /usr/bin/ \
|
&& mv ssservice /usr/bin/ \
|
||||||
&& mv ssurl /usr/bin/ \
|
&& mv ssurl /usr/bin/ \
|
||||||
&& mv v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \
|
&& mv v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \
|
||||||
&& rm v2ray-plugin-linux-amd64-v5.7.0.tar.gz\
|
&& rm v2ray-plugin-linux-amd64.tar.gz \
|
||||||
&& rm shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz
|
&& rm shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz
|
||||||
ENV ENV="/root/.ashrc"
|
ENV ENV="/root/.ashrc"
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
FROM ubuntu:22.04
|
FROM ubuntu:22.04 AS build
|
||||||
RUN apt update && apt install -y curl gpg socat jq lsb-release openssh-server \
|
RUN apt update && apt install -y curl gpg lsb-release \
|
||||||
&& 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" | tee /etc/apt/sources.list.d/cloudflare-client.list \
|
||||||
&& apt update && apt install -y cloudflare-warp \
|
&& 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 \
|
||||||
&& mkdir /root/.ssh
|
&& mkdir /root/.ssh
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
ARG image
|
ARG image
|
||||||
FROM $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 \
|
&& 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-go \
|
||||||
&& git clone https://github.com/amnezia-vpn/amneziawg-tools.git \
|
&& git clone https://github.com/amnezia-vpn/amneziawg-tools.git \
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ ARG image
|
|||||||
FROM $image
|
FROM $image
|
||||||
RUN apk add openssh openssl jq \
|
RUN apk add openssh openssl jq \
|
||||||
&& mkdir /root/.ssh \
|
&& 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 \
|
&& unzip Xray-linux-64.zip \
|
||||||
&& mv xray /usr/bin/ \
|
&& mv xray /usr/bin/ \
|
||||||
&& rm Xray-linux-64.zip \
|
&& rm Xray-linux-64.zip \
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ b:
|
|||||||
u: # запуск контейнеров
|
u: # запуск контейнеров
|
||||||
bash ./update/update.sh &
|
bash ./update/update.sh &
|
||||||
touch ./override.env
|
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: # остановка контейнеров
|
d: # остановка контейнеров
|
||||||
-kill -9 $(shell cat ./update/update_pid) > /dev/null
|
-kill -9 $(shell cat ./update/update_pid) > /dev/null
|
||||||
docker compose down --remove-orphans
|
docker compose down --remove-orphans
|
||||||
@@ -31,7 +31,7 @@ up: # консоль сервиса
|
|||||||
ad: # консоль сервиса
|
ad: # консоль сервиса
|
||||||
docker compose exec ad /bin/sh
|
docker compose exec ad /bin/sh
|
||||||
wp: # консоль сервиса
|
wp: # консоль сервиса
|
||||||
docker compose exec wp bash
|
docker compose exec wp /bin/sh
|
||||||
proxy: # консоль сервиса
|
proxy: # консоль сервиса
|
||||||
docker compose exec proxy /bin/sh
|
docker compose exec proxy /bin/sh
|
||||||
tg: # консоль сервиса
|
tg: # консоль сервиса
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+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:]') \
|
"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
|
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
|
||||||
apt update
|
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
|
git clone https://github.com/mercurykd/vpnbot.git
|
||||||
cd ./vpnbot
|
cd ./vpnbot
|
||||||
echo "<?php
|
echo "<?php
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+13
-10
@@ -1,15 +1,18 @@
|
|||||||
cat /ssh/key.pub > /root/.ssh/authorized_keys
|
cat /ssh/key.pub > /root/.ssh/authorized_keys
|
||||||
echo 'HostKeyAlgorithms +ssh-rsa' >> /etc/ssh/sshd_config
|
ssh-keygen -A
|
||||||
echo 'PubkeyAcceptedKeyTypes +ssh-rsa' >> /etc/ssh/sshd_config
|
exec /usr/sbin/sshd -D -e "$@" &
|
||||||
service ssh start
|
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)
|
key=$(cat /config/pac.json | jq -r .warp)
|
||||||
if [ ! -z "$key" ]
|
if [ "$off" == 'null' ]
|
||||||
then
|
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
|
fi
|
||||||
warp-cli --accept-tos mode proxy
|
|
||||||
warp-cli --accept-tos connect
|
|
||||||
socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000
|
socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000
|
||||||
|
|||||||
Regular → Executable
@@ -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
|
|
||||||
Regular → Executable
+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": "применяю обновления"/')"
|
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
|
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": "запускаю бота"/')"
|
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 &
|
bash $pwd/update/update.sh &
|
||||||
> $pwd/update/key
|
> $pwd/update/key
|
||||||
> $pwd/update/curl
|
> $pwd/update/curl
|
||||||
|
|||||||
@@ -1,3 +1,92 @@
|
|||||||
|
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
|
||||||
|
- warp на образе alpine (thx @zmeyzloy)
|
||||||
|
- фикс выбора шаблона singbox
|
||||||
22.04.2024 v1.35
|
22.04.2024 v1.35
|
||||||
- очистка старых образов
|
- очистка старых образов
|
||||||
19.04.2024 v1.34
|
19.04.2024 v1.34
|
||||||
|
|||||||
Reference in New Issue
Block a user