From 13db88b8100fdfb47d0fd3fffc03d3f154f4418f Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Thu, 26 Mar 2020 11:17:42 +0100 Subject: [PATCH] fix --- README.md | 10 +++++++++- src/main/resources/application-prod.properties | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f588721..639d6af 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ of `$PASSWORD` and `$SECRET` to respectively the chosen PostgreSQL password and the JWT secret used to run the server. `$SECRET` must be at least 64 chars long. ```yaml -version: '3' +version: '2.1' services: smarthutdb: @@ -24,10 +24,18 @@ services: POSTGRES_DB: smarthut POSTGRES_USERNAME: postgres POSTGRES_PASSWORD: $PASSWORD + healthcheck: + test: ["CMD-SHELL", "pg_isready -U postgres"] + interval: 5s + timeout: 5s + retries: 30 smarthutbackend: restart: always image: smarthutsm/smarthut-backend:M1 + depends_on: + smarthutdb: + condition: service_healthy ports: - 8080:8080 environment: diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 482fa13..5888106 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -32,11 +32,11 @@ spring.mail.properties.mail.smtp.writetimeout=5000 email.registrationSubject=Complete your SmartHut.sm registration email.registration=To confirm your registration, please click here: email.registrationPath=${BACKEND_URL}/register/confirm-account?token= -email.registrationSuccess=${FRONTEND_URL} +email.registrationRedirect=${FRONTEND_URL} # Password reset email properties email.resetpasswordSubject=SmartHut.sm password reset email.resetpassword=To reset your password, please click here: email.resetpasswordPath=${FRONTEND_URL}/password-reset?token= -email.resetPasswordSuccess=${FRONTEND_URL}/conf-reset-pass \ No newline at end of file +email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass \ No newline at end of file