From 15ada8bf609c905a4d2dd4a86b4835edd1a2ea37 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sun, 14 Jan 2024 03:42:35 -0300 Subject: [PATCH] A more portable aproach but on this server --- nginx/conf.d/count.ayaya.beauty.conf | 3 --- nginx/conf.d/ri.zzls.xyz.conf | 2 +- nginx/conf.d/search.zzls.xyz.conf | 1 - nginx/configs/ssl.conf | 2 +- nginx/configs/upstreams.conf | 2 +- nginx/nginx.conf | 1 + 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/nginx/conf.d/count.ayaya.beauty.conf b/nginx/conf.d/count.ayaya.beauty.conf index 3a42b5a..350a721 100644 --- a/nginx/conf.d/count.ayaya.beauty.conf +++ b/nginx/conf.d/count.ayaya.beauty.conf @@ -14,9 +14,6 @@ server { listen 443 ssl; http2 on; - ssl_certificate /etc/letsencrypt/live/count.ayaya.beauty/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/count.ayaya.beauty/privkey.pem; # managed by Certbot - include configs/sslConfig.conf; } diff --git a/nginx/conf.d/ri.zzls.xyz.conf b/nginx/conf.d/ri.zzls.xyz.conf index 6b64da9..5c035df 100644 --- a/nginx/conf.d/ri.zzls.xyz.conf +++ b/nginx/conf.d/ri.zzls.xyz.conf @@ -1,6 +1,7 @@ server { server_name ri.zzls.xyz ri.nadeko.net; include configs/general.conf; + include configs/robotsNone.conf; location / { proxy_pass http://rimgo; @@ -12,7 +13,6 @@ server { listen 443 ssl; http2 on; - include configs/ssl.conf; } diff --git a/nginx/conf.d/search.zzls.xyz.conf b/nginx/conf.d/search.zzls.xyz.conf index bf0ec9a..b89c16f 100644 --- a/nginx/conf.d/search.zzls.xyz.conf +++ b/nginx/conf.d/search.zzls.xyz.conf @@ -39,7 +39,6 @@ server { listen 443 ssl; http2 on; - include configs/ssl.conf; } server { diff --git a/nginx/configs/ssl.conf b/nginx/configs/ssl.conf index 6171230..707dd09 100644 --- a/nginx/configs/ssl.conf +++ b/nginx/configs/ssl.conf @@ -1,4 +1,4 @@ -ssl_certificate /etc/ssl/certs/zzlschain.pem; +ssl_certificate /etc/ssl/certs/fullchain.pem; ssl_certificate_key /etc/ssl/private/zzlskey.pem; include configs/sslConfig.conf; diff --git a/nginx/configs/upstreams.conf b/nginx/configs/upstreams.conf index bc14b55..4ff36cb 100644 --- a/nginx/configs/upstreams.conf +++ b/nginx/configs/upstreams.conf @@ -7,5 +7,5 @@ upstream counter { } upstream searxng { - server unix:///usr/local/searxng/run/socket; + server unix:/usr/local/searxng/run/socket; } diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 99739b8..da6f2e7 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -54,5 +54,6 @@ http { include /etc/nginx/snippets/maps.conf; include /etc/nginx/snippets/poop.conf; + include /etc/nignx/configs/upstreams.conf; include /etc/nginx/conf.d/*.conf; }