Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed login #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed login #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions initdb/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion webapps/ROOT/WEB-INF/classes/jdbc.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion webapps/ROOT/WEB-INF/classes/security.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down