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

Moved client_max_body_size to right position.

Browse source
This commit is contained in:
Martin Edenhofer 2014-04-24 18:25:26 +02:00
parent 444d820112
commit ff74c847e9
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/nginx-zammad.conf
View file

@ -1,6 +1,6 @@
# #
# this is the nginx config for zammad # this is the nginx config for zammad
# link this file in your /etc/nginx/sites-enabled via symlink # link this file in your /etc/nginx/sites-enabled via symlink
# (ln -s /opt/zammad/contrib/nginx-zammad.conf /etc/nginx/sites-enabled/zammad.conf) # (ln -s /opt/zammad/contrib/nginx-zammad.conf /etc/nginx/sites-enabled/zammad.conf)
# #
@ -12,6 +12,8 @@ server {
access_log /var/log/nginx/zammad.access.log; access_log /var/log/nginx/zammad.access.log;
error_log /var/log/nginx/zammad.error.log; error_log /var/log/nginx/zammad.error.log;
client_max_body_size 50M;
location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) { location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
expires max; expires max;
} }
@ -26,6 +28,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://localhost:3000;
} }
} }

42
contrib/nginx/sites-enabled/zammad.conf
View file

@ -4,28 +4,30 @@
# #
server { server {
listen 80; listen 80;
server_name your.domain.org; server_name your.domain.org;
root /opt/zammad/public; root /opt/zammad/public;
access_log /var/log/nginx/zammad.access.log; access_log /var/log/nginx/zammad.access.log;
error_log /var/log/nginx/zammad.error.log; error_log /var/log/nginx/zammad.error.log;
location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) { client_max_body_size 50M;
expires max;
}
location /ws { location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
proxy_http_version 1.1; expires max;
proxy_set_header Upgrade $http_upgrade; }
proxy_set_header Connection "Upgrade";
proxy_pass http://localhost:6042;
proxy_read_timeout 86400;
}
location / { location /ws {
proxy_set_header Host $host; proxy_http_version 1.1;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade;
proxy_pass http://localhost:3000; proxy_set_header Connection "Upgrade";
} proxy_pass http://localhost:6042;
proxy_read_timeout 86400;
}
location / {
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:3000;
}
} }