From 3294e2c8abfee69596a7cd07aed80fc392aaaf80 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 28 Jan 2021 02:37:55 +0200
Subject: [PATCH] Same well-known directory for ACME challenge for mail.

To make more uniform, use the same location on all hosts. Instead of
copying the same tasks over and over in the renew-certs playbook in the
homelab repo.
---
 conf.d/mail.shore.co.il.conf | 2 +-
 docker-compose.yml           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf.d/mail.shore.co.il.conf b/conf.d/mail.shore.co.il.conf
index 40bc173..322764a 100644
--- a/conf.d/mail.shore.co.il.conf
+++ b/conf.d/mail.shore.co.il.conf
@@ -2,10 +2,10 @@ server {
     listen      80;
     listen      [::]:80;
     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;
     include     snippets/security-txt.conf;
+    include     snippets/www-acme-challenge.conf;
 }
 
 server {
diff --git a/docker-compose.yml b/docker-compose.yml
index fe437a9..27c33ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,6 @@ services:
     restart: always
     volumes:
       - '/var/www/www.shore.co.il/.well-known/acme-challenge:/var/www/www.shore.co.il/.well-known/acme-challenge:ro'
-      - '/var/www/mail.shore.co.il/.well-known/acme-challenge:/var/www/mail.shore.co.il/.well-known/acme-challenge:ro'
       - '/var/ssl/site.key:/var/ssl/site.key:ro'
       - '/var/ssl/site.crt:/var/ssl/site.crt:ro'
       - '/var/ssl/mail.key:/var/ssl/mail.key:ro'
-- 
GitLab