From 9f01b8dfbc5cad8516e9f7dabc0691f64ee5515a Mon Sep 17 00:00:00 2001
From: Bert Palm <bert.palm@ufz.de>
Date: Mon, 13 Jan 2025 16:51:06 +0100
Subject: [PATCH] rename variable to CONFIGDB
---
cron/scripts/sftp_sync/sftp_sync.py | 6 +++---
docker-compose.yml | 11 ++++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cron/scripts/sftp_sync/sftp_sync.py b/cron/scripts/sftp_sync/sftp_sync.py
index fcb7f912..c0ab79a3 100755
--- a/cron/scripts/sftp_sync/sftp_sync.py
+++ b/cron/scripts/sftp_sync/sftp_sync.py
@@ -52,7 +52,7 @@ Arguments
Additional set the following environment variables:
MINIO_SECURE Use minio secure connection; [true, false, 1, 0]
- FTP_AUTH_DB_DSN DB which store the credentials for the internal
+ CONFIGDB_DSN DB which store the credentials for the internal
and external sftp server. See also DSN format below.
LOG_LEVEL Set the verbosity, defaults to INFO.
[DEBUG, INFO, WARNING, ERROR, CRITICAL]
@@ -70,10 +70,10 @@ if __name__ == "__main__":
thing_id = sys.argv[1]
ssh_priv_key = sys.argv[2]
- for k in ["FTP_AUTH_DB_DSN", "MINIO_URL", "MINIO_SECURE"]:
+ for k in ["CONFIGDB_DSN", "MINIO_URL", "MINIO_SECURE"]:
if not os.environ.get(k):
raise EnvironmentError(f"Environment variable {k} must be set")
- dsn = os.environ["FTP_AUTH_DB_DSN"]
+ dsn = os.environ["CONFIGDB_DSN"]
minio_secure = ( # ensure True as default
False if os.environ["MINIO_SECURE"].lower() in ["false", "0"] else True
)
diff --git a/docker-compose.yml b/docker-compose.yml
index 0faa4abd..f4804438 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -872,11 +872,12 @@ services:
LOG_LEVEL: "${LOG_LEVEL}"
MINIO_URL: "${MINIO_HOST}"
MINIO_SECURE: "${MINIO_SECURE}"
- FTP_AUTH_DB_DSN: "postgresql://\
- ${FRONTEND_POSTGRES_USER}:\
- ${FRONTEND_POSTGRES_PASS}@\
- ${FRONTEND_POSTGRES_HOST}/\
- ${FRONTEND_POSTGRES_DB}"
+ CONFIGDB_DSN: "postgresql://\
+ ${CONFIGDB_USER}:\
+ ${CONFIGDB_PASSWORD}@\
+ ${CONFIGDB_HOST}:\
+ ${CONFIGDB_PORT}/\
+ ${CONFIGDB_DB}"
DB_API_BASE_URL: "${DB_API_BASE_URL}"
depends_on:
init:
--
GitLab