kingfisher-main: Add Pelican Google user and escape newlines in priva…

…te key
open-contracting · Aug 14, 2023 · 0f1e9ad · 0f1e9ad
1 parent 0eeee8e
commit 0f1e9ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pillar/kingfisher_main.sls b/pillar/kingfisher_main.sls
@@ -212,8 +212,9 @@ docker_apps:
       DJANGO_PROXY: True
       ALLOWED_HOSTS: pelican.open-contracting.org
       SECURE_HSTS_SECONDS: 31536000
-      RABBIT_EXCHANGE_NAME: *PELICAN_BACKEND_RABBIT_EXCHANGE_NAME
       CORS_ALLOWED_ORIGINS: https://pelican.open-contracting.org
+      RABBIT_EXCHANGE_NAME: *PELICAN_BACKEND_RABBIT_EXCHANGE_NAME
+      GOOGLE_DRIVE_USER = pelican@pelican-289615.iam.gserviceaccount.com
       # Avoid warning: "Matplotlib created a temporary config/cache directory at /.config/matplotlib because the
       # default path (/tmp/matplotlib-........) is not a writable directory; it is highly recommended to set the
       # MPLCONFIGDIR environment variable to a writable directory, in particular to speed up the import of Matplotlib

diff --git a/salt/pelican/frontend/files/credentials.json b/salt/pelican/frontend/files/credentials.json
@@ -2,7 +2,7 @@
   "type": "service_account",
   "project_id": "{{ project_id }}",
   "private_key_id": "{{ private_key_id }}",
-  "private_key": "{{ private_key }}",
+  "private_key": {{ private_key|tojson }},
   "client_email": "{{ client_email }}",
   "client_id": "{{ client_id }}",
   "auth_uri": "https://accounts.google.com/o/oauth2/auth",