Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2014-05-03 14:34:44 +02:00
commit 1528e6dc2e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/nginx-zammad.conf
View file

@ -13,6 +13,10 @@ server {
error_log /var/log/nginx/zammad.error.log; error_log /var/log/nginx/zammad.error.log;
client_max_body_size 50M; client_max_body_size 50M;
upstream zammad {
server unix://opt/zammad/var/zammad.sock
}
location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) { location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
expires max; expires max;
@ -28,6 +32,6 @@ server {
location / { location / {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:3000; proxy_pass http://zammad;
} }
} }