Skip to content

[Backport release-21.05] discourse: Fix the public directory path reported by Discourse#142615

Merged
ryantm merged 1 commit intorelease-21.05from
backport-142607-to-release-21.05
Oct 23, 2021
Merged

[Backport release-21.05] discourse: Fix the public directory path reported by Discourse#142615
ryantm merged 1 commit intorelease-21.05from
backport-142607-to-release-21.05

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Oct 22, 2021

Bot-based backport to release-21.05, triggered by a label in #142607.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

@talyz @github-actions
discourse: Fix the public directory path reported by Discourse
23e841c 
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.

(cherry picked from commit 1fb77e8)
@github-actions github-actions bot requested a review from dpausp October 22, 2021 23:29
@github-actions github-actions bot mentioned this pull request Oct 22, 2021
Merged
12 tasks
@ofborg ofborg bot requested a review from talyz October 22, 2021 23:40
@ofborg ofborg bot added 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 23, 2021 •
edited
Loading

Result of nixpkgs-review pr 142615 at 23e841c run on aarch64-linux 1

2 packages built successfully:
  • discourse
  • discourseAllPlugins

Result of nixpkgs-review pr 142615 at 23e841c run on x86_64-linux 1

2 packages built successfully:
  • discourse
  • discourseAllPlugins
4 suggestions:
  • warning: unused-argument

    Unused argument: meta.
    Near pkgs/servers/web-apps/discourse/default.nix:58:7:

       |
58 |     , meta ? null
   |       ^
  • warning: build-tools-in-build-inputs

    bundler is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

    Near pkgs/servers/web-apps/discourse/default.nix:235:5:

        |
235 |     buildInputs = [
    |     ^
  • warning: unused-argument

    Unused argument: replace.
    Near pkgs/servers/web-apps/discourse/default.nix:4:9:

      |
4 | , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk
  |         ^
  • warning: unused-argument

    Unused argument: src.
    Near pkgs/servers/web-apps/discourse/default.nix:61:7:

       |
61 |     , src
   |       ^

@ryantm ryantm merged commit 605dc2a into release-21.05 Oct 23, 2021
@ryantm ryantm deleted the backport-142607-to-release-21.05 branch October 23, 2021 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dpausp dpausp Awaiting requested review from dpausp

@talyz talyz Awaiting requested review from talyz

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@r-rmcgibbo @ryantm @talyz