Merge branch 'develop' into 'master'

Totally works now See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!79
2022-08-16 19:33:24 +00:00
parent 9d116528b9 da3a484f6c
commit 570fff1d7d
2 changed files with 2 additions and 2 deletions
@@ -82,8 +82,7 @@ DATABASES = {

 # Google api settings
 GROUP_KEY = os.getenv("GROUP_KEY", "")
-# GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", "{}"))
-GOOGLE_SERVICE_ACCOUNT = json.loads("{}")
+GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", "{}"))

 # JWT authentication
 SIMPLE_JWT = {
@@ -41,6 +41,7 @@ services:
      - BACKEND_DB_PASSWD
      - BACKEND_EMAIL_API_KEY
      - GOOGLE_CREDS_JSON
+      
 secrets:
  BACKEND_SECRET_KEY:
    external: true