diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 1c7ffd59a596..18b61200aa1b 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -841,7 +841,7 @@ in inherit (cfg) sslCertificate sslCertificateKey enableACME; forceSSL = lib.mkDefault tlsEnabled; - root = "/run/discourse/public"; + root = "${cfg.package}/share/discourse/public"; locations = let @@ -893,7 +893,7 @@ in "~ ^/uploads/" = proxy { extraConfig = cache_1y + '' proxy_set_header X-Sendfile-Type X-Accel-Redirect; - proxy_set_header X-Accel-Mapping /run/discourse/public/=/downloads/; + proxy_set_header X-Accel-Mapping ${cfg.package}/share/discourse/public/=/downloads/; # custom CSS location ~ /stylesheet-cache/ { @@ -915,7 +915,7 @@ in "~ ^/admin/backups/" = proxy { extraConfig = '' proxy_set_header X-Sendfile-Type X-Accel-Redirect; - proxy_set_header X-Accel-Mapping /run/discourse/public/=/downloads/; + proxy_set_header X-Accel-Mapping ${cfg.package}/share/discourse/public/=/downloads/; ''; }; "~ ^/(svg-sprite/|letter_avatar/|letter_avatar_proxy/|user_avatar|highlight-js|stylesheets|theme-javascripts|favicon/proxied|service-worker)" = proxy { @@ -942,7 +942,7 @@ in }; "/downloads/".extraConfig = '' internal; - alias /run/discourse/public/; + alias ${cfg.package}/share/discourse/public/; ''; }; }; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 62e9be80bcd9..6134b307c24d 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -264,11 +264,6 @@ let # Make sure the notification email setting applies ./notification_email.patch - - # Change the path to the public directory reported by Discourse - # to its real path instead of the symlink in the store, since - # the store path won't be matched by any nginx rules - ./public_dir_path.patch ]; postPatch = '' diff --git a/pkgs/servers/web-apps/discourse/public_dir_path.patch b/pkgs/servers/web-apps/discourse/public_dir_path.patch deleted file mode 100644 index 0c6579736e22..000000000000 --- a/pkgs/servers/web-apps/discourse/public_dir_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb -index 25649532c0..614e062dc1 100644 ---- a/lib/file_store/local_store.rb -+++ b/lib/file_store/local_store.rb -@@ -88,7 +88,7 @@ module FileStore - end - - def public_dir -- File.join(Rails.root, "public") -+ "/run/discourse/public" - end - - def tombstone_dir