mirror of
https://github.com/frappe/frappe_docker.git
synced 2024-11-10 07:11:00 +00:00
87c251a464
ISSUE ----- `$http_host` is used for setting header 'X-Frappe-Site-Name' which adds port number to the header along with the host value. Frappe source app.py expects the header value to contain only the host name and not the port number. So `$host` should be used instead of `$http_host` to set the 'X-Frappe-Site-Name' header `$http_host` vs `$host` in nginx -------------------------------- `$http_host` contains the host name along with port number whereas `$host` contains only the host name in lowercase without the port number. > `$host` - This variable is equal to line Host in the header of request or > name of the server processing the request if the Host header is not available. > This variable may have a different value from $http_host in such cases: > * when the Host input header is absent or has an empty value, > `$host` equals to the value of server_name directive; > * when the value of Host contains port number, `$host` doesn't include > that port number. $host's value is always lowercase since 0.8.17. > - [$host vs $http_host stackoverflow](https://stackoverflow.com/questions/15414810/whats-the-difference-of-host-and-http-host-in-nginx) From the frappe source file [app.py](https://github.com/frappe/frappe/blob/develop/frappe/app.py#L107), X-Frappe-Site-Name is used if its set. ```Python site = _site or request.headers.get('X-Frappe-Site-Name') or get_site_name(request.host) ``` Since `$host` variable will never contain port number which is not the case with `$http_host`, `$host` should be used for setting the header 'X-Frappe-Site-Name'. Otherwise we have issues with site serving. Tested the above changes in compose as well as in swarm environment. In compose, tested the site with host mapping of 80 and 8000. Works with both the host port mapping. Tested with erpnext version - v12.5.2 Changes to be committed: modified: build/common/nginx-default.conf.template
105 lines
2.8 KiB
Plaintext
105 lines
2.8 KiB
Plaintext
upstream frappe-server {
|
|
server ${FRAPPE_PY}:${FRAPPE_PY_PORT} fail_timeout=0;
|
|
}
|
|
|
|
upstream socketio-server {
|
|
server ${FRAPPE_SOCKETIO}:${SOCKETIO_PORT} fail_timeout=0;
|
|
}
|
|
|
|
server {
|
|
listen 80;
|
|
server_name $http_host;
|
|
root /var/www/html;
|
|
|
|
add_header X-Frame-Options "SAMEORIGIN";
|
|
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
|
|
add_header X-Content-Type-Options nosniff;
|
|
add_header X-XSS-Protection "1; mode=block";
|
|
|
|
location /assets {
|
|
try_files $uri =404;
|
|
}
|
|
|
|
location ~ ^/protected/(.*) {
|
|
internal;
|
|
try_files /sites/$http_host/$1 =404;
|
|
}
|
|
|
|
location /socket.io {
|
|
proxy_http_version 1.1;
|
|
proxy_set_header Upgrade $http_upgrade;
|
|
proxy_set_header Connection "upgrade";
|
|
proxy_set_header X-Frappe-Site-Name $host;
|
|
proxy_set_header Origin $scheme://$http_host;
|
|
proxy_set_header Host $http_host;
|
|
|
|
proxy_pass http://socketio-server;
|
|
}
|
|
|
|
location / {
|
|
rewrite ^(.+)/$ $1 permanent;
|
|
rewrite ^(.+)/index\.html$ $1 permanent;
|
|
rewrite ^(.+)\.html$ $1 permanent;
|
|
|
|
location ~ ^/files/.*.(htm|html|svg|xml) {
|
|
add_header Content-disposition "attachment";
|
|
try_files /sites/$http_host/public/$uri @webserver;
|
|
}
|
|
|
|
try_files /sites/$http_host/public/$uri @webserver;
|
|
}
|
|
|
|
location @webserver {
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_set_header X-Frappe-Site-Name $host;
|
|
proxy_set_header Host $http_host;
|
|
proxy_set_header X-Use-X-Accel-Redirect True;
|
|
proxy_read_timeout 120;
|
|
proxy_redirect off;
|
|
|
|
proxy_pass http://frappe-server;
|
|
}
|
|
|
|
# error pages
|
|
error_page 502 /502.html;
|
|
location /502.html {
|
|
root /var/www/templates;
|
|
internal;
|
|
}
|
|
|
|
# optimizations
|
|
sendfile on;
|
|
keepalive_timeout 15;
|
|
client_max_body_size 50m;
|
|
client_body_buffer_size 16K;
|
|
client_header_buffer_size 1k;
|
|
|
|
# enable gzip compresion
|
|
# based on https://mattstauffer.co/blog/enabling-gzip-on-nginx-servers-including-laravel-forge
|
|
gzip on;
|
|
gzip_http_version 1.1;
|
|
gzip_comp_level 5;
|
|
gzip_min_length 256;
|
|
gzip_proxied any;
|
|
gzip_vary on;
|
|
gzip_types
|
|
application/atom+xml
|
|
application/javascript
|
|
application/json
|
|
application/rss+xml
|
|
application/vnd.ms-fontobject
|
|
application/x-font-ttf
|
|
application/font-woff
|
|
application/x-web-app-manifest+json
|
|
application/xhtml+xml
|
|
application/xml
|
|
font/opentype
|
|
image/svg+xml
|
|
image/x-icon
|
|
text/css
|
|
text/plain
|
|
text/x-component;
|
|
# text/html is always compressed by HttpGzipModule
|
|
}
|