From aa735e52bfe77bfe282add352c9d08a1a7d2c4aa Mon Sep 17 00:00:00 2001
From: "mathieu.brunot" <mb.mathieu.brunot@gmail.com>
Date: Thu, 14 Feb 2019 13:42:16 +0100
Subject: [PATCH] :green_heart: Move prod docker files to sources

---
 {backend-docker => backend}/Dockerfile                         | 2 +-
 backend-docker/entrypoint.sh => backend/docker-entrypoint.sh   | 0
 backend/resources/config/default.edn                           | 3 ++-
 {frontend-docker => frontend}/Dockerfile                       | 2 +-
 {frontend-docker/nginx => frontend/docker-nginx}/README.md     | 0
 .../nginx => frontend/docker-nginx}/conf.d/default.conf        | 0
 .../nginx => frontend/docker-nginx}/conf.d/http-redirect.conf  | 0
 .../nginx => frontend/docker-nginx}/conf.d/misc.conf           | 0
 8 files changed, 4 insertions(+), 3 deletions(-)
 rename {backend-docker => backend}/Dockerfile (98%)
 rename backend-docker/entrypoint.sh => backend/docker-entrypoint.sh (100%)
 rename {frontend-docker => frontend}/Dockerfile (98%)
 rename {frontend-docker/nginx => frontend/docker-nginx}/README.md (100%)
 rename {frontend-docker/nginx => frontend/docker-nginx}/conf.d/default.conf (100%)
 rename {frontend-docker/nginx => frontend/docker-nginx}/conf.d/http-redirect.conf (100%)
 rename {frontend-docker/nginx => frontend/docker-nginx}/conf.d/misc.conf (100%)

diff --git a/backend-docker/Dockerfile b/backend/Dockerfile
similarity index 98%
rename from backend-docker/Dockerfile
rename to backend/Dockerfile
index c4aa7d027..6c636c6d8 100644
--- a/backend-docker/Dockerfile
+++ b/backend/Dockerfile
@@ -104,5 +104,5 @@ ENV \
 
 EXPOSE 6060
 
-COPY entrypoint.sh .start.sh
+COPY docker-entrypoint.sh .start.sh
 CMD .start.sh
diff --git a/backend-docker/entrypoint.sh b/backend/docker-entrypoint.sh
similarity index 100%
rename from backend-docker/entrypoint.sh
rename to backend/docker-entrypoint.sh
diff --git a/backend/resources/config/default.edn b/backend/resources/config/default.edn
index d7cf66269..29e4c2a36 100644
--- a/backend/resources/config/default.edn
+++ b/backend/resources/config/default.edn
@@ -8,7 +8,8 @@
   :user nil         ;; Username to authenticate with (if authenticating).
   :pass nil         ;; Password to authenticate with (if authenticating).
   :ssl false        ;; Enables SSL encryption if value is truthy.
-  :tls false       ;; Enables TLS encryption if value is truthy.
+  :tls false        ;; Enables TLS encryption if value is truthy.
+  :enabled false    ;; Enables SMTP if value is truthy.
   :noop true}
 
  :auth-options {:alg :a256kw :enc :a128cbc-hs256}
diff --git a/frontend-docker/Dockerfile b/frontend/Dockerfile
similarity index 98%
rename from frontend-docker/Dockerfile
rename to frontend/Dockerfile
index 14f5cca3b..52e790a54 100644
--- a/frontend-docker/Dockerfile
+++ b/frontend/Dockerfile
@@ -84,4 +84,4 @@ ENV \
     API_URL=http://127.0.0.1:6060/api
 
 # NGINX configurations
-COPY ./nginx/conf.d /etc/nginx/conf.d
+COPY ./docker-nginx/conf.d /etc/nginx/conf.d
diff --git a/frontend-docker/nginx/README.md b/frontend/docker-nginx/README.md
similarity index 100%
rename from frontend-docker/nginx/README.md
rename to frontend/docker-nginx/README.md
diff --git a/frontend-docker/nginx/conf.d/default.conf b/frontend/docker-nginx/conf.d/default.conf
similarity index 100%
rename from frontend-docker/nginx/conf.d/default.conf
rename to frontend/docker-nginx/conf.d/default.conf
diff --git a/frontend-docker/nginx/conf.d/http-redirect.conf b/frontend/docker-nginx/conf.d/http-redirect.conf
similarity index 100%
rename from frontend-docker/nginx/conf.d/http-redirect.conf
rename to frontend/docker-nginx/conf.d/http-redirect.conf
diff --git a/frontend-docker/nginx/conf.d/misc.conf b/frontend/docker-nginx/conf.d/misc.conf
similarity index 100%
rename from frontend-docker/nginx/conf.d/misc.conf
rename to frontend/docker-nginx/conf.d/misc.conf