From b5a78e6e50cca3953e0eab2d9cc7f6be33d7569b Mon Sep 17 00:00:00 2001 From: mercury Date: Mon, 10 Apr 2023 23:27:36 +0400 Subject: [PATCH] fix errors, old export file not compatible --- app/bot.php | 7 +------ config/nginx.conf | 2 ++ config/nginx_default.conf | 2 ++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/bot.php b/app/bot.php index 625656f..036c101 100644 --- a/app/bot.php +++ b/app/bot.php @@ -1829,18 +1829,13 @@ DNS-over-HTTPS with IP: $ip = $this->ip; $domain = $conf['domain'] ?: $ip; $scheme = empty($ssl = $this->nginxGetTypeCert()) ? 'http' : 'https'; - - $text = ""; + $text = "$scheme://$domain/adguard\n\n"; if ($ssl) { $text .= "DNS over HTTPS:\n$ip\n$scheme://$domain/dns-query\n\n"; $text .= "DNS over TLS:\n$ip:853"; } $data = [ [ - [ - 'text' => $this->i18n('adguard web'), - 'url' => "$scheme://$domain/adguard", - ], [ 'text' => $this->i18n('change password'), 'callback_data' => "/adguardpsswd", diff --git a/config/nginx.conf b/config/nginx.conf index ea815a0..ef14685 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -103,6 +103,7 @@ http { # proxy_set_header Upgrade $http_upgrade; # proxy_set_header Connection "upgrade"; # } +#-domain #-ssl # # The DoH server block # location /dns-query { @@ -124,6 +125,7 @@ http { # proxy_pass https://ad/dns-query; # } #-ssl +#-domain # } #-domain } diff --git a/config/nginx_default.conf b/config/nginx_default.conf index ea815a0..ef14685 100644 --- a/config/nginx_default.conf +++ b/config/nginx_default.conf @@ -103,6 +103,7 @@ http { # proxy_set_header Upgrade $http_upgrade; # proxy_set_header Connection "upgrade"; # } +#-domain #-ssl # # The DoH server block # location /dns-query { @@ -124,6 +125,7 @@ http { # proxy_pass https://ad/dns-query; # } #-ssl +#-domain # } #-domain }