From 0ecf2ccf99800316aef3f7793c045d1a215389db Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Fri, 14 Feb 2020 17:57:05 -0500
Subject: Allow custom redis and psql servers to be set through .env

---
 docker-compose.yml | 10 ++++------
 dotenv             |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9db35b2..777ee8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,11 +14,9 @@ services:
       - ./nginx/sites.template:/etc/nginx/sites-available/sites.template
       - ./nginx/default/html:/var/www/html
       - ./nginx/log/nginx:/var/log/nginx
-## Configuration for Letsencrypt SSL Certificate
       - ./data/certbot/conf:/etc/letsencrypt
       - ./data/certbot/www:/var/www/certbot
-## Configuration for Letsencrypt SSL Certificate
-#      - ./nginx/ssl/:/etc/ssl
+      - ./nginx/ssl/:/etc/ssl
     ports:
       - "80:80"
       - "443:443"
@@ -79,8 +77,8 @@ services:
       - ./scalelite/tmp/cache/assets:/usr/src/app/tmp/cache/assets
     env_file: ./scalelite/.env
     environment:
-      - REDIS_URL=redis://redis:6379
-      - DATABASE_URL=postgres://postgres:password@postgres:5432/scalelite?pool=5
+      - REDIS_URL=${REDIS_URL:-redis://redis:6379}
+      - DATABASE_URL=${DATABASE_URL:-postgres://postgres:password@postgres:5432/scalelite?pool=5}
       - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}
 
 
@@ -97,5 +95,5 @@ services:
       - ./scalelite/bin/start-poller:/srv/scalelite/bin/start-poller
     env_file: ./scalelite/.env
     environment:
-      - REDIS_URL=redis://redis:6379
+      - REDIS_URL=${REDIS_URL:-redis://redis:6379}
       - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}
diff --git a/dotenv b/dotenv
index 2c1317e..133332d 100644
--- a/dotenv
+++ b/dotenv
@@ -1 +1,3 @@
 HOST_NAME=sl.xlab.blindside-dev.com
+REDIS_URL=redis://redis:6379
+DATABASE_URL=postgres://postgres:password@postgres:5432/scalelite?pool=5
-- 
cgit v1.2.3