From 4e8ed7b9ff57ad162f7254bbfba0bdaca3956b02 Mon Sep 17 00:00:00 2001 From: Ryanwalker277 Date: Sun, 14 May 2023 13:51:38 +0530 Subject: [PATCH] Fixed login --- initdb/init.sh | 9 ++++----- webapps/ROOT/WEB-INF/classes/jdbc.properties | 2 +- webapps/ROOT/WEB-INF/classes/security.properties | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/initdb/init.sh b/initdb/init.sh index cedb90f..02150ff 100755 --- a/initdb/init.sh +++ b/initdb/init.sh @@ -3,9 +3,8 @@ set -e echo "Running test script" -psql -v ON_ERROR_STOP=1 --username "aggregate" <<-EOSQL - \connect aggregate; - CREATE SCHEMA aggregate; - ALTER SCHEMA aggregate OWNER TO aggregate; - GRANT ALL PRIVILEGES ON SCHEMA aggregate TO aggregate; +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL + CREATE SCHEMA "$POSTGRES_DB"; + ALTER SCHEMA "$POSTGRES_DB" OWNER TO "$POSTGRES_USER"; + GRANT ALL PRIVILEGES ON SCHEMA "$POSTGRES_DB" TO "$POSTGRES_USER"; EOSQL diff --git a/webapps/ROOT/WEB-INF/classes/jdbc.properties b/webapps/ROOT/WEB-INF/classes/jdbc.properties index 331848d..14820d5 100644 --- a/webapps/ROOT/WEB-INF/classes/jdbc.properties +++ b/webapps/ROOT/WEB-INF/classes/jdbc.properties @@ -2,5 +2,5 @@ jdbc.driverClassName=org.postgresql.Driver #jdbc.resourceName=jdbc/aggregate jdbc.url=${DB_URL} jdbc.schema=${DB_SCHEMA} -jdbc.username=$DB_USERNAME} +jdbc.username=${DB_USERNAME} jdbc.password=${DB_PASSWORD} \ No newline at end of file diff --git a/webapps/ROOT/WEB-INF/classes/security.properties b/webapps/ROOT/WEB-INF/classes/security.properties index 8b788e2..98fcf04 100644 --- a/webapps/ROOT/WEB-INF/classes/security.properties +++ b/webapps/ROOT/WEB-INF/classes/security.properties @@ -1,7 +1,7 @@ #Wed Aug 11 22:04:46 IST 2021 security.server.realm.realmString=ODK Aggregate security.server.channelType=ANY_CHANNEL -security.server.superUserUsername=administrator +security.server.superUserUsername=${DB_USERNAME} security.server.forceHttpsLinks=false security.server.superUser= security.server.port=8080