public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development

Browse source 
# Conflicts:
#	README.md
This commit is contained in:
Tomas Bures 2020-01-12 09:32:05 +01:00
commit 674399eb74
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -213,7 +213,7 @@ variables (e.g. `URL_BASE_TRUSTED=https://mailtrain.domain.com (and more env-var
| URL_BASE_TRUSTED | sets the trusted url of the instance (default: http://localhost:3000) | | URL_BASE_TRUSTED | sets the trusted url of the instance (default: http://localhost:3000) |
| URL_BASE_SANDBOX | sets the sandbox url of the instance (default: http://localhost:3003) | | URL_BASE_SANDBOX | sets the sandbox url of the instance (default: http://localhost:3003) |
| URL_BASE_PUBLIC | sets the public url of the instance (default: http://localhost:3004) | | URL_BASE_PUBLIC | sets the public url of the instance (default: http://localhost:3004) |
| WWW_PROXY | use if Mailtrain is behind an http reverse proxy (default: false) | | WWW_PROXY | use if Mailtrain is behind an http reverse proxy (default: false) |
| MONGO_HOST | sets mongo host (default: mongo) | | MONGO_HOST | sets mongo host (default: mongo) |
| REDIS_HOST | sets redis host (default: redis) | | REDIS_HOST | sets redis host (default: redis) |
| MYSQL_HOST | sets mysql host (default: mysql) | | MYSQL_HOST | sets mysql host (default: mysql) |