From 8c429c8f426a492656570f793d040f55eeb92ba8 Mon Sep 17 00:00:00 2001
From: Justin Littman <justinlittman@gwu.edu>
Date: Fri, 26 Aug 2016 15:05:44 -0400
Subject: [PATCH] Adds missing .env. Tweak to .gitignore and
 docker-compose.yml.

---
 .env                      | 33 +++++++++++++++++++++++++++++++++
 .gitignore                |  1 -
 docker/docker-compose.yml |  6 +++---
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 00000000..93a38f8c
--- /dev/null
+++ b/.env
@@ -0,0 +1,33 @@
+# "master-runserver" to run with runserver. "master" to run with Apache.
+UI_TAG=master-runserver
+DEBUG=True
+# Set to "dev" to link in a local sfm-utils running in development mode. A host volume must also be added
+# in docker-compose.yml. (See services > sfmuiapp > volumes.
+# Set to "master" to use master version of sfm-utils.
+# Default is to use released version.
+SFM_REQS=release
+TZ=America/New_York
+COMPOSE_PROJECT_NAME=sfm
+
+# All of these usernames/passwords must be set.
+RABBITMQ_USER=sfm_user
+RABBITMQ_PASSWORD=password
+POSTGRES_PASSWORD=password
+HERITRIX_USER=sfm_user
+HERITRIX_PASSWORD=password
+
+# To send email, set these correctly.
+#SFM_SMTP_HOST=smtp.gmail.com
+#SFM_EMAIL_USER=yourname@gmail.com
+#SFM_EMAIL_PASSWORD=password
+
+# To enable connecting to social media accounts, provide the following.
+TWITTER_CONSUMER_KEY=mBbq9ruEckIngQztTHUir8Kn0
+TWITTER_CONSUMER_SECRET=Pf28yReBUD9Xz0pLVOsb4r5idZnKCKQ6xlOomBAjD5npFEQ6Rm
+#WEIBO_API_KEY=131305798
+#WEIBO_API_SECRET=678aea49f26ea5c07ec14bf7c0e0fa52
+#TUMBLR_CONSUMER_KEY=Fki0Q9w9QcW95yy66RtFCni14QpM0pjuHbDWMrZ9aPXcsthVQq
+#TUMBLR_CONSUMER_SECRET=aPTpFRE2O7sVlT86xBziUifne8kBYb7EpnWfUBWxuHcB4bxsvP
+
+# To have some test accounts created.
+LOAD_FIXTURES=True
diff --git a/.gitignore b/.gitignore
index 5c0cea1a..4656996f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,4 +64,3 @@ ENV
 
 testdb
 docker-compose.yml
-.env
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f412d9c1..f0724758 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -53,9 +53,9 @@ services:
             - POSTGRES_PASSWORD
             - LOAD_FIXTURES
             - SFM_REQS
-        #volumes:
-            # This links in your local code.
-            #- "..:/opt/sfm-ui"
+        volumes:
+             This links in your local code.
+            - "..:/opt/sfm-ui"
             # To also link in a local sfm-utils, uncomment this and set SFM_REQS to "dev" in .env
             #- "../../sfm-utils:/opt/sfm-utils"
         volumes_from: