Merge pull request 'corrected database credentials naming' (#74) from dev into main

Reviewed-on: #74
This commit was merged in pull request #74.
This commit is contained in:
2026-05-16 16:05:26 +00:00
7 changed files with 31 additions and 30 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"jellyfin": { "jellyfin": {
"USER": "#JELLYFIN_USER", "USER": "#USER",
"PASS": "#JELLYFIN_PASS" "PASS": "#PASS"
} }
} }
+7 -7
View File
@@ -1,15 +1,15 @@
{ {
"leantimemysql": { "leantimemysql": {
"MARIADB_DATABASE": "#DB_MYSQL", "MARIADB_DATABASE": "#MARIADB_DATABASE",
"MARIADB_USER": "#DB_USER", "MARIADB_USER": "#MARIADB_USER",
"MARIADB_PASSWORD": "#DB_PASSWORD", "MARIADB_PASSWORD": "#MARIADB_PASSWORD",
"MARIADB_ROOT_PASSWORD": "#DB_ROOT_PASSWORD" "MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD"
}, },
"leantimeapp": { "leantimeapp": {
"LEAN_DB_USER": "#DB_USER", "LEAN_DB_USER": "#MARIADB_USER",
"LEAN_DB_PASSWORD": "#DB_PASSWORD", "LEAN_DB_PASSWORD": "#MARIADB_PASSWORD",
"LEAN_DB_HOST": "leantimemysql-db", "LEAN_DB_HOST": "leantimemysql-db",
"LEAN_DB_DATABASE": "#DB_MYSQL", "LEAN_DB_DATABASE": "#MARIADB_DATABASE",
"LEAN_OIDC_CLIENT_SECRET": "#OIDC_CLIENT_SECRET", "LEAN_OIDC_CLIENT_SECRET": "#OIDC_CLIENT_SECRET",
"LEAN_S3_SECRET": "#S3_SECRET", "LEAN_S3_SECRET": "#S3_SECRET",
"LEAN_SESSION_PASSWORD": "#SESSION_PASSWORD" "LEAN_SESSION_PASSWORD": "#SESSION_PASSWORD"
+4 -4
View File
@@ -35,28 +35,28 @@
}, },
{ {
"description": "MYSQL database name", "description": "MYSQL database name",
"key": "DB_MYSQL", "key": "MARIADB_DATABASE",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "time|md5|10" "generated": "time|md5|10"
}, },
{ {
"description": "MYSQL username", "description": "MYSQL username",
"key": "DB_USER", "key": "MARIADB_USER",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "time|md5|8" "generated": "time|md5|8"
}, },
{ {
"description": "MYSQL password for user", "description": "MYSQL password for user",
"key": "DB_PASSWORD", "key": "MARIADB_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|md5|12" "generated": "random|md5|12"
}, },
{ {
"description": "MYSQL root user password", "description": "MYSQL root user password",
"key": "DB_ROOT_PASSWORD", "key": "MARIADB_ROOT_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|sha256|20" "generated": "random|sha256|20"
+5 -4
View File
@@ -1,13 +1,14 @@
{ {
"outlinepostgres": { "outlinepostgres": {
"POSTGRES_DB": "#DB_NAME", "POSTGRES_DB": "#POSTGRES_DB",
"POSTGRES_USER": "#DB_USER", "POSTGRES_USER": "#POSTGRES_USER",
"POSTGRES_PASSWORD": "#DB_PASSWORD" "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
"POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
}, },
"outlineapp": { "outlineapp": {
"SECRET_KEY": "#SECRET_KEY", "SECRET_KEY": "#SECRET_KEY",
"UTILS_SECRET": "#UTILS_SECRET", "UTILS_SECRET": "#UTILS_SECRET",
"DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@outlinepostgres-db:5432/#DB_NAME", "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@outlinepostgres-db:5432/#POSTGRES_DB",
"SLACK_CLIENT_ID": "#SLACK_CLIENT_ID", "SLACK_CLIENT_ID": "#SLACK_CLIENT_ID",
"SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET", "SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET",
"GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID",
+4 -4
View File
@@ -21,28 +21,28 @@
}, },
{ {
"description": "Postgres database name", "description": "Postgres database name",
"key": "DB_NAME", "key": "POSTGRES_DB",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "time|md5|8" "generated": "time|md5|8"
}, },
{ {
"description": "Postgres username", "description": "Postgres username",
"key": "DB_USER", "key": "POSTGRES_USER",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "time|md5|8" "generated": "time|md5|8"
}, },
{ {
"description": "Postgres password for user", "description": "Postgres password for user",
"key": "DB_PASSWORD", "key": "POSTGRES_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|md5|12" "generated": "random|md5|12"
}, },
{ {
"description": "Postgres root user password", "description": "Postgres root user password",
"key": "DB_ROOT_PASSWORD", "key": "POSTGRES_ROOT_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|sha256|20" "generated": "random|sha256|20"
+5 -5
View File
@@ -1,9 +1,9 @@
{ {
"quackbackpostgres": { "quackbackpostgres": {
"POSTGRES_DB": "#DB_NAME", "POSTGRES_DB": "#POSTGRES_DB",
"POSTGRES_USER": "#DB_USER", "POSTGRES_USER": "#POSTGRES_USER",
"POSTGRES_PASSWORD": "#DB_PASSWORD", "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
"POSTGRES_ROOT_PASSWORD": "#DB_ROOT_PASSWORD" "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
}, },
"quackbackminio": { "quackbackminio": {
"MINIO_ROOT_USER": "#MINIO_ROOT_USER", "MINIO_ROOT_USER": "#MINIO_ROOT_USER",
@@ -12,7 +12,7 @@
"quackbackapp": { "quackbackapp": {
"SECRET_KEY": "#SECRET_KEY", "SECRET_KEY": "#SECRET_KEY",
"UTILS_SECRET": "#UTILS_SECRET", "UTILS_SECRET": "#UTILS_SECRET",
"DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@quackbackpostgres-db:5432/#DB_NAME", "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@quackbackpostgres-db:5432/#POSTGRES_DB",
"SLACK_CLIENT_ID": "#SLACK_CLIENT_ID", "SLACK_CLIENT_ID": "#SLACK_CLIENT_ID",
"SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET", "SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET",
"GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID",
+4 -4
View File
@@ -21,28 +21,28 @@
}, },
{ {
"description": "Postgres database name", "description": "Postgres database name",
"key": "DB_NAME", "key": "POSTGRES_DB",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "time|md5|8" "generated": "time|md5|8"
}, },
{ {
"description": "Postgres username", "description": "Postgres username",
"key": "DB_USER", "key": "POSTGRES_USER",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "time|md5|8" "generated": "time|md5|8"
}, },
{ {
"description": "Postgres password for user", "description": "Postgres password for user",
"key": "DB_PASSWORD", "key": "POSTGRES_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|md5|12" "generated": "random|md5|12"
}, },
{ {
"description": "Postgres root user password", "description": "Postgres root user password",
"key": "DB_ROOT_PASSWORD", "key": "POSTGRES_ROOT_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|sha256|20" "generated": "random|sha256|20"