From a8e8ad80e92ff4d66059b5c0263d639852d31601 Mon Sep 17 00:00:00 2001
From: Oly <oliver.marks@influentialsoftware.com>
Date: Thu, 26 Jan 2017 08:52:41 +0000
Subject: [PATCH] fix env file loading

---
 config/settings/common.py |  2 +-
 env.example               | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/settings/common.py b/config/settings/common.py
index 5dd17db..1c06d2e 100644
--- a/config/settings/common.py
+++ b/config/settings/common.py
@@ -16,7 +16,7 @@ ROOT_DIR = environ.Path(__file__) - 3  # (mhackspace/config/settings/common.py -
 APPS_DIR = ROOT_DIR.path('mhackspace')
 
 env = environ.Env()
-env.read_env()
+env.read_env('%s/.env' % ROOT_DIR)
 
 # APP CONFIGURATION
 # ------------------------------------------------------------------------------
diff --git a/env.example b/env.example
index 2324613..db57760 100644
--- a/env.example
+++ b/env.example
@@ -29,16 +29,16 @@ DJANGO_ACCOUNT_ALLOW_REGISTRATION=True
 COMPRESS_ENABLED=
 
 
-PAYMENT_ENVIRONMENT = 'sandbox'
+PAYMENT_ENVIRONMENT=sandbox
 
-BRAINTREE_MERCHANT_ID = ''
-BRAINTREE_PUBLIC_KEY = ''
-BRAINTREE_PRIVATE_KEY = ''
+BRAINTREE_MERCHANT_ID=demo
+BRAINTREE_PUBLIC_KEY=demo
+BRAINTREE_PRIVATE_KEY=demo
 
-PAYPAL_CLIENT_ID = ""
-PAYPAL_CLIENT_SECRET = ""
+PAYPAL_CLIENT_ID=demo
+PAYPAL_CLIENT_SECRET=demo
 
-GOCARDLESS_APP_ID = ''
-GOCARDLESS_APP_SECRET = ''
-GOCARDLESS_ACCESS_TOKEN = ''
-GOCARDLESS_MERCHANT_ID = ''
+GOCARDLESS_APP_ID=demo
+GOCARDLESS_APP_SECRET=demo
+GOCARDLESS_ACCESS_TOKEN=demo
+GOCARDLESS_MERCHANT_ID=demo