File discourse.fix-nginx-config.patch of Package discourse

Overview Repositories Revisions Requests Users Attributes Meta

File discourse.fix-nginx-config.patch of Package discourse (Revision 4731fb2cc3b958fc58f6d83d5f8a7363)

Currently displaying revision 4731fb2cc3b958fc58f6d83d5f8a7363 , Show latest

Index: discourse/config/nginx.sample.conf
===================================================================
--- discourse.orig/config/nginx.sample.conf
+++ discourse/config/nginx.sample.conf
@@ -4,15 +4,15 @@ types {
     application/wasm wasm;
 }
 
-upstream discourse {
-  server unix:/var/www/discourse/tmp/sockets/nginx.http.sock;
-  server unix:/var/www/discourse/tmp/sockets/nginx.https.sock;
-}
+# upstream discourse {
+#   server unix:/var/www/discourse/tmp/sockets/nginx.http.sock;
+#   server unix:/var/www/discourse/tmp/sockets/nginx.https.sock;
+# }
 
 # inactive means we keep stuff around for 1440m minutes regardless of last access (1 week)
 # levels means it is a 2 deep hierarchy cause we can have lots of files
 # max_size limits the size of the cache
-proxy_cache_path /var/nginx/cache inactive=1440m levels=1:2 keys_zone=one:10m max_size=600m;
+proxy_cache_path /var/lib/nginx/cache/ inactive=1440m levels=1:2 keys_zone=one:10m max_size=600m;
 
 # Increased from the default value to acommodate large cookies during oAuth2 flows
 # like in https://meta.discourse.org/t/x/74060 and large CSP and Link (preload) headers
@@ -28,6 +28,9 @@ large_client_header_buffers 4 32k;
 # upstream discourse {
 #   server unix:/var/www/discourse/tmp/sockets/puma.sock;
 # }
+upstream discourse {
+  server unix:/srv/www/vhosts/discourse/tmp/sockets/puma.sock;
+}
 
 
 # attempt to preserve the proto, must be in http context
@@ -47,7 +50,7 @@ geo $bypass_cache {
 
 server {
 
-  access_log /var/log/nginx/access.log log_discourse;
+  access_log /var/log/nginx/discourse.access.log log_discourse;
 
   listen 80;
   gzip on;
@@ -80,7 +83,7 @@ server {
   client_max_body_size 10m;
 
   # path to discourse's public directory
-  set $public /var/www/discourse/public;
+  set $public /srv/www/vhosts/discourse/public; # $public
 
   # without weak etags we get zero benefit from etags on dynamically compressed content
   # further more etags are based on the file in nginx not sha of data
@@ -281,6 +284,7 @@ server {
   }
 
   location @discourse {
+    root $public;
     proxy_set_header Host $http_host;
     proxy_set_header X-Request-Start "t=${msec}";
     proxy_set_header X-Real-IP $remote_addr;

Places

File discourse.fix-nginx-config.patch of Package discourse (Revision 4731fb2cc3b958fc58f6d83d5f8a7363)

Places