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

Merge pull request #119596 from talyz/discourse-2.6.5

Browse Source 
discourse: 2.6.3 -> 2.6.5, module fixes
This commit is contained in:
Kim Lindberger 2021-04-16 16:06:47 +02:00 committed by GitHub
commit 7124e24a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/web-apps/discourse.nix
View File

@ -702,7 +702,7 @@ in
cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/ 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/public.dist/* /run/discourse/public/
cp -r ${cfg.package}/share/discourse/plugins.dist/* /run/discourse/plugins/ cp -r ${cfg.package}/share/discourse/plugins.dist/* /run/discourse/plugins/
${lib.concatMapStrings (p: "ln -sf ${p} /run/discourse/plugins/") cfg.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/uploads /run/discourse/public/uploads
ln -sf /var/lib/discourse/backups /run/discourse/public/backups ln -sf /var/lib/discourse/backups /run/discourse/public/backups
@ -726,7 +726,8 @@ in
export ADMIN_EMAIL="${cfg.admin.email}" export ADMIN_EMAIL="${cfg.admin.email}"
export ADMIN_NAME="${cfg.admin.fullName}" export ADMIN_NAME="${cfg.admin.fullName}"
export ADMIN_USERNAME="${cfg.admin.username}" export ADMIN_USERNAME="${cfg.admin.username}"
export ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})" ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})"
export ADMIN_PASSWORD
discourse-rake admin:create_noninteractively discourse-rake admin:create_noninteractively
discourse-rake themes:update discourse-rake themes:update
@ -938,7 +939,8 @@ in
set -o errexit -o pipefail -o nounset -o errtrace set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit shopt -s inherit_errexit
export api_key=$(<'${apiKeyPath}') api_key=$(<'${apiKeyPath}')
export api_key
jq <${mail-receiver-json} \ jq <${mail-receiver-json} \
'.DISCOURSE_API_KEY = $ENV.api_key' \ '.DISCOURSE_API_KEY = $ENV.api_key' \

4
pkgs/servers/web-apps/discourse/default.nix
View File

@ -6,13 +6,13 @@
}: }:
let let
version = "2.6.3"; version = "2.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "discourse"; owner = "discourse";
repo = "discourse"; repo = "discourse";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-lAIhVxvmjxEiru1KNxbFV+eDMLUGza/Dma3WU0ex0xs="; sha256 = "sha256-JQUgHxs2Cl2LBpg/6JLhZxje4RmPREL1IPta84kXwPw=";
}; };
runtimeDeps = [ runtimeDeps = [