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-03-20 09:53:44 +01:00
commit 2600a5854c
2 changed files with 55 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
contrib/nginx-zammad.conf Normal file
View file

@ -0,0 +1,31 @@
#
# this is the nginx config for zammad
# 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)
#
server {
listen 80;
server_name your.domain.org;
root /opt/zammad/public;
access_log /var/log/nginx/zammad.access.log;
error_log /var/log/nginx/zammad.error.log;
location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
expires max;
}
location /ws {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_pass http://localhost:6042;
}
location / {
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:3000;
}
}

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

@ -1,26 +1,30 @@
#
# this is the nginx config for zammad
# link this file in your sites-enabled via symlink (ln -s nginx-zammad.conf /etc/nginx/sites-enabled/zammad.conf)
#
server { server {
listen 80; listen 80;
server_name localhost; server_name your.domain.org;
root /path_/to_/zammad; root /opt/zammad/public;
location /ws { access_log /var/log/nginx/zammad.access.log;
proxy_pass http://localhost:6042; error_log /var/log/nginx/zammad.error.log;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_read_timeout 86400;
}
location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) { location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
root /path_/to_/zammad/public; expires max;
access_log off; }
expires max;
}
location / { location /ws {
proxy_pass http://localhost:9292; proxy_http_version 1.1;
proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Connection "Upgrade";
} proxy_pass http://localhost:6042;
}
location / {
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:3000;
}
} }