From 74498e1a1af2ba8f9dd82ca79847e03571c3d505 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 12 Dec 2020 20:44:09 +0200
Subject: [PATCH] fixup! Add ads.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 18ac9e0..3391196 100644
--- a/conf.d/autoconfig.shore.co.il.conf
+++ b/conf.d/autoconfig.shore.co.il.conf
@@ -4,6 +4,7 @@ server {
server_name autoconfig.shore.co.il;
root /var/www/autoconfig.shore.co.il/;
include snippets/www-acme-challenge.conf;
+ include snippets/ads-txt.conf;
include snippets/robots-allow-all.conf;
}
@@ -13,5 +14,6 @@ server {
server_name autoconfig.shore.co.il;
root /var/www/autoconfig.shore.co.il/;
include snippets/robots-allow-all.conf;
+ include snippets/ads-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 bf45c70..6b81e5c 100644
--- a/conf.d/git.shore.co.il.conf
+++ b/conf.d/git.shore.co.il.conf
@@ -5,6 +5,7 @@ server {
listen [::]:80;
server_name git.shore.co.il;
include snippets/robots-allow-all.conf;
+ include snippets/ads-txt.conf;
include snippets/www-acme-challenge.conf;
include snippets/redirect-https.conf;
}
@@ -14,6 +15,7 @@ server {
listen [::]:443 ssl;
server_name git.shore.co.il;
include snippets/robots-allow-all.conf;
+ include snippets/ads-txt.conf;
include snippets/ssl.conf;
location / {
diff --git a/conf.d/global.conf b/conf.d/global.conf
index da15b04..19b88c2 100644
--- a/conf.d/global.conf
+++ b/conf.d/global.conf
@@ -5,5 +5,4 @@ tcp_nopush on;
tcp_nodelay on;
server_tokens off;
include snippets/common-headers.conf;
-include snippets/ads-txt.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 4cfcbcc..6da07d1 100644
--- a/conf.d/mail.shore.co.il.conf
+++ b/conf.d/mail.shore.co.il.conf
@@ -4,6 +4,7 @@ server {
server_name imap.shore.co.il smtp.shore.co.il mta-sts.shore.co.il;
root /var/www/mail.shore.co.il/;
include snippets/robots-disallow-all.conf;
+ include snippets/ads-txt.conf;
}
server {
@@ -12,6 +13,7 @@ server {
server_name mta-sts.shore.co.il;
root /var/www/mail.shore.co.il/;
include snippets/robots-disallow-all.conf;
+ include snippets/ads-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 f619699..44b732b 100644
--- a/conf.d/nextcloud.shore.co.il.conf
+++ b/conf.d/nextcloud.shore.co.il.conf
@@ -5,6 +5,7 @@ server {
listen [::]:80;
server_name nextcloud.shore.co.il;
include snippets/robots-disallow-all.conf;
+ include snippets/ads-txt.conf;
include snippets/www-acme-challenge.conf;
include snippets/redirect-https.conf;
}
@@ -14,6 +15,7 @@ server {
listen [::]:443 ssl;
server_name nextcloud.shore.co.il;
include snippets/robots-disallow-all.conf;
+ include snippets/ads-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 e667692..4902896 100644
--- a/conf.d/shore.co.il.conf
+++ b/conf.d/shore.co.il.conf
@@ -5,6 +5,7 @@ server {
listen [::]:80;
server_name shore.co.il;
include snippets/robots-allow-all.conf;
+ include snippets/ads-txt.conf;
location = / { return 301 https://$host/blog/; }
location /repo/ {
root /var/www/www.shore.co.il/;
@@ -18,6 +19,7 @@ server {
listen [::]:443 ssl;
server_name shore.co.il;
include snippets/robots-allow-all.conf;
+ include snippets/ads-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 bc9993a..2b3e29f 100644
--- a/conf.d/www.shore.co.il.conf
+++ b/conf.d/www.shore.co.il.conf
@@ -7,6 +7,7 @@ server {
listen [::]:80 default_server;
server_name www.shore.co.il;
include snippets/robots-allow-all.conf;
+ include snippets/ads-txt.conf;
location = / { return 301 https://$host/blog/; }
location /repo/ {
root /var/www/www.shore.co.il/;
@@ -20,6 +21,7 @@ server {
listen [::]:443 ssl default_server;
server_name www.shore.co.il;
include snippets/robots-allow-all.conf;
+ include snippets/ads-txt.conf;
include snippets/ssl.conf;
root /var/www/www.shore.co.il/;
error_page 404 /;
--
GitLab