From d0b0c68f05c4d7df257fe93c52ef5e70e89900f1 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 7 May 2022 11:05:58 +0300
Subject: [PATCH] Use the renamed ssl.config snippet.
---
conf.d/autoconfig.shore.co.il.conf | 2 +-
conf.d/elasticsearch.shore.co.il.conf | 2 +-
conf.d/kibana.shore.co.il.conf | 2 +-
conf.d/myip.shore.co.il.conf | 2 +-
conf.d/nehe.sr.conf | 2 +-
conf.d/nehes.co.conf | 2 +-
conf.d/registry.shore.co.il.conf | 2 +-
conf.d/shore.co.il.conf | 2 +-
conf.d/www.nehe.sr.conf | 2 +-
conf.d/www.nehes.co.conf | 2 +-
conf.d/www.shore.co.il.conf | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/conf.d/autoconfig.shore.co.il.conf b/conf.d/autoconfig.shore.co.il.conf
index 7fdbbbc..dce6467 100644
--- a/conf.d/autoconfig.shore.co.il.conf
+++ b/conf.d/autoconfig.shore.co.il.conf
@@ -17,5 +17,5 @@ server {
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
}
diff --git a/conf.d/elasticsearch.shore.co.il.conf b/conf.d/elasticsearch.shore.co.il.conf
index 051d4ba..9264293 100644
--- a/conf.d/elasticsearch.shore.co.il.conf
+++ b/conf.d/elasticsearch.shore.co.il.conf
@@ -18,7 +18,7 @@ server {
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
location / {
proxy_pass http://$es:9200$request_uri;
diff --git a/conf.d/kibana.shore.co.il.conf b/conf.d/kibana.shore.co.il.conf
index d45ddb7..7f5977f 100644
--- a/conf.d/kibana.shore.co.il.conf
+++ b/conf.d/kibana.shore.co.il.conf
@@ -18,7 +18,7 @@ server {
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
include snippets/vouch.conf;
location / {
diff --git a/conf.d/myip.shore.co.il.conf b/conf.d/myip.shore.co.il.conf
index 0faccee..9837325 100644
--- a/conf.d/myip.shore.co.il.conf
+++ b/conf.d/myip.shore.co.il.conf
@@ -17,7 +17,7 @@ server {
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
error_page 404 /;
location = / {
add_header Content-Type "text/plain; charset=utf-8";
diff --git a/conf.d/nehe.sr.conf b/conf.d/nehe.sr.conf
index 43b399f..c3700a6 100644
--- a/conf.d/nehe.sr.conf
+++ b/conf.d/nehe.sr.conf
@@ -16,7 +16,7 @@ server {
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
include snippets/nextcloud-well-known.conf;
include snippets/activesync.conf;
include snippets/redirect-www.conf;
diff --git a/conf.d/nehes.co.conf b/conf.d/nehes.co.conf
index 1dea001..55f047d 100644
--- a/conf.d/nehes.co.conf
+++ b/conf.d/nehes.co.conf
@@ -16,7 +16,7 @@ server {
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
include snippets/nextcloud-well-known.conf;
include snippets/activesync.conf;
include snippets/redirect-www.conf;
diff --git a/conf.d/registry.shore.co.il.conf b/conf.d/registry.shore.co.il.conf
index dd128e4..d2e4f1f 100644
--- a/conf.d/registry.shore.co.il.conf
+++ b/conf.d/registry.shore.co.il.conf
@@ -13,7 +13,7 @@ server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name registry.shore.co.il;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
location /v2/ {
proxy_pass http://$registry:5000$request_uri;
diff --git a/conf.d/shore.co.il.conf b/conf.d/shore.co.il.conf
index dbbd0be..ae30a3c 100644
--- a/conf.d/shore.co.il.conf
+++ b/conf.d/shore.co.il.conf
@@ -20,7 +20,7 @@ server {
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
include snippets/nextcloud-well-known.conf;
include snippets/activesync.conf;
include snippets/redirect-www.conf;
diff --git a/conf.d/www.nehe.sr.conf b/conf.d/www.nehe.sr.conf
index 80c8032..05538de 100644
--- a/conf.d/www.nehe.sr.conf
+++ b/conf.d/www.nehe.sr.conf
@@ -16,7 +16,7 @@ server {
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
root /var/www/www.nehe.sr/;
error_page 404 /404.html;
}
diff --git a/conf.d/www.nehes.co.conf b/conf.d/www.nehes.co.conf
index 1909f53..0a14e6f 100644
--- a/conf.d/www.nehes.co.conf
+++ b/conf.d/www.nehes.co.conf
@@ -16,7 +16,7 @@ server {
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
root /var/www/www.nehe.sr/;
error_page 404 /404.html;
}
diff --git a/conf.d/www.shore.co.il.conf b/conf.d/www.shore.co.il.conf
index f7c0375..2a823be 100644
--- a/conf.d/www.shore.co.il.conf
+++ b/conf.d/www.shore.co.il.conf
@@ -21,7 +21,7 @@ server {
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
- include snippets/ssl.conf;
+ include snippets/ssl-legacy.conf;
root /var/www/www.shore.co.il/;
error_page 404 /;
--
GitLab