From 5dded26a76ae65be19b9ddd142afa772f950b4c7 Mon Sep 17 00:00:00 2001 From: Tine Date: Fri, 29 Nov 2024 08:28:21 +0100 Subject: [PATCH] refactor(nginx): clearer blocked partials naming --- root/etc/nginx/nginx.conf | 10 ++++------ .../{blocked.conf => blocked-bad-crawlers.conf} | 0 .../{manual-blocks.conf => blocked-manual.conf} | 0 root/etc/nginx/partials/server.conf | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) rename root/etc/nginx/partials/{blocked.conf => blocked-bad-crawlers.conf} (100%) rename root/etc/nginx/partials/{manual-blocks.conf => blocked-manual.conf} (100%) delete mode 100644 root/etc/nginx/partials/server.conf diff --git a/root/etc/nginx/nginx.conf b/root/etc/nginx/nginx.conf index 4c0c0e7..92a1414 100644 --- a/root/etc/nginx/nginx.conf +++ b/root/etc/nginx/nginx.conf @@ -106,8 +106,8 @@ stream { resolver 9.9.9.9 1.1.1.1 8.8.8.8 8.8.4.4; set_real_ip_from 0.0.0.0/0; ssl_preread on; - include /etc/nginx/partials/blocked.conf; - include /etc/nginx/partials/manual-blocks.conf; + include /etc/nginx/partials/blocked-bad-crawlers.conf; + include /etc/nginx/partials/blocked-manual.conf; } # GIT @@ -119,8 +119,8 @@ stream { proxy_protocol on; resolver 9.9.9.9 1.1.1.1 8.8.8.8 8.8.4.4; set_real_ip_from 0.0.0.0/0; - include /etc/nginx/partials/blocked.conf; - include /etc/nginx/partials/manual-blocks.conf; + include /etc/nginx/partials/blocked-bad-crawlers.conf; + include /etc/nginx/partials/blocked-manual.conf; } # EMAIL @@ -142,7 +142,5 @@ stream { proxy_protocol on; resolver 9.9.9.9 1.1.1.1 8.8.8.8 8.8.4.4; set_real_ip_from 0.0.0.0/0; - #include /etc/nginx/partials/blocked.conf; - #include /etc/nginx/partials/manual-blocks.conf; } } diff --git a/root/etc/nginx/partials/blocked.conf b/root/etc/nginx/partials/blocked-bad-crawlers.conf similarity index 100% rename from root/etc/nginx/partials/blocked.conf rename to root/etc/nginx/partials/blocked-bad-crawlers.conf diff --git a/root/etc/nginx/partials/manual-blocks.conf b/root/etc/nginx/partials/blocked-manual.conf similarity index 100% rename from root/etc/nginx/partials/manual-blocks.conf rename to root/etc/nginx/partials/blocked-manual.conf diff --git a/root/etc/nginx/partials/server.conf b/root/etc/nginx/partials/server.conf deleted file mode 100644 index 1359503..0000000 --- a/root/etc/nginx/partials/server.conf +++ /dev/null @@ -1 +0,0 @@ -# Default server configuration