From 7d6f2072e5956e4c4c06ca035e03199e9763bbab Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 12 Dec 2020 20:46:31 +0200
Subject: [PATCH] fixup! Add security.txt to all domains.

---
 conf.d/autoconfig.shore.co.il.conf | 2 ++
 conf.d/git.shore.co.il.conf        | 2 ++
 conf.d/global.conf                 | 1 -
 conf.d/mail.shore.co.il.conf       | 2 ++
 conf.d/nextcloud.shore.co.il.conf  | 2 ++
 conf.d/shore.co.il.conf            | 2 ++
 conf.d/www.shore.co.il.conf        | 2 ++
 7 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/conf.d/autoconfig.shore.co.il.conf b/conf.d/autoconfig.shore.co.il.conf
index 3391196..84109f9 100644
--- a/conf.d/autoconfig.shore.co.il.conf
+++ b/conf.d/autoconfig.shore.co.il.conf
@@ -5,6 +5,7 @@ server {
     root        /var/www/autoconfig.shore.co.il/;
     include     snippets/www-acme-challenge.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     include     snippets/robots-allow-all.conf;
 }
 
@@ -15,5 +16,6 @@ server {
     root        /var/www/autoconfig.shore.co.il/;
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     include     snippets/ssl.conf;
 }
diff --git a/conf.d/git.shore.co.il.conf b/conf.d/git.shore.co.il.conf
index 6b81e5c..65989ac 100644
--- a/conf.d/git.shore.co.il.conf
+++ b/conf.d/git.shore.co.il.conf
@@ -6,6 +6,7 @@ server {
     server_name git.shore.co.il;
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     include     snippets/www-acme-challenge.conf;
     include     snippets/redirect-https.conf;
 }
@@ -16,6 +17,7 @@ server {
     server_name git.shore.co.il;
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     include     snippets/ssl.conf;
 
     location / {
diff --git a/conf.d/global.conf b/conf.d/global.conf
index 19b88c2..09e0703 100644
--- a/conf.d/global.conf
+++ b/conf.d/global.conf
@@ -5,4 +5,3 @@ tcp_nopush      on;
 tcp_nodelay     on;
 server_tokens   off;
 include         snippets/common-headers.conf;
-include         snippets/security-txt.conf;
diff --git a/conf.d/mail.shore.co.il.conf b/conf.d/mail.shore.co.il.conf
index 6da07d1..3bd2e13 100644
--- a/conf.d/mail.shore.co.il.conf
+++ b/conf.d/mail.shore.co.il.conf
@@ -5,6 +5,7 @@ server {
     root        /var/www/mail.shore.co.il/;
     include     snippets/robots-disallow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
 }
 
 server {
@@ -14,6 +15,7 @@ server {
     root                        /var/www/mail.shore.co.il/;
     include                     snippets/robots-disallow-all.conf;
     include                     snippets/ads-txt.conf;
+    include                     snippets/security-txt.conf;
 
     # Copied from snippetes/ssl.conf.
     add_header                  Strict-Transport-Security "max-age=31536000; includeSubDomains; preload";
diff --git a/conf.d/nextcloud.shore.co.il.conf b/conf.d/nextcloud.shore.co.il.conf
index 44b732b..f138c70 100644
--- a/conf.d/nextcloud.shore.co.il.conf
+++ b/conf.d/nextcloud.shore.co.il.conf
@@ -6,6 +6,7 @@ server {
     server_name nextcloud.shore.co.il;
     include     snippets/robots-disallow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     include     snippets/www-acme-challenge.conf;
     include     snippets/redirect-https.conf;
 }
@@ -16,6 +17,7 @@ server {
     server_name nextcloud.shore.co.il;
     include     snippets/robots-disallow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     include     snippets/ssl.conf;
     include     snippets/nextcloud-well-known.conf;
 
diff --git a/conf.d/shore.co.il.conf b/conf.d/shore.co.il.conf
index 4902896..48c587e 100644
--- a/conf.d/shore.co.il.conf
+++ b/conf.d/shore.co.il.conf
@@ -6,6 +6,7 @@ server {
     server_name shore.co.il;
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     location = /        { return 301 https://$host/blog/; }
     location /repo/     {
         root            /var/www/www.shore.co.il/;
@@ -20,6 +21,7 @@ server {
     server_name shore.co.il;
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
+    include     snippets/security-txt.conf;
     include     snippets/ssl.conf;
     include     snippets/nextcloud-well-known.conf;
     include     snippets/z-push.conf;
diff --git a/conf.d/www.shore.co.il.conf b/conf.d/www.shore.co.il.conf
index 2b3e29f..35504f6 100644
--- a/conf.d/www.shore.co.il.conf
+++ b/conf.d/www.shore.co.il.conf
@@ -8,6 +8,7 @@ server {
     server_name         www.shore.co.il;
     include             snippets/robots-allow-all.conf;
     include             snippets/ads-txt.conf;
+    include             snippets/security-txt.conf;
     location = /        { return 301 https://$host/blog/; }
     location /repo/     {
         root            /var/www/www.shore.co.il/;
@@ -22,6 +23,7 @@ server {
     server_name             www.shore.co.il;
     include                 snippets/robots-allow-all.conf;
     include                 snippets/ads-txt.conf;
+    include                 snippets/security-txt.conf;
     include                 snippets/ssl.conf;
     root                    /var/www/www.shore.co.il/;
     error_page 404          /;
-- 
GitLab