Compare commits
77 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ddcaea751f | |||
| ce8cdac7c7 | |||
| 00aae6c2f7 | |||
| 89c0139ef6 | |||
| c57053c8a0 | |||
| 3cc16469ff | |||
| e06544b00f | |||
| c5b7e1ffdc | |||
| 7d21937f04 | |||
| 16138648ca | |||
| ced10f22fa | |||
| 18a4ee39fb | |||
| 4f4777b5ef | |||
| dee90b1f4f | |||
| 01571f50e6 | |||
| 4998893234 | |||
| 95f92791b1 | |||
| cedfb66ca0 | |||
| 6215836926 | |||
| 842d76261a | |||
| 4c63ae669a | |||
| bba1ec9e17 | |||
| a798df0fd3 | |||
| d225e7c039 | |||
| 3b9b930b48 | |||
| bd17e5cd14 | |||
| c3975549db | |||
| 3087bee82d | |||
| 96fbf5a3c3 | |||
| b32bd960fa | |||
| ba0895ea4c | |||
| 68e6e5919d | |||
| 28c5b9d506 | |||
| 9cc42fd34a | |||
| 5eef9581c7 | |||
| 1d9d992361 | |||
| 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 |
+3
-1
@@ -19,4 +19,6 @@ mirror/.env
|
|||||||
update/*
|
update/*
|
||||||
!update/update.sh
|
!update/update.sh
|
||||||
|
|
||||||
override.env
|
override.env
|
||||||
|
override.html
|
||||||
|
override.php
|
||||||
+750
-198
File diff suppressed because it is too large
Load Diff
+1
-2
@@ -7,5 +7,4 @@ require __DIR__ . '/bot.php';
|
|||||||
require __DIR__ . '/config.php';
|
require __DIR__ . '/config.php';
|
||||||
require __DIR__ . '/i18n.php';
|
require __DIR__ . '/i18n.php';
|
||||||
|
|
||||||
$bot = new Bot($c['key'], $i);
|
(new Bot($c['key'], $i))->cron();
|
||||||
$bot->cron();
|
|
||||||
|
|||||||
+10
-2
@@ -262,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',
|
||||||
@@ -337,4 +337,12 @@ $i = [
|
|||||||
'en' => '🟢 have updates',
|
'en' => '🟢 have updates',
|
||||||
'ru' => '🟢 есть обновления',
|
'ru' => '🟢 есть обновления',
|
||||||
],
|
],
|
||||||
|
'fake html' => [
|
||||||
|
'en' => 'fake html',
|
||||||
|
'ru' => 'фейк заглушка',
|
||||||
|
],
|
||||||
|
'expose-iroutes' => [
|
||||||
|
'en' => 'expose-iroutes',
|
||||||
|
'ru' => 'изоляция клиентов',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
|
|||||||
require __DIR__ . '/calc.php';
|
require __DIR__ . '/calc.php';
|
||||||
require __DIR__ . '/bot.php';
|
require __DIR__ . '/bot.php';
|
||||||
require __DIR__ . '/i18n.php';
|
require __DIR__ . '/i18n.php';
|
||||||
|
if (file_exists(__DIR__ . '/override.php')) {
|
||||||
|
include __DIR__ . '/override.php';
|
||||||
|
}
|
||||||
$bot = new Bot($c['key'], $i);
|
$bot = new Bot($c['key'], $i);
|
||||||
$bot->input();
|
$bot->input();
|
||||||
exit;
|
exit;
|
||||||
|
|||||||
+5
-4
@@ -10,8 +10,9 @@ if ($c['debug']) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$bot = new Bot($c['key'], $i);
|
$bot = new Bot($c['key'], $i);
|
||||||
$bot->adguardProtect();
|
$bot->cleanQueue();
|
||||||
$bot->adguardCheckPswd();
|
|
||||||
$bot->setcommands();
|
|
||||||
$bot->syncPortClients();
|
|
||||||
$bot->setwebhook();
|
$bot->setwebhook();
|
||||||
|
$bot->adguardCheckPswd();
|
||||||
|
$bot->adguardProtect();
|
||||||
|
$bot->syncPortClients();
|
||||||
|
$bot->setcommands();
|
||||||
|
|||||||
+2
-26
@@ -12,32 +12,8 @@ if ($c['debug']) {
|
|||||||
|
|
||||||
$bot = new Bot($c['key'], $i);
|
$bot = new Bot($c['key'], $i);
|
||||||
|
|
||||||
if (!empty($c['admin'])) {
|
$bot->selfUpdate();
|
||||||
$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->restartTG();
|
||||||
|
$bot->dontshowcron = 1;
|
||||||
$bot->sslip();
|
$bot->sslip();
|
||||||
$bot->cleanDocker();
|
$bot->cleanDocker();
|
||||||
|
|||||||
@@ -16,5 +16,8 @@ dns:
|
|||||||
tls:
|
tls:
|
||||||
certificate_path: /certs/cert_public
|
certificate_path: /certs/cert_public
|
||||||
private_key_path: /certs/cert_private
|
private_key_path: /certs/cert_private
|
||||||
|
filtering:
|
||||||
|
safe_search:
|
||||||
|
enabled: false
|
||||||
log:
|
log:
|
||||||
file: /logs/adguard
|
file: /logs/adguard
|
||||||
|
|||||||
+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
|
||||||
|
|||||||
+2
-2
@@ -180,7 +180,7 @@ server-key = /certs/cert_private
|
|||||||
# the isolation was tested at. If you get random failures on worker processes, try
|
# 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
|
# disabling that option and report the failures you, along with system and debugging
|
||||||
# information at: https://gitlab.com/openconnect/ocserv/issues
|
# information at: https://gitlab.com/openconnect/ocserv/issues
|
||||||
isolate-workers = true
|
isolate-workers = false
|
||||||
|
|
||||||
# A banner to be displayed on clients after connection
|
# A banner to be displayed on clients after connection
|
||||||
#banner = "Welcome"
|
#banner = "Welcome"
|
||||||
@@ -584,7 +584,7 @@ route = default
|
|||||||
# When set to true, all client's iroutes are made visible to all
|
# When set to true, all client's iroutes are made visible to all
|
||||||
# connecting clients except for the ones offering them. This option
|
# connecting clients except for the ones offering them. This option
|
||||||
# only makes sense if config-per-user is set.
|
# only makes sense if config-per-user is set.
|
||||||
#expose-iroutes = true
|
expose-iroutes = false
|
||||||
|
|
||||||
# Groups that a client is allowed to select from.
|
# Groups that a client is allowed to select from.
|
||||||
# A client may belong in multiple groups, and in certain use-cases
|
# A client may belong in multiple groups, and in certain use-cases
|
||||||
|
|||||||
+1
-99
@@ -1,99 +1 @@
|
|||||||
{
|
{}
|
||||||
"zapret": false,
|
|
||||||
"excludelist": {
|
|
||||||
"(?:v|w)ul(?:c|k)an": true,
|
|
||||||
"^\\d": true,
|
|
||||||
"^a\\w-": true,
|
|
||||||
"^admiral": true,
|
|
||||||
"^avtomaty": true,
|
|
||||||
"^azart": true,
|
|
||||||
"^azimob": true,
|
|
||||||
"^baltplay": true,
|
|
||||||
"a(?:s|z)ino": true,
|
|
||||||
"adrenalin": true,
|
|
||||||
"alco": true,
|
|
||||||
"bet": true,
|
|
||||||
"prostitut": true,
|
|
||||||
"zenit": true,
|
|
||||||
"zerkalo": true,
|
|
||||||
"777": true
|
|
||||||
},
|
|
||||||
"includelist": {},
|
|
||||||
"reverselist": {},
|
|
||||||
"subzoneslist": {
|
|
||||||
"3dn": false,
|
|
||||||
"3nx": true,
|
|
||||||
"akadns": true,
|
|
||||||
"appspot": true,
|
|
||||||
"azurewebsites": true,
|
|
||||||
"beget": true,
|
|
||||||
"berlogovo": true,
|
|
||||||
"biz": true,
|
|
||||||
"brightcove": true,
|
|
||||||
"cc": true,
|
|
||||||
"cloudfront": true,
|
|
||||||
"co": true,
|
|
||||||
"com": true,
|
|
||||||
"cu": true,
|
|
||||||
"ddns": true,
|
|
||||||
"deviantart": true,
|
|
||||||
"dn": true,
|
|
||||||
"dp": true,
|
|
||||||
"dyndns": true,
|
|
||||||
"edgecastcdn": true,
|
|
||||||
"edu": true,
|
|
||||||
"eu": true,
|
|
||||||
"fastly": true,
|
|
||||||
"force": true,
|
|
||||||
"github": true,
|
|
||||||
"google": true,
|
|
||||||
"googleusercontent": true,
|
|
||||||
"gov": true,
|
|
||||||
"herokuapp": true,
|
|
||||||
"hldns": true,
|
|
||||||
"ho": true,
|
|
||||||
"hopto": true,
|
|
||||||
"hwcdn": true,
|
|
||||||
"i": true,
|
|
||||||
"iboards": true,
|
|
||||||
"in": true,
|
|
||||||
"info": true,
|
|
||||||
"int": true,
|
|
||||||
"itch": true,
|
|
||||||
"keenetic": true,
|
|
||||||
"kiev": true,
|
|
||||||
"kirov": true,
|
|
||||||
"linode": true,
|
|
||||||
"livejournal": true,
|
|
||||||
"maryno": true,
|
|
||||||
"mil": true,
|
|
||||||
"msk": true,
|
|
||||||
"my1": true,
|
|
||||||
"mybb2": true,
|
|
||||||
"ne": true,
|
|
||||||
"net": true,
|
|
||||||
"netdna-ssl": true,
|
|
||||||
"nnov": true,
|
|
||||||
"notion": true,
|
|
||||||
"nov": true,
|
|
||||||
"od": true,
|
|
||||||
"org": true,
|
|
||||||
"pp": true,
|
|
||||||
"pximg": true,
|
|
||||||
"pythonanywhere": true,
|
|
||||||
"ru": true,
|
|
||||||
"scaleway": true,
|
|
||||||
"sl": true,
|
|
||||||
"sl-reverse": true,
|
|
||||||
"spb": true,
|
|
||||||
"tilda": true,
|
|
||||||
"trafficmanager": true,
|
|
||||||
"tut": true,
|
|
||||||
"u-stream": true,
|
|
||||||
"ucoz": true,
|
|
||||||
"v": true,
|
|
||||||
"vercel": true,
|
|
||||||
"wix": true,
|
|
||||||
"wixmp": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
+42
-14
@@ -110,6 +110,48 @@
|
|||||||
"protocol": "dns",
|
"protocol": "dns",
|
||||||
"outbound": "dns-out"
|
"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": [
|
"createruleset": [
|
||||||
{
|
{
|
||||||
@@ -133,20 +175,6 @@
|
|||||||
],
|
],
|
||||||
"outbound": "proxy"
|
"outbound": "proxy"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"createruleset": [
|
|
||||||
{
|
|
||||||
"name": "block",
|
|
||||||
"interval": "15s",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"domain_suffix": "~block~"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"outbound": "block"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"outbound": "direct"
|
"outbound": "direct"
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-2
@@ -16,6 +16,7 @@ networks:
|
|||||||
- subnet: 10.10.1.0/24
|
- subnet: 10.10.1.0/24
|
||||||
volumes:
|
volumes:
|
||||||
adguard:
|
adguard:
|
||||||
|
warp:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
up:
|
up:
|
||||||
@@ -33,7 +34,8 @@ services:
|
|||||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||||
- ./logs/:/logs/
|
- ./logs/:/logs/
|
||||||
ports:
|
ports:
|
||||||
- 443:443
|
- 443:443/tcp
|
||||||
|
- 443:443/udp
|
||||||
hostname: upstream
|
hostname: upstream
|
||||||
container_name: upstream-${VER}
|
container_name: upstream-${VER}
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -127,7 +129,7 @@ services:
|
|||||||
required: false
|
required: false
|
||||||
hostname: php
|
hostname: php
|
||||||
container_name: php-${VER}
|
container_name: php-${VER}
|
||||||
restart: unless-stopped
|
# restart: unless-stopped
|
||||||
stop_grace_period: 1s
|
stop_grace_period: 1s
|
||||||
command: ["/bin/sh", "/start_php.sh"]
|
command: ["/bin/sh", "/start_php.sh"]
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
@@ -509,6 +511,7 @@ services:
|
|||||||
- ./config:/config
|
- ./config:/config
|
||||||
- ./certs:/certs
|
- ./certs:/certs
|
||||||
- ./scripts/start_wp.sh:/start_wp.sh
|
- ./scripts/start_wp.sh:/start_wp.sh
|
||||||
|
- warp:/var/lib/cloudflare-warp
|
||||||
hostname: warp
|
hostname: warp
|
||||||
container_name: warp-${VER}
|
container_name: warp-${VER}
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
b:
|
b:
|
||||||
docker compose build
|
docker compose build
|
||||||
u: # запуск контейнеров
|
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 &
|
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=$(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
|
||||||
|
|||||||
+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
|
||||||
|
|||||||
@@ -2,8 +2,12 @@ rm /ssh/key*
|
|||||||
ssh-keygen -m PEM -t rsa -f /ssh/key -N ''
|
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"
|
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
|
php init.php
|
||||||
php cron.php &
|
if [[ -f "/start" && -f "/ssh/key.pub" && -s "/ssh/key.pub" ]]; then
|
||||||
unitd --log /logs/unit_error
|
php cron.php &
|
||||||
curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
|
unitd --log /logs/unit_error
|
||||||
pkill unitd
|
curl -X PUT --data-binary @/config/unit.json --unix-socket /var/run/control.unit.sock http://localhost/config
|
||||||
unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
|
pkill unitd
|
||||||
|
unitd --no-daemon --control 0.0.0.0:8080 --log /logs/unit_error
|
||||||
|
else
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|||||||
+14
-7
@@ -1,14 +1,21 @@
|
|||||||
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 "$@" &
|
||||||
warp-svc > /dev/null &
|
off=$(cat /config/pac.json | jq -r .warpoff)
|
||||||
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
|
||||||
|
if [ ! -f /var/lib/cloudflare-warp/conf.json ]
|
||||||
|
then
|
||||||
|
warp-cli --accept-tos registration new
|
||||||
|
if [ ! -z "$key" ]
|
||||||
|
then
|
||||||
|
warp-cli --accept-tos registration license $key
|
||||||
|
fi
|
||||||
|
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
|
||||||
|
|||||||
@@ -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": "применяю обновления"/')"
|
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,115 @@
|
|||||||
|
25.10.2024 v1.86
|
||||||
|
- фикс не срабатывания автобэкапа во время старта
|
||||||
|
- adguard: вывод списка разрешенных клиентов
|
||||||
|
- adguard: кнопка заполнения разрешенных клиентов - собирает все clientId со всех контейнеров
|
||||||
|
- adguard: вывод статуса безопасного поиска
|
||||||
|
- warp: при выключении удаляется регистрация deviceid
|
||||||
|
24.10.2024 v1.85
|
||||||
|
- фикс удаления состояния warp после рестарта
|
||||||
|
- возможность перезаписать фразы меню бота через app/override.php
|
||||||
|
24.10.2024 v1.84
|
||||||
|
- фикс показа ссылки для openconnect
|
||||||
|
24.10.2024 v1.83
|
||||||
|
- фикс ошибок доступа контейнеров при автообновлении
|
||||||
|
23.10.2024 v1.82
|
||||||
|
- фикс автобэкапа
|
||||||
|
23.10.2024 v1.81
|
||||||
|
- фикс краша wireguard после апдейта
|
||||||
|
23.10.2024 v1.80
|
||||||
|
- фикс пустых правил для singbox
|
||||||
|
23.10.2024 v1.79
|
||||||
|
- улучшение процесса обновления
|
||||||
|
23.10.2024 v1.78
|
||||||
|
- фикс двойного импорта при обновлении, когда админов больше одного
|
||||||
|
- рестарт бота сбрасывает очередь сообщений от телеграма
|
||||||
|
- при старте статус крона не показывается, т.к он еще не успел запуститься
|
||||||
|
23.10.2024 v1.77
|
||||||
|
- вывод статуса cron
|
||||||
|
- фикс с отправкой бэкапа при спецсимволах в названии бота
|
||||||
|
- проверка формата времени в автобэкапе
|
||||||
|
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
|
26.08.2024 v1.44
|
||||||
- qr для xtls
|
- qr для xtls
|
||||||
- фикс действий на элементом списков
|
- фикс действий на элементом списков
|
||||||
|
|||||||
Reference in New Issue
Block a user