Merge branch 'develop' into read-env

Uma-Tech · Nov 17, 2020 · 343e834 · 343e834
2 parents 2e34635 + 1b337b4
commit 343e834
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -40,6 +40,7 @@ jobs:
     - name: Run autotests
       env:
         PARROT_DB_HOST: postgres
+        PARROT_SECRET_KEY: secret
       run: |
         poetry run pytest --cov=./ --cov-report=xml
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Version history
 We follow [Semantic Versions](https://semver.org/).
 
+## 0.1.5
+- Add PARROT_ALLOWED_HOSTS env var [#63](https://github.com/Uma-Tech/parrot/pull/63)
+
 ## 0.1.4
 - Remove inline logs from http-stub page [#58](https://github.com/Uma-Tech/parrot/pull/58)
 

diff --git a/parrot/settings.py b/parrot/settings.py
@@ -6,11 +6,11 @@
 BASE_DIR = Path(__file__).parent.parent
 environ.Env.read_env(str(BASE_DIR / '.env'))
 
-SECRET_KEY = '^c!x7!qejlut8=d3=mls9c%u-+(8t#&cfap5#=w%10t@&*b4=6'
+SECRET_KEY = env('PARROT_SECRET_KEY')
 
 DEBUG = env.bool('DEBUG', False)
 
-ALLOWED_HOSTS = ['127.0.0.1', 'parrotworker']
+ALLOWED_HOSTS = env.list('PARROT_ALLOWED_HOSTS', default=['127.0.0.1'])
 
 INSTALLED_APPS = [
     'simpleui',

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "parrot"
-version = "0.1.4"
+version = "0.1.5"
 description = "Service for testing http requests and webhooks."
 authors = ["Evgeniy Mitin <[email protected]>"]
 maintainers = ["Evgeniy Mitin <[email protected]>"]