Merge branch 'master' of github.com:andris9/mailtrain

This commit is contained in:
Andris Reinman 2016-12-25 18:00:05 +02:00
commit 3afb37e169

View file

@ -137,7 +137,7 @@ Mailtrain uses [node-config](https://github.com/lorenwest/node-config) for confi
### Running behind Nginx proxy ### Running behind Nginx proxy
Edit [mailtrain.nginx](setup/mailtrain.nginx) (update `server_name` directive) and copy it to `/etc/nginx/sites-enabled` Edit [mailtrain.nginx](setup/mailtrain-nginx.conf) (update `server_name` directive) and copy it to `/etc/nginx/sites-enabled`
### Running as an Upstart service in Ubuntu 14.04 ### Running as an Upstart service in Ubuntu 14.04