From 0615fe22504ae47178d49ee9f20a684551cbf40e Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Thu, 6 Mar 2025 12:40:10 +0100 Subject: [PATCH 1/2] fix: handle custom database users in the notify_push container Signed-off-by: Richard Steinmetz --- Containers/notify-push/start.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Containers/notify-push/start.sh b/Containers/notify-push/start.sh index eda094d1..d93be21c 100644 --- a/Containers/notify-push/start.sh +++ b/Containers/notify-push/start.sh @@ -60,8 +60,13 @@ elif [ "$DATABASE_TYPE" != postgres ] && [ "$DATABASE_TYPE" != mysql ]; then exit 1 fi +# Use the correct Postgres username +if [ "$POSTGRES_USER" = nextcloud ]; then + POSTGRES_USER="oc_$POSTGRES_USER" +fi + # Set sensitive values as env -export DATABASE_URL="$DATABASE_TYPE://oc_$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB" +export DATABASE_URL="$DATABASE_TYPE://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB" export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST/$REDIS_DB_INDEX" # Run it From 30b9a05263d44eac0bdc0310df5cfe392447237f Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Thu, 6 Mar 2025 14:00:17 +0100 Subject: [PATCH 2/2] adjust detail Signed-off-by: Simon L. --- Containers/notify-push/start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Containers/notify-push/start.sh b/Containers/notify-push/start.sh index d93be21c..e1bbf974 100644 --- a/Containers/notify-push/start.sh +++ b/Containers/notify-push/start.sh @@ -63,6 +63,7 @@ fi # Use the correct Postgres username if [ "$POSTGRES_USER" = nextcloud ]; then POSTGRES_USER="oc_$POSTGRES_USER" + export POSTGRES_USER fi # Set sensitive values as env