From 356dc36fd57802e67b5f669b602943056ca8ca02 Mon Sep 17 00:00:00 2001
From: Marius van Zundert <marius.vanzundert@webcolorsgroup.com>
Date: Mon, 27 Feb 2017 14:11:16 +0100
Subject: [PATCH] Added NGINX from env file and updated env-example

---
 docker-compose.yml | 6 +++---
 env-example        | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 49b0f51b..e3a9c966 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -82,9 +82,9 @@ services:
                 - PHP_UPSTREAM=php-fpm
         volumes_from:
             - applications
-        volumes:
-            - ./logs/nginx/:/var/log/nginx
-            - ./nginx/sites/:/etc/nginx/sites-available
+        volumes:            
+            - ${NGINX_HOST_LOG_PATH}:/var/log/nginx
+            - ${NGINX_SITES_PATH}:/etc/nginx/sites-available
         ports:
             - "80:80"
             - "443:443"
diff --git a/env-example b/env-example
index f9e86531..aa2a7310 100644
--- a/env-example
+++ b/env-example
@@ -39,7 +39,6 @@ WORKSPACE_NODE_VERSION=stable
 WORKSPACE_TIMEZONE=UTC
 WORKSPACE_SSH_PORT=2222
 
-
 # PHP_FPM
 PHP_FPM_DOCKER_FILE=Dockerfile-70
 PHP_FPM_INSTALL_XDEBUG=false
@@ -55,11 +54,11 @@ PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
 PHP_FPM_CODEIGNITER=falses
 
 # NGINX
-NGINX_BUILD_PATH=./nginx
-NGINX_CONTAINER_NAME=nginx
 NGINX_HOST_HTTP_PORT=8080
 NGINX_HOST_HTTPS_PORT=8433
 NGINX_HOST_LOG_PATH=./logs/nginx/
+NGINX_SITES_PATH=./nginx/sites/
+
 
 
 # APACHE