Revert "delete reset nginx button"
This reverts commit fd9b661d64.
# Conflicts:
# app/bot.php
This commit is contained in:
@@ -1964,6 +1964,12 @@ DNS-over-HTTPS with IP:
|
||||
];
|
||||
}
|
||||
}
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('reset nginx'),
|
||||
'callback_data' => "/resetnginx",
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => "{$this->i18n('add')} {$this->i18n('admin')}",
|
||||
|
||||
@@ -45,6 +45,7 @@ $i = [
|
||||
'self list explain' => ' - domains that will work through a proxy',
|
||||
'reverse list explain' => ' - domains that will work without a proxy, all others through a proxy',
|
||||
'timer' => 'set timer',
|
||||
'reset nginx' => 'reset nginx',
|
||||
],
|
||||
'ru' => [
|
||||
'wg_title' => 'Wireguard',
|
||||
@@ -90,5 +91,6 @@ $i = [
|
||||
'self list explain' => ' - домены, которые будут работать через прокси',
|
||||
'reverse list explain' => ' - домены которые будут работать без прокси, все остальные через прокси',
|
||||
'timer' => 'установить время действия',
|
||||
'reset nginx' => 'сбросить nginx',
|
||||
],
|
||||
];
|
||||
|
||||
@@ -103,80 +103,27 @@ http {
|
||||
# proxy_set_header Upgrade $http_upgrade;
|
||||
# proxy_set_header Connection "upgrade";
|
||||
# }
|
||||
|
||||
#-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 http://dohloop;
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
#-ssl
|
||||
# }
|
||||
#-domain
|
||||
|
||||
# This upstream connects to a local Stream service which converts HTTP -> DNS
|
||||
upstream dohloop {
|
||||
zone dohloop 64k;
|
||||
server 127.0.0.1:8053;
|
||||
keepalive_timeout 60s;
|
||||
keepalive_requests 100;
|
||||
keepalive 10;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
# DNS Stream Services
|
||||
stream {
|
||||
# DNS logging
|
||||
log_format dns '$remote_addr [$time_local] $protocol "$dns_qname"';
|
||||
access_log /logs/nginx_dns_access dns;
|
||||
|
||||
# Import the NJS module
|
||||
js_import /etc/nginx/njs.d/dns/dns.js;
|
||||
|
||||
# The $dns_qname variable can be populated by preread calls, and can be used for DNS routing
|
||||
js_set $dns_qname dns.get_qname;
|
||||
|
||||
# DNS upstream pool.
|
||||
upstream dns {
|
||||
zone dns 64k;
|
||||
server ad:53;
|
||||
}
|
||||
|
||||
# DNS(TCP) and DNS over TLS (DoT) Server
|
||||
# Terminate DoT and DNS TCP, and proxy onto standard DNS
|
||||
server {
|
||||
listen 53;
|
||||
#-ssl
|
||||
# listen 853 ssl;
|
||||
# ssl_certificate /certs/cert_public;
|
||||
# ssl_certificate_key /certs/cert_private;
|
||||
#-ssl
|
||||
js_preread dns.preread_dns_request;
|
||||
proxy_pass dns;
|
||||
}
|
||||
|
||||
# DNS(UDP) Server
|
||||
# DNS UDP proxy onto DNS UDP
|
||||
server {
|
||||
listen 53 udp;
|
||||
proxy_responses 1;
|
||||
js_preread dns.preread_dns_request;
|
||||
proxy_pass dns;
|
||||
}
|
||||
|
||||
# DNS over HTTPS (gateway) Service
|
||||
# Upstream can be either DNS(TCP) or DoT. If upstream is DNS, proxy_ssl should be off.
|
||||
server {
|
||||
listen 8053;
|
||||
js_filter dns.filter_doh_request;
|
||||
proxy_pass dns;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user