From 76e1c71cd1ebccdb2f469b5a8f4fc5f5293791f8 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 16 Jul 2020 00:48:01 +0300 Subject: [PATCH] Use default Django secret key from settings.py --- .gitlab-ci.yml | 4 ++-- sikweb/settings.py | 2 +- stack-compose-dev.yml | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9e0794..6956703 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,11 +74,11 @@ publish: deploy:dev: stage: deploy image: docker:stable + only: + - develop environment: name: dev url: http://api.dev.sik.party - only: - - develop variables: DOCKER_HOST: $DEV_CI_DOCKER_HOST DOCKER_TLS_VERIFY: 1 diff --git a/sikweb/settings.py b/sikweb/settings.py index 90a65dd..e553b25 100644 --- a/sikweb/settings.py +++ b/sikweb/settings.py @@ -22,7 +22,7 @@ if DEBUG: ALLOWED_HOSTS = ["*"] # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.getenv('SECRET_KEY', '') +SECRET_KEY = os.getenv('SECRET_KEY', '7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&71=a8)dp(') # ReCaptcha # http://www.yaconiello.com/blog/integrating-google-recaptcha-to-django/ diff --git a/stack-compose-dev.yml b/stack-compose-dev.yml index b23aad8..1cd9da7 100644 --- a/stack-compose-dev.yml +++ b/stack-compose-dev.yml @@ -29,14 +29,6 @@ services: environment: - HOST=api.dev.sik.party - DEBUG=True - - SECRET_KEY=7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&71=a8)dp( - - EMAIL_PASSWD_FILE=/run/secrets/DJANGO_EMAIL_PASSWD - - secrets: - - DJANGO_EMAIL_PASSWD -secrets: - DJANGO_EMAIL_PASSWD: - external: true volumes: dbdata: