houseassassin/vpnbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix add domain and ssl

Browse Source
This commit is contained in:
mercury
2024-12-20 02:46:09 +04:00
parent 057917a24a
commit 3929032e7a
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/bot.php
+26 -17
View File
@@ -1195,12 +1195,6 @@ class Bot
$this->checkBackup($period);
$this->checkCert();
$this->autoAnalyzeLogs();
try {
if (empty($this->fetch) || (time() - $this->fetch > 60 * 30)) {
exec('git -C / fetch');
}
} catch (\Throwable $th) {
}
sleep($period);
}
}
@@ -1318,6 +1312,7 @@ class Bot
$diff = array_slice(explode("\n", $last), 0, count(explode("\n", $last)) - count(explode("\n", $current)));
$diff = array_slice($diff, 0, 10);
if (!empty($diff)) {
exec('git -C / fetch');
foreach ($c['admin'] as $k => $v) {
$this->send($v, implode("\n", $diff), 0, [
[
@@ -2153,6 +2148,7 @@ class Bot
$conf = $this->getPacConf();
unset($conf['domain']);
$nginx = $t = file_get_contents('/config/nginx.conf');
$t = preg_replace('/server_name ([^\n]+)?/', "server_name _;", $nginx);
preg_match_all('~##domain.+?##domain~s', $t, $m);
foreach ($m[0] as $k => $v) {
$t = preg_replace('~##domain.+?##domain~s', $this->comment($v, 'domain'), $t, 1);
@@ -4142,10 +4138,10 @@ DNS-over-HTTPS with IP:
$c = yaml_parse_file($f)['services'];
$main[] = 'v' . getenv('VER') . ($update ? ' (have updates)' : '');
$main[] = '';
$main[] = $this->i18n('on') . ' ' . getenv('WGPORT') . ' Wireguard';
$main[] = $this->i18n('on') . ' ' . getenv('WG1PORT') . ' Wireguard 1';
$main[] = $this->i18n('on') . ' ' . getenv('TGPORT') . ' MTProto';
$main[] = $this->i18n('on') . ' 853 AdguardHome DoT';
$main[] = $this->i18n($c['wg'] ? 'on' : 'off') . ' ' . getenv('WGPORT') . ' Wireguard';
$main[] = $this->i18n($c['wg1'] ? 'on' : 'off') . ' ' . getenv('WG1PORT') . ' Wireguard 1';
$main[] = $this->i18n($c['tg'] ? 'on' : 'off') . ' ' . getenv('TGPORT') . ' MTProto';
$main[] = $this->i18n($c['ad'] ? 'on' : 'off') . ' 853 AdguardHome DoT';
$main[] = '';
$main[] = $cron;
$main[] = $this->i18n($backup ? 'on' : 'off') . ' autobackup' . ($backup ? " $backup" : '');
@@ -4245,6 +4241,20 @@ DNS-over-HTTPS with IP:
$text = $menu[$type ?: 'main' ]['text'];
$data = $menu[$type ?: 'main' ]['data'];
if (empty($type)) {
$b = exec('git -C / rev-parse --abbrev-ref HEAD');
array_unshift($data, [
[
'text' => 'changelog',
'web_app' => ['url' => "https://raw.githubusercontent.com/mercurykd/vpnbot/$b/version"],
],
[
'text' => $this->i18n('update bot'),
'callback_data' => "/applyupdatebot",
],
]);
}
if ($return) {
return [$text, $data];
}
@@ -6910,19 +6920,19 @@ DNS-over-HTTPS with IP:
$c = yaml_parse_file($f)['services'];
$data = [
[[
'text' => $this->i18n($c['wg'] ? 'off' : 'on') . ' ' . getenv('WGPORT') . ' Wireguard',
'text' => $this->i18n($c['wg'] ? 'on' : 'off') . ' ' . getenv('WGPORT') . ' Wireguard',
'callback_data' => "/hidePort wg",
]],
[[
'text' => $this->i18n($c['wg1'] ? 'off' : 'on') . ' ' . getenv('WG1PORT') . ' Wireguard',
'text' => $this->i18n($c['wg1'] ? 'on' : 'off') . ' ' . getenv('WG1PORT') . ' Wireguard',
'callback_data' => "/hidePort wg1",
]],
[[
'text' => $this->i18n($c['tg'] ? 'off' : 'on') . ' ' . getenv('TGPORT') . ' MTProto ',
'text' => $this->i18n($c['tg'] ? 'on' : 'off') . ' ' . getenv('TGPORT') . ' MTProto ',
'callback_data' => "/hidePort tg",
]],
[[
'text' => $this->i18n($c['ad'] ? 'off' : 'on') . ' 853 AdguardHome DoT',
'text' => $this->i18n($c['ad'] ? 'on' : 'off') . ' 853 AdguardHome DoT',
'callback_data' => "/hidePort ad",
]],
];
@@ -6953,15 +6963,14 @@ DNS-over-HTTPS with IP:
if (!empty($c['services'][$container])) {
unset($c['services'][$container]);
} else {
$c['services'][$container]['ports'][] = $ports['container'];
$c['services'][$container]['ports'][] = $ports[$container];
}
if (empty($c['services'])) {
file_put_contents($f, '');
} else {
yaml_emit_file($f, $c);
file_put_contents($f, str_replace('ports:', 'ports: !override', file_get_contents($f)));
}
$this->ports();
$this->restart();
}
public function branches()
config/nginx.conf
+5 -5
View File
@@ -28,6 +28,11 @@ http {
location / {
return 301 https://$host$request_uri;
}
location ~\.well-known {
access_log /logs/nginx_certbot_access;
root /certs/;
try_files $uri =404;
}
}
#~
@@ -71,11 +76,6 @@ http {
proxy_set_header Host $http_host;
proxy_pass http://php;
}
location ~\.well-known {
access_log /logs/nginx_certbot_access;
root /certs/;
try_files $uri =404;
}
location /ws {
proxy_pass http://xr:443;
proxy_redirect off;
config/nginx_default.conf
+5 -5
View File
@@ -28,6 +28,11 @@ http {
location / {
return 301 https://$host$request_uri;
}
location ~\.well-known {
access_log /logs/nginx_certbot_access;
root /certs/;
try_files $uri =404;
}
}
#~
@@ -71,11 +76,6 @@ http {
proxy_set_header Host $http_host;
proxy_pass http://php;
}
location ~\.well-known {
access_log /logs/nginx_certbot_access;
root /certs/;
try_files $uri =404;
}
location /ws {
proxy_pass http://xr:443;
proxy_redirect off;