3 files changed, 15 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index a09b786..e20d313 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 __pycache__
+config.py
 custom_templates
 uploads
diff --git a/README.md b/README.md
index 202f307..a10f558 100644
--- a/README.md
+++ b/README.md
@@ -190,12 +190,25 @@ The `key` parameter is the key from a previously uploaded file.
 ```
 
 # Docker
+
 There are two Dockerfiles present in this repository. The file called `Dockerfile.development` is used for development 
 and `Dockerfile.production` is used for production deployments.
 
 You can find the automated docker builds in the registry of this 
 repository: https://0xacab.org/jvoisin/mat2-web/container_registry
 
+# Configuration
+
+The default settings from `main.py` may be overridden by adding a `config.py`
+file and add custom values for the relevant flask config variables. E.g.:
+
+```
+MAX_CONTENT_LENGTH = 32 * 1024 * 1024  # 32MB
+```
+
+See [Flask configuration docs](http://exploreflask.com/en/latest/configuration.html)
+for further information.
+
 # Custom templates
 
 You can override the default templates from `templates/` by putting replacements
diff --git a/main.py b/main.py
index 2309bf8..bd1a0c3 100644
--- a/main.py
+++ b/main.py
@@ -25,6 +25,7 @@ def create_app(test_config=None):
     app.config['UPLOAD_FOLDER'] = './uploads/'
     app.config['MAX_CONTENT_LENGTH'] = 16 * 1024 * 1024  # 16MB
     app.config['CUSTOM_TEMPLATES_DIR'] = 'custom_templates'
+    app.config.from_object('config') # optionally load settings from config.py
 
     app.jinja_loader = jinja2.ChoiceLoader([  # type: ignore
         jinja2.FileSystemLoader(app.config['CUSTOM_TEMPLATES_DIR']),