Permit configuration via environment variables; remove default config…

… file in favor of CONFIG_FILE= environment variable
stewartadam · Jun 2, 2018 · c2e608f · c2e608f
1 parent 3c378a4
commit c2e608f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -1,4 +1,5 @@
 flask
+flask-env
 flask-failsafe
 flask-sqlalchemy
 flask-limiter

diff --git a/server/zkvgateway/__init__.py b/server/zkvgateway/__init__.py
@@ -4,12 +4,13 @@
 from flask_limiter.util import get_remote_address
 
 app = flask.Flask(__name__)
+app.config.from_object('zkvgateway.config.DefaultConfig')
+app.config.from_envvar('CONFIG_FILE', silent=True)
+
 limiter = Limiter(
   app,
   key_func=get_remote_address
 )
-app.config.from_object('zkvgateway.config.DefaultConfig')
-app.config.from_pyfile('zfs-keyvault-gateway.cfg')
 
 db = flask_sqlalchemy.SQLAlchemy(app)
 

diff --git a/server/zkvgateway/config.py b/server/zkvgateway/config.py
@@ -1,11 +1,15 @@
-class DefaultConfig(object):
+from flask_env import MetaFlaskEnv
+
+class DefaultConfig(metaclass=MetaFlaskEnv):
+    ENV_PREFIX = 'ZKV_'
+
     DEBUG = False
     SQLALCHEMY_DATABASE_URI = 'sqlite:///db.sqlite'
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
     AAD_RESOURCE = 'https://vault.azure.net'
     AAD_AUTHORITY_HOST_URI = 'https://login.microsoftonline.com'
-    MAX_WAIT = 30
+    MAX_WAIT = 60
     PIN_LENGTH = 6
 
     AAD_CLIENT_ID = 'guid-here'

diff --git a/server/zkvgateway/zfs-keyvault-gateway.cfg.sample b/server/zkvgateway/zfs-keyvault-gateway.cfg.sample