From 1e547724a63d6a40c062c424fe41dffad689a42e Mon Sep 17 00:00:00 2001
From: Jeremy Denquin <jdenquin@gmail.com>
Date: Tue, 12 Jul 2022 16:37:28 +0200
Subject: [PATCH] fix: some variables issues

---
 api                |  2 +-
 docker-compose.yml | 23 +++++++++++++----------
 front              |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/api b/api
index 31047eea4..fe1d1b762 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit 31047eea4030214d2b3d803560803ffa34af1585
+Subproject commit fe1d1b762dab54beb67cd8927eb28ad272472179
diff --git a/docker-compose.yml b/docker-compose.yml
index 987aa71d5..5ad26fafa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,16 +43,17 @@ services:
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - LAGO_FRONT_URL=${LAGO_FRONT_URL:-http://localhost}
+      - RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - LAGO_RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - LAGO_SIDEKIQ_WEB=${LAGO_SIDEKIQ_WEB}
       - ENCRYPTION_PRIMARY_KEY=${LAGO_ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key}
       - ENCRYPTION_DETERMINISTIC_KEY=${LAGO_ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key}
       - ENCRYPTION_KEY_DERIVATION_SALT=${LAGO_ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt}
-      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3}
-      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID}
-      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY}
-      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION}
-      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET}
+      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3:-false}
+      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID:-azerty123456}
+      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY:-azerty123456}
+      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION:-us-east-1}
+      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET:-bucket}
       - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000}
       - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379}
     ports:
@@ -86,14 +87,15 @@ services:
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - LAGO_RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
+      - RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - ENCRYPTION_PRIMARY_KEY=${LAGO_ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key}
       - ENCRYPTION_DETERMINISTIC_KEY=${LAGO_ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key}
       - ENCRYPTION_KEY_DERIVATION_SALT=${LAGO_ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt}
-      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3}
-      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID}
-      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY}
-      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION}
-      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET}
+      - LAGO_USE_AWS_S3=${LAGO_USE_AWS_S3:-false}
+      - LAGO_AWS_S3_ACCESS_KEY_ID=${LAGO_AWS_S3_ACCESS_KEY_ID:-azerty123456}
+      - LAGO_AWS_S3_SECRET_ACCESS_KEY=${LAGO_AWS_S3_SECRET_ACCESS_KEY:-azerty123456}
+      - LAGO_AWS_S3_REGION=${LAGO_AWS_S3_REGION:-us-east-1}
+      - LAGO_AWS_S3_BUCKET=${LAGO_AWS_S3_BUCKET:-bucket}
       - LAGO_PDF_URL=${LAGO_PDF_URL:-http://pdf:3000}
       - LAGO_REDIS_CACHE_URL=redis://${LAGO_REDIS_CACHE_HOST:-redis}:${LAGO_REDIS_CACHE_PORT:-6379}
 
@@ -112,6 +114,7 @@ services:
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - LAGO_RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
+      - RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY} # Should be base64 encoded
       - ENCRYPTION_PRIMARY_KEY=${LAGO_ENCRYPTION_PRIMARY_KEY:-your-encrpytion-primary-key}
       - ENCRYPTION_DETERMINISTIC_KEY=${LAGO_ENCRYPTION_DETERMINISTIC_KEY:-your-encrpytion-deterministic-key}
       - ENCRYPTION_KEY_DERIVATION_SALT=${LAGO_ENCRYPTION_KEY_DERIVATION_SALT:-your-encrpytion-derivation-salt}
diff --git a/front b/front
index 021105812..5fa27b2b3 160000
--- a/front
+++ b/front
@@ -1 +1 @@
-Subproject commit 02110581297b665060836a62f1c79b11405a3880
+Subproject commit 5fa27b2b346c2729e42158cdad384cec43ef1ab6