From ee3dbb912f6478bcb59ed36409bab4b4b048de48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Thu, 17 Mar 2022 09:49:52 +0100
Subject: [PATCH] harmonize setting names

---
 README.rst                                                  | 4 ++--
 tutorcairn/patches/k8s-deployments                          | 4 ++--
 tutorcairn/patches/local-docker-compose-services            | 4 ++--
 tutorcairn/plugin.py                                        | 4 ++--
 tutorcairn/templates/cairn/apps/superset/superset_config.py | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index cc2c444..a515053 100644
--- a/README.rst
+++ b/README.rst
@@ -227,8 +227,8 @@ Postgresql/Superset settings
 
 - ``CAIRN_RUN_POSTGRESQL`` (default: ``true``): set to ``false`` to run your own Postgresql cluster separately from Cairn. Postgresql is the database that stores all data related to Superset, which is the Cairn frontend.
 - ``CAIRN_SUPERSET_DOCKER_IMAGE`` (default: ``"{{ DOCKER_REGISTRY }}overhangio/cairn-superset:{{ CAIRN_VERSION }}"``): name of the Docker image that runs Postgresql.
-- ``CAIRN_POSTGRESQL_DB`` (default: ``"superset"``): name of the Postgresql database.
-- ``CAIRN_POSTGRESQL_USER`` (default: ``"superset"``): Postgresql username.
+- ``CAIRN_POSTGRESQL_DATABASE`` (default: ``"superset"``): name of the Postgresql database.
+- ``CAIRN_POSTGRESQL_USERNAME`` (default: ``"superset"``): Postgresql username.
 - ``CAIRN_POSTGRESQL_PASSWORD`` (default: ``"{{ 20|random_string }}"``): Postgresql password.
 - ``CAIRN_SUPERSET_SECRET_KEY`` (default: ``"{{ 20|random_string }}"``): randomly-generated secret key for the Superset frontend.
 
diff --git a/tutorcairn/patches/k8s-deployments b/tutorcairn/patches/k8s-deployments
index 0ca749f..87b96a0 100644
--- a/tutorcairn/patches/k8s-deployments
+++ b/tutorcairn/patches/k8s-deployments
@@ -332,11 +332,11 @@ spec:
           image: docker.io/postgres:9.6-alpine
           env:
             - name: POSTGRES_USER
-              value: "{{ CAIRN_POSTGRESQL_USER }}"
+              value: "{{ CAIRN_POSTGRESQL_USERNAME }}"
             - name: POSTGRES_PASSWORD
               value: "{{ CAIRN_POSTGRESQL_PASSWORD }}"
             - name: POSTGRES_DB
-              value: "{{ CAIRN_POSTGRESQL_DB }}"
+              value: "{{ CAIRN_POSTGRESQL_DATABASE }}"
             # The following is required, otherwise postgresql refuses to
             # write to the non-empty directory which contains "lost+found".
             - name: PGDATA
diff --git a/tutorcairn/patches/local-docker-compose-services b/tutorcairn/patches/local-docker-compose-services
index d0094da..a5e8c0a 100644
--- a/tutorcairn/patches/local-docker-compose-services
+++ b/tutorcairn/patches/local-docker-compose-services
@@ -75,9 +75,9 @@ cairn-redis:
 cairn-postgresql:
     image: docker.io/postgres:9.6-alpine
     environment:
-        POSTGRES_USER: "{{ CAIRN_POSTGRESQL_USER }}"
+        POSTGRES_USER: "{{ CAIRN_POSTGRESQL_USERNAME }}"
         POSTGRES_PASSWORD: "{{ CAIRN_POSTGRESQL_PASSWORD }}"
-        POSTGRES_DB: "{{ CAIRN_POSTGRESQL_DB }}"
+        POSTGRES_DB: "{{ CAIRN_POSTGRESQL_DATABASE }}"
     volumes:
         - ../../data/cairn/postgresql:/var/lib/postgresql/data
     restart: unless-stopped
diff --git a/tutorcairn/plugin.py b/tutorcairn/plugin.py
index c000a71..5a7451d 100644
--- a/tutorcairn/plugin.py
+++ b/tutorcairn/plugin.py
@@ -28,8 +28,8 @@ config = {
         "CLICKHOUSE_USERNAME": "openedx",
         # Superset/Postgresql
         "RUN_POSTGRESQL": True,
-        "POSTGRESQL_USER": "superset",
-        "POSTGRESQL_DB": "superset",
+        "POSTGRESQL_DATABASE": "superset",
+        "POSTGRESQL_USERNAME": "superset",
         "SUPERSET_DOCKER_IMAGE": "{{ DOCKER_REGISTRY }}overhangio/cairn-superset:{{ CAIRN_VERSION }}",
     },
 }
diff --git a/tutorcairn/templates/cairn/apps/superset/superset_config.py b/tutorcairn/templates/cairn/apps/superset/superset_config.py
index f4f5bc3..319c86e 100644
--- a/tutorcairn/templates/cairn/apps/superset/superset_config.py
+++ b/tutorcairn/templates/cairn/apps/superset/superset_config.py
@@ -5,7 +5,7 @@ from celery.schedules import crontab
 
 # https://superset.apache.org/docs/installation/configuring-superset
 SECRET_KEY = "{{ CAIRN_SUPERSET_SECRET_KEY }}"
-SQLALCHEMY_DATABASE_URI = "postgresql+psycopg2://{{ CAIRN_POSTGRESQL_USER }}:{{ CAIRN_POSTGRESQL_PASSWORD }}@cairn-postgresql/{{ CAIRN_POSTGRESQL_DB }}"
+SQLALCHEMY_DATABASE_URI = "postgresql+psycopg2://{{ CAIRN_POSTGRESQL_USERNAME }}:{{ CAIRN_POSTGRESQL_PASSWORD }}@cairn-postgresql/{{ CAIRN_POSTGRESQL_DATABASE }}"
 
 DATA_CACHE_CONFIG = {
     "CACHE_TYPE": "redis",