From 2a4266fd00a0b1327a7b24ee9807b94f0060a118 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Apr 2015 23:19:49 -0400
Subject: load environment with dotenv

---
 app/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/index.js')

diff --git a/app/index.js b/app/index.js
index b9958c2..b312eb1 100644
--- a/app/index.js
+++ b/app/index.js
@@ -15,6 +15,8 @@ var OKServer = require('okserver');
 var OKSchema = require('okschema');
 var OKImageService = require('okservices').OKImageService;
 
+require('dotenv').load();
+
 /**
  * OKCMS!
  * Basically takes configuration and gives you a server.
@@ -68,6 +70,7 @@ function OKCMS(options) {
   var viewConfig = options.views || {
     '/': { template: 'index' }
   };
+  var serviceConfig = options.services || {};
 
   var templateProvider = this._templateProvider =
       new OKTemplate({root: templateRoot});
@@ -88,7 +91,8 @@ function OKCMS(options) {
 
   // Create services
   var imageService = OKImageService({
-    express: express
+    express: express,
+    s3: serviceConfig.s3,
   });
 
   var server = this._server = new OKServer({
-- 
cgit v1.2.3-70-g09d2