Start using Goodconf.

mblayman · Nov 2, 2019 · 1656d2e · 1656d2e
1 parent 28a8369
commit 1656d2e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -84,6 +84,7 @@ assets/fonts
 assets/images/img
 assets/images/node_modules
 
+settings.yaml
 settings/_*.py
 conductor/templates/sitemap.xml
 media

diff --git a/mypy.ini b/mypy.ini
@@ -26,6 +26,9 @@ ignore_missing_imports = True
 [mypy-faker.*]
 ignore_missing_imports = True
 
+[mypy-goodconf.*]
+ignore_missing_imports = True
+
 [mypy-google.*]
 ignore_missing_imports = True
 

diff --git a/requirements.in b/requirements.in
@@ -6,6 +6,7 @@ django-anymail==3.0
 django-localflavor==2.0
 django-storages==1.6.6
 django-waffle==0.15.1
+goodconf[yaml]==1.0.0
 google-api-python-client==1.6.4
 # google-auth-httplib2 has an adapter to make google-auth creds work
 # with the Python client.

diff --git a/requirements.txt b/requirements.txt
@@ -20,6 +20,7 @@ django-waffle==0.15.1
 django==2.0.9
 docutils==0.14            # via botocore
 gevent==1.4.0             # via wal-e
+goodconf[yaml]==1.0.0
 google-api-python-client==1.6.4
 google-auth-httplib2==0.0.3
 google-auth-oauthlib==0.2.0
@@ -40,6 +41,8 @@ requests-oauthlib==1.2.0  # via google-auth-oauthlib
 requests==2.9.1
 rollbar==0.14.7
 rsa==4.0                  # via google-auth, oauth2client
+ruamel.yaml.clib==0.2.0   # via ruamel.yaml
+ruamel.yaml==0.16.5       # via goodconf
 s3transfer==0.1.13        # via boto3
 six==1.12.0               # via django-anymail, google-api-python-client, google-auth, oauth2client, python-dateutil, rollbar
 stripe==2.11.0

diff --git a/settings/base.py b/settings/base.py
@@ -5,14 +5,17 @@
 
 import conductor
 
+from .conf import config
+
+config.load()
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT_DIR = os.path.dirname(BASE_DIR)
 
 SECRET_KEY = "y$l*8=9d0b^nbf4c#vs+z=d)vb(3rsgvcx!+2as@f5f2s*#x=q"
 
-# Other settings must explicitly opt-in for debug mode.
-DEBUG = False
+DEBUG = config.DEBUG
 
 DATABASES = {
     "default": {

diff --git a/settings/conf.py b/settings/conf.py
@@ -0,0 +1,10 @@
+from goodconf import GoodConf, Value
+
+
+class Config(GoodConf):
+    """Configuration settings for College Conductor"""
+
+    DEBUG = Value(default=False, help="Toggle debugging.")
+
+
+config = Config(default_files=["/etc/conductor/settings.yaml", "settings.yaml"])
diff --git a/settings/development.py b/settings/development.py
@@ -1,7 +1,5 @@
 from settings.base import *  # noqa
 
-DEBUG = True
-
 INTERNAL_IPS = ("127.0.0.1",)
 INSTALLED_APPS += ("debug_toolbar",)  # noqa
 MIDDLEWARE.insert(0, "debug_toolbar.middleware.DebugToolbarMiddleware")  # noqa