From 3f772e32c09f466044e69b11417dc982414478db Mon Sep 17 00:00:00 2001
From: crflynn <crf204@gmail.com>
Date: Sun, 22 Apr 2018 19:27:23 -0400
Subject: [PATCH] force env variables

---
 pypistats/run.py      |  2 +-
 pypistats/settings.py | 18 ------------------
 run.sh                |  6 ++++--
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/pypistats/run.py b/pypistats/run.py
index e077cb3..7b92036 100644
--- a/pypistats/run.py
+++ b/pypistats/run.py
@@ -11,7 +11,7 @@ from pypistats.settings import configs
 
 
 # change this for migrations
-env = os.environ.get("ENV", "prod")
+env = os.environ.get("ENV", "dev")
 
 app = create_app(configs[env])
 celery = create_celery(app)
diff --git a/pypistats/settings.py b/pypistats/settings.py
index 8932047..fa1cab7 100644
--- a/pypistats/settings.py
+++ b/pypistats/settings.py
@@ -1,21 +1,9 @@
 """Application configuration."""
-import json
 import os
 
 from celery.schedules import crontab
 
 
-# For local use.
-def load_env_vars(env="dev"):
-    """Load environment variables."""
-    local_path = os.path.join(
-        os.path.dirname(os.path.abspath(__file__)),
-        "secret",
-        f"env_vars_{env}.json")
-    for key, value in json.load(open(local_path, "r")).items():
-        os.environ[key] = value
-
-
 def get_db_uri(env):
     """Get the database URI."""
     return \
@@ -52,8 +40,6 @@ class ProdConfig(Config):
 
     DEBUG = False
     ENV = "prod"
-    if os.environ.get("ENV", None) is None:
-        load_env_vars(ENV)
     SQLALCHEMY_DATABASE_URI = get_db_uri(ENV)
 
 
@@ -62,8 +48,6 @@ class DevConfig(Config):
 
     DEBUG = True
     ENV = "dev"
-    if os.environ.get("ENV", None) is None:
-        load_env_vars(ENV)
     SQLALCHEMY_DATABASE_URI = get_db_uri(ENV)
 
 
@@ -72,8 +56,6 @@ class TestConfig(Config):
 
     DEBUG = True
     ENV = "dev"
-    if os.environ.get("ENV", None) is None:
-        load_env_vars(ENV)
     SQLALCHEMY_DATABASE_URI = get_db_uri(ENV)
     TESTING = True
     WTF_CSRF_ENABLED = False  # Allows form testing
diff --git a/run.sh b/run.sh
index ef64954..91253ec 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,5 @@
-export FLASK_APP=pypistats/run.py
-export FLASK_DEBUG=1
+export ENV=prod
+set -o allexport
+source pypistats/secret/$ENV.env
+set +o allexport
 flask run --host=0.0.0.0