Merge pull request #67 from deskpro/x-accel-redirect

Add support for use of the nginx X-Accell-Redirect headers
deskpro · Oct 9, 2024 · e91fa6d · e91fa6d
2 parents 5638c2d + f3b83ba
commit e91fa6d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/etc/nginx/conf.d/deskpro_fastcgi_noxaccel.tmpl b/etc/nginx/conf.d/deskpro_fastcgi_noxaccel.tmpl
@@ -0,0 +1 @@
+fastcgi_ignore_headers "X-Accel-Redirect" "X-Accel-Expires" "X-Accel-Limit-Rate" "X-Accel-Buffering" "X-Accel-Charset";
diff --git a/etc/nginx/conf.d/deskpro_server_params.tmpl b/etc/nginx/conf.d/deskpro_server_params.tmpl
@@ -25,24 +25,43 @@ location / {
     try_files $uri $uri/ /index.php?$query_string;
 }
 
+{{if (getenv "DESKPRO_BLOBS_PATH") }}
+location ^~ /sys/services/blobs/private {
+  internal;
+  alias {{ regexp.Replace "(/+|/*$)" "/" (getenv "DESKPRO_BLOBS_PATH") }};
+}
+{{end}}
+
+location ^~ /sys/services/blobs/fetch {
+    fastcgi_pass unix:/run/php_fpm_dp_internal.sock;
+    include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    {{if not (getenv "DESKPRO_BLOBS_PATH" )}}
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
+    {{end}}
+}
+
 location ^~ /sys/services/broadcaster/ {
     fastcgi_pass unix:/run/php_fpm_dp_broadcaster.sock;
     include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
 }
 
 location ~ ^/(admin\-api|agent\-api)/ {
     fastcgi_pass unix:/run/php_fpm_dp_gql.sock;
     include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
 }
 
 location ~ ^/(ticket\-channels|sys/services)/ {
     fastcgi_pass unix:/run/php_fpm_dp_internal.sock;
     include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
 }
 
 location ^~ /api/ {
     fastcgi_pass $dpv5_api_backend;
     include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
 }
 
 location ^~ /sys/services/messenger-api/ {
@@ -105,18 +124,21 @@ location ~ ^/deskpro-messenger/assets/ {
 location ^~ /firebase-messaging-sw.js {
     fastcgi_pass unix:/run/php_fpm_dp_default.sock;
     include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
 }
 
 location ~ ^/deskpro-messenger/ {
     add_header X-XSS-Protection "1; mode=block";
     add_header X-Content-Type-Options "nosniff";
     fastcgi_pass unix:/run/php_fpm_dp_default.sock;
     include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
 }
 
 location ~ \.php$ {
     fastcgi_pass unix:/run/php_fpm_dp_default.sock;
     include /etc/nginx/conf.d/deskpro_fastcgi_params;
+    include /etc/nginx/conf.d/deskpro_fastcgi_noxaccel;
 }
 
 location ~ /assets/[a-zA-Z0-9_\-\.]+/(pub|web)/.*?$ {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fastcgi_ignore_headers "X-Accel-Redirect" "X-Accel-Expires" "X-Accel-Limit-Rate" "X-Accel-Buffering" "X-Accel-Charset";