Skip to content

discourse: Fix the public directory path reported by Discourse#142607

Merged
ryantm merged 1 commit intoNixOS:masterfrom
talyz:discourse-public-path
Oct 22, 2021
Merged

discourse: Fix the public directory path reported by Discourse#142607
ryantm merged 1 commit intoNixOS:masterfrom
talyz:discourse-public-path

Conversation

@talyz
Copy link
Contributor

@talyz talyz commented Oct 22, 2021

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.

Fixes #142528.

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@talyz
discourse: Fix the public directory path reported by Discourse
1fb77e8 
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.

Fixes NixOS#142528.
@talyz talyz requested review from dpausp and ryantm October 22, 2021 21:44
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 22, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented Oct 22, 2021 •
edited
Loading

Result of nixpkgs-review pr 142607 at 1fb77e8 run on x86_64-linux 1

2 packages built successfully:
  • discourse
  • discourseAllPlugins

Result of nixpkgs-review pr 142607 at 1fb77e8 run on aarch64-linux 1

2 packages built successfully:
  • discourse
  • discourseAllPlugins

ryantm
ryantm approved these changes Oct 22, 2021
View reviewed changes
Copy link
Member

@ryantm ryantm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this on my Discourse instance and it works great; thanks!

@ryantm ryantm merged commit 1493854 into NixOS:master Oct 22, 2021
@github-actions github-actions bot mentioned this pull request Oct 22, 2021
Merged
1 task
@github-actions
Copy link
Contributor

github-actions bot commented Oct 22, 2021

Successfully created backport PR #142615 for release-21.05.

@talyz talyz deleted the discourse-public-path branch October 23, 2021 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ryantm ryantm ryantm approved these changes

@dpausp dpausp Awaiting requested review from dpausp

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

NixOS/Discourse: can't download PDF

3 participants

@talyz @r-rmcgibbo @ryantm