From e39e11b3fea8c7c0c9029aadfde68b37279cc508 Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Tue, 5 Jan 2021 14:28:58 +0100
Subject: [PATCH] Re-structured nginx config

---
 nginx/{nginx => build}/Dockerfile                   | 0
 nginx/{nginx => build}/entrypoint.sh                | 0
 nginx/{nginx => build}/renew                        | 0
 nginx/conf.d/events.conf                            | 3 +++
 nginx/{config => }/conf.d/http.conf                 | 0
 nginx/docker-compose.yml                            | 5 +++--
 nginx/{config => }/nginx.conf                       | 0
 nginx/nginx.env.example                             | 5 +++++
 nginx/{config => }/sites-available/firefly-iii.conf | 0
 nginx/{config => }/sites-available/portainer.conf   | 0
 10 files changed, 11 insertions(+), 2 deletions(-)
 rename nginx/{nginx => build}/Dockerfile (100%)
 rename nginx/{nginx => build}/entrypoint.sh (100%)
 rename nginx/{nginx => build}/renew (100%)
 create mode 100644 nginx/conf.d/events.conf
 rename nginx/{config => }/conf.d/http.conf (100%)
 rename nginx/{config => }/nginx.conf (100%)
 rename nginx/{config => }/sites-available/firefly-iii.conf (100%)
 rename nginx/{config => }/sites-available/portainer.conf (100%)

diff --git a/nginx/nginx/Dockerfile b/nginx/build/Dockerfile
similarity index 100%
rename from nginx/nginx/Dockerfile
rename to nginx/build/Dockerfile
diff --git a/nginx/nginx/entrypoint.sh b/nginx/build/entrypoint.sh
similarity index 100%
rename from nginx/nginx/entrypoint.sh
rename to nginx/build/entrypoint.sh
diff --git a/nginx/nginx/renew b/nginx/build/renew
similarity index 100%
rename from nginx/nginx/renew
rename to nginx/build/renew
diff --git a/nginx/conf.d/events.conf b/nginx/conf.d/events.conf
new file mode 100644
index 0000000..eaa149e
--- /dev/null
+++ b/nginx/conf.d/events.conf
@@ -0,0 +1,3 @@
+events {
+
+}
diff --git a/nginx/config/conf.d/http.conf b/nginx/conf.d/http.conf
similarity index 100%
rename from nginx/config/conf.d/http.conf
rename to nginx/conf.d/http.conf
diff --git a/nginx/docker-compose.yml b/nginx/docker-compose.yml
index d7aedec..7b758df 100644
--- a/nginx/docker-compose.yml
+++ b/nginx/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.5'
 services:
     app:
-        build: './nginx'
+        build: './build'
         image: 'nginx-certbot:stable-alpine'
 
         env_file:
@@ -13,7 +13,8 @@ services:
             - '443:443'
         volumes:
             - 'certs:/etc/letsencrypt'
-            - './config:/etc/nginx/conf.d'
+            - './nginx.conf:/etc/nginx/nginx.conf'
+            - './conf.d:/etc/nginx/conf.d'
 
 networks:
     nginx:
diff --git a/nginx/config/nginx.conf b/nginx/nginx.conf
similarity index 100%
rename from nginx/config/nginx.conf
rename to nginx/nginx.conf
diff --git a/nginx/nginx.env.example b/nginx/nginx.env.example
index e69de29..b807d76 100644
--- a/nginx/nginx.env.example
+++ b/nginx/nginx.env.example
@@ -0,0 +1,5 @@
+# Comma-separated list of domains
+DOMAINS=
+
+# Admin email; used for certificates
+EMAIL=
diff --git a/nginx/config/sites-available/firefly-iii.conf b/nginx/sites-available/firefly-iii.conf
similarity index 100%
rename from nginx/config/sites-available/firefly-iii.conf
rename to nginx/sites-available/firefly-iii.conf
diff --git a/nginx/config/sites-available/portainer.conf b/nginx/sites-available/portainer.conf
similarity index 100%
rename from nginx/config/sites-available/portainer.conf
rename to nginx/sites-available/portainer.conf