From 4187383f043e9be4ccaa8ecfa37d3f9d2cb94811 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 16 Jan 2022 10:12:06 +0100
Subject: [PATCH] use conf.d folder

---
 deployment/bare_metal/install.sh                                | 2 ++
 deployment/bare_metal/nginx/{common => conf.d}/logging.conf     | 0
 .../bare_metal/nginx/sites-available/gradido.conf.ssl.template  | 1 -
 .../bare_metal/nginx/sites-available/gradido.conf.template      | 1 -
 .../nginx/sites-available/update-page.conf.ssl.template         | 1 -
 .../bare_metal/nginx/sites-available/update-page.conf.template  | 1 -
 6 files changed, 2 insertions(+), 4 deletions(-)
 rename deployment/bare_metal/nginx/{common => conf.d}/logging.conf (100%)

diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh
index b8bd11d4e..b7f06a1ff 100755
--- a/deployment/bare_metal/install.sh
+++ b/deployment/bare_metal/install.sh
@@ -40,6 +40,8 @@ sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/sites-available/gra
 # sudo ln -s /etc/nginx/sites-available/gradido.conf /etc/nginx/sites-enabled
 sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/sites-available/update-page.conf /etc/nginx/sites-available
 sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/common /etc/nginx/
+sudo rmdir /etc/nginx/conf.d
+sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/conf.d /etc/nginx/
 
 # Allow nginx configuration and restart for gradido
 #TODO generate file
diff --git a/deployment/bare_metal/nginx/common/logging.conf b/deployment/bare_metal/nginx/conf.d/logging.conf
similarity index 100%
rename from deployment/bare_metal/nginx/common/logging.conf
rename to deployment/bare_metal/nginx/conf.d/logging.conf
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
index 9b5f58f38..d8f77391b 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
@@ -21,7 +21,6 @@ server {
 
     include /etc/nginx/common/protect.conf;
     include /etc/nginx/common/protect_add_header.conf;
-	include /etc/nginx/common/logging.conf;
 
     #gzip_static  on;
     gzip on;
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
index 51c32091b..59464c8f3 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
@@ -6,7 +6,6 @@ server {
 
     include /etc/nginx/common/protect.conf;
     include /etc/nginx/common/protect_add_header.conf;
-	include /etc/nginx/common/logging.conf;
 
     #gzip_static  on;
     gzip on;
diff --git a/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
index 01fee510a..5ef0f13aa 100644
--- a/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
+++ b/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
@@ -21,7 +21,6 @@ server {
 
     include /etc/nginx/common/protect.conf;
     include /etc/nginx/common/protect_add_header.conf;
-    include /etc/nginx/common/logging.conf
 
     gzip on;
 
diff --git a/deployment/bare_metal/nginx/sites-available/update-page.conf.template b/deployment/bare_metal/nginx/sites-available/update-page.conf.template
index 7c5159639..c83c8896a 100644
--- a/deployment/bare_metal/nginx/sites-available/update-page.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/update-page.conf.template
@@ -6,7 +6,6 @@ server {
 
     include /etc/nginx/common/protect.conf;
     include /etc/nginx/common/protect_add_header.conf;
-    include /etc/nginx/common/logging.conf;
 
     gzip on;