smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into 'dev'

Browse source 
Master

See merge request sa4-2020/the-sanmarinoes/backend!75
This commit is contained in:
Claudio Maggioni 2020-04-15 16:24:09 +02:00
commit a8ad054a13
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -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. and the JWT secret used to run the server. `$SECRET` must be at least 64 chars long.
```yaml ```yaml
version: '3' version: '2.1'
services: services:
smarthutdb: smarthutdb:
@ -24,10 +24,18 @@ services:
POSTGRES_DB: smarthut POSTGRES_DB: smarthut
POSTGRES_USERNAME: postgres POSTGRES_USERNAME: postgres
POSTGRES_PASSWORD: $PASSWORD POSTGRES_PASSWORD: $PASSWORD
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s
timeout: 5s
retries: 30
smarthutbackend: smarthutbackend:
restart: always restart: always
image: smarthutsm/smarthut-backend:M1 image: smarthutsm/smarthut-backend:M1
depends_on:
smarthutdb:
condition: service_healthy
ports: ports:
- 8080:8080 - 8080:8080
environment: environment:

4
src/main/resources/application-prod.properties
View file

@ -32,11 +32,11 @@ spring.mail.properties.mail.smtp.writetimeout=5000
email.registrationSubject=Complete your SmartHut.sm registration email.registrationSubject=Complete your SmartHut.sm registration
email.registration=To confirm your registration, please click here: email.registration=To confirm your registration, please click here:
email.registrationPath=${BACKEND_URL}/register/confirm-account?token= email.registrationPath=${BACKEND_URL}/register/confirm-account?token=
email.registrationSuccess=${FRONTEND_URL} email.registrationRedirect=${FRONTEND_URL}
# Password reset email properties # Password reset email properties
email.resetpasswordSubject=SmartHut.sm password reset email.resetpasswordSubject=SmartHut.sm password reset
email.resetpassword=To reset your password, please click here: email.resetpassword=To reset your password, please click here:
email.resetpasswordPath=${FRONTEND_URL}/password-reset?token= email.resetpasswordPath=${FRONTEND_URL}/password-reset?token=
email.resetPasswordSuccess=${FRONTEND_URL}/conf-reset-pass email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass