From 403cbf7e69f0030ac7e122353b5e5f3fe9483ee3 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 17 Jan 2021 01:38:37 +0200
Subject: [PATCH] {www.,}shore.co.il is now served by ns4, remove from host01.
---
conf.d/shore.co.il.conf | 31 -------------
conf.d/www.shore.co.il.conf | 43 -------------------
docker-compose.yml | 5 ++-
snippets/z-push.conf | 19 --------
.../google88c23a5c89fa3cb3.html | 1 -
5 files changed, 3 insertions(+), 96 deletions(-)
delete mode 100644 conf.d/shore.co.il.conf
delete mode 100644 conf.d/www.shore.co.il.conf
delete mode 100644 snippets/z-push.conf
delete mode 100644 www/www.shore.co.il/google88c23a5c89fa3cb3.html
diff --git a/conf.d/shore.co.il.conf b/conf.d/shore.co.il.conf
deleted file mode 100644
index 437a1da..0000000
--- a/conf.d/shore.co.il.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-map $host $z_push { default z-push; }
-
-server {
- listen 80;
- listen [::]:80;
- 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/;
- autoindex on;
- }
- include snippets/redirect-https.conf;
-}
-
-server {
- listen 443 ssl;
- listen [::]:443 ssl;
- 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;
-
- location = / { return 301 https://www.shore.co.il/blog/; }
- include snippets/redirect-www.conf;
-}
diff --git a/conf.d/www.shore.co.il.conf b/conf.d/www.shore.co.il.conf
deleted file mode 100644
index cd62489..0000000
--- a/conf.d/www.shore.co.il.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-server {
- listen 80;
- listen [::]:80;
- 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/;
- autoindex on;
- }
- location / { return 301 https://$host$request_uri; }
-}
-
-server {
- listen 443 ssl;
- listen [::]:443 ssl;
- 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 /;
-
- location /repo/ { autoindex on; }
- location = /resume { try_files $uri /resume/resume.html; }
- location = /resume/ { index resume.html; }
-
- location = / { return 301 https://$host/blog/; }
- location /about { return 301 https://$host/blog/pages/about-me.html; }
- location /spam { return 301 https://$host/blog/pages/spam.html; }
- location = /blog {
- try_files $uri /blog/index.html;
- charset UTF-8;
- }
-
- location /cgit { return 301 https://git.shore.co.il/explore; }
- location /cgit/ { return 301 https://git.shore.co.il/explore; }
- location /git { return 301 https://git.shore.co.il/explore; }
- location /git/ { return 301 https://git.shore.co.il/explore; }
-}
diff --git a/docker-compose.yml b/docker-compose.yml
index e50d9f9..37dbac9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,13 +5,14 @@ services:
build:
context: ./
# command: ["nginx", "-g", "daemon off;"]
- hostname: &hostname "${HOSTNAME}"
+ hostname: &hostname nextcloud.shore.co.il
networks:
default:
aliases:
- - *hostname
- nextcloud.shore.co.il
- git.shore.co.il
+ - lam.shore.co.il
+ - mta-sts.shore.co.il
ports:
- '80:80'
- '443:443'
diff --git a/snippets/z-push.conf b/snippets/z-push.conf
deleted file mode 100644
index 85a21d6..0000000
--- a/snippets/z-push.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-location /AutoDiscover/ {
- proxy_pass http://$z_push$request_uri;
- include snippets/proxy-headers.conf;
-}
-
-location /Autodiscover/ {
- proxy_pass http://$z_push$request_uri;
- include snippets/proxy-headers.conf;
-}
-
-location /autodiscover/ {
- proxy_pass http://$z_push$request_uri;
- include snippets/proxy-headers.conf;
-}
-
-location /Microsoft-Server-ActiveSync {
- proxy_pass http://$z_push$request_uri;
- include snippets/proxy-headers.conf;
-}
diff --git a/www/www.shore.co.il/google88c23a5c89fa3cb3.html b/www/www.shore.co.il/google88c23a5c89fa3cb3.html
deleted file mode 100644
index ceace0b..0000000
--- a/www/www.shore.co.il/google88c23a5c89fa3cb3.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: google88c23a5c89fa3cb3.html
\ No newline at end of file
--
GitLab