public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #128823 from NixOS/backport-127931-to-release-21.05

Browse Source 
[Backport release-21.05] discourse: Fix plugin support
This commit is contained in:
Kim Lindberger
2021-07-15 14:50:11 +02:00
committed by GitHub
parent 330acb7fb7 71474d1e41
commit 5fd730e210
14 changed files with 339 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-apps/discourse.nix
+3 -2
View File
@@ -30,6 +30,9 @@ in
package = lib.mkOption {
type = lib.types.package;
default = pkgs.discourse;
apply = p: p.override {
plugins = lib.unique (p.enabledPlugins ++ cfg.plugins);
};
defaultText = "pkgs.discourse";
description = ''
The discourse package to use.
@@ -731,8 +734,6 @@ in
cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
cp -r ${cfg.package}/share/discourse/plugins.dist/* /run/discourse/plugins/
${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins}
ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
ln -sf /var/lib/discourse/backups /run/discourse/public/backups