From ec85060df8add024fa094c65aac550a5ad945048 Mon Sep 17 00:00:00 2001
From: Corry Haines <github@corryh.com>
Date: Thu, 19 Jan 2023 12:11:54 -0800
Subject: [PATCH] Organize nginx config files (#449)

---
 docker/.gitignore                          | 1 -
 docker/Dockerfile                          | 2 +-
 docker/nginx.conf                          | 2 +-
 docker/nginx.conf.d/.gitignore             | 1 +
 docker/{ => nginx.conf.d}/default.conf.tpl | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 docker/.gitignore
 create mode 100644 docker/nginx.conf.d/.gitignore
 rename docker/{ => nginx.conf.d}/default.conf.tpl (100%)

diff --git a/docker/.gitignore b/docker/.gitignore
deleted file mode 100644
index f493233..0000000
--- a/docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-nginx.rendered.conf
diff --git a/docker/Dockerfile b/docker/Dockerfile
index aca9438..2813e9e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,7 +40,7 @@ COPY docker/mime.types /etc/mime.types
 
 # Configure nginx
 COPY docker/nginx.conf /etc/nginx/
-COPY docker/default.conf.tpl /etc/nginx/conf.d
+COPY docker/nginx.conf.d/* /etc/nginx/conf.d
 
 COPY . /takahe
 
diff --git a/docker/nginx.conf b/docker/nginx.conf
index aa90efc..08f3bbd 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -1,5 +1,5 @@
 daemon off;
-error_log /dev/stdout info;
+error_log /dev/stdout warn;
 
 events {
   worker_connections 4096;
diff --git a/docker/nginx.conf.d/.gitignore b/docker/nginx.conf.d/.gitignore
new file mode 100644
index 0000000..9553b7f
--- /dev/null
+++ b/docker/nginx.conf.d/.gitignore
@@ -0,0 +1 @@
+*.development.conf
diff --git a/docker/default.conf.tpl b/docker/nginx.conf.d/default.conf.tpl
similarity index 100%
rename from docker/default.conf.tpl
rename to docker/nginx.conf.d/default.conf.tpl