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

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

Browse source
This commit is contained in:
Thorsten Eckel 2018-07-19 08:24:21 +02:00
commit f2ff8ee532
1 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
contrib/nginx/zammad_ssl.conf
View file

@ -1,7 +1,7 @@
# #
# this is an example nginx config for using SSL with zammad # this is an example nginx config for using SSL with zammad
# this can be adjusted to be used with self-signed, trusted ca, and letsencrypt certs # this can be adjusted to be used with self-signed, trusted ca and letsencrypt certs
# replace all occurrences of example.com with your domain # this example uses letsencrypt certs. replace all occurrences of example.com with your domain
# If using LetsEncrypt create letsencrypt certificate by: certbot certonly --webroot -w /var/www/html -d www.example.com # If using LetsEncrypt create letsencrypt certificate by: certbot certonly --webroot -w /var/www/html -d www.example.com
# create dhparam.pem by: openssl dhparam -out /etc/nginx/ssl/dhparam.pem 4096 # create dhparam.pem by: openssl dhparam -out /etc/nginx/ssl/dhparam.pem 4096
# download LetsEncrypt x3 certificate by: wget -q https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem -P /etc/nginx/ssl # download LetsEncrypt x3 certificate by: wget -q https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem -P /etc/nginx/ssl
@ -19,7 +19,7 @@ upstream zammad-websocket {
server { server {
listen 80; listen 80;
server_name example.com www.example.com; server_name example.com;
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;
@ -39,8 +39,8 @@ server {
server_name example.com; server_name example.com;
ssl_certificate /etc/nginx/ssl/your_cert.crt; ssl_certificate /etc/nginx/ssl/example.com-fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/your_private_key.key; ssl_certificate_key /etc/nginx/ssl/example.com-privkey.pem;
ssl_protocols TLSv1.2; ssl_protocols TLSv1.2;
@ -62,40 +62,41 @@ server {
add_header Strict-Transport-Security "max-age=31536000" always; add_header Strict-Transport-Security "max-age=31536000" always;
location = /robots.txt { location = /robots.txt {
access_log off; log_not_found off; access_log off; log_not_found off;
} }
location = /favicon.ico { location = /favicon.ico {
access_log off; log_not_found off; access_log off; log_not_found off;
} }
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;
client_max_body_size 50M; 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;
} }
location /ws { location /ws {
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header CLIENT_IP $remote_addr; proxy_set_header CLIENT_IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 86400; proxy_read_timeout 86400;
proxy_pass http://zammad-websocket; proxy_pass http://zammad-websocket;
} }
location / {
proxy_set_header Host $http_host; location / {
proxy_set_header CLIENT_IP $remote_addr; proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header CLIENT_IP $remote_addr;
proxy_read_timeout 180; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://zammad-railsserver; proxy_read_timeout 180;
proxy_pass http://zammad-railsserver;
gzip on; gzip on;
gzip_types text/plain text/xml text/css image/svg+xml application/javascript application/x-javascript application/json application/xml; gzip_types text/plain text/xml text/css image/svg+xml application/javascript application/x-javascript application/json application/xml;