diff options
author | talyz <kim.lindberger@gmail.com> | 2021-12-06 14:21:39 +0100 |
---|---|---|
committer | talyz <kim.lindberger@gmail.com> | 2021-12-06 14:21:39 +0100 |
commit | 125bb7dac1fcf9829ff93a33ed19665a72872ecd (patch) | |
tree | 80376c8ae4ba6cac073a249abc7f52806c3fc014 /pkgs/servers | |
parent | 4fb343c87e29bf1f33b49a1bcc210a57d9d42f1d (diff) |
discourse: Don't patch the public path
Instead of patching the path to /public in Discourse's sources, make the nginx configuration refer to the symlink in the discourse package which points to the real path. When there is a mismatch between the path nginx serves and the path Discourse thinks it serves, we can run into issues like files not being served - at least when sendfile requests from the ruby app are processed by nginx. The issue I ran into most recently is that backup downloads don't work. Since Discourse refers to the public directory relative to the Rails root in many places, it's much easier to just sync this path to the nginx configuration than trying to patch all occurrences in the sources. This should hopefully mean less potential for breakage in future Discourse releases, too.
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/web-apps/discourse/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/web-apps/discourse/public_dir_path.patch | 13 |
2 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 62e9be80bcd9a..6134b307c24da 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 0c6579736e22f..0000000000000 --- 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 |