talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixos/prosody: fix empty config check output, fix some errors which are not fatal (#430016)

Browse Source
This commit is contained in:
Sandro 2025-08-01 05:32:30 +02:00 committed by GitHub
commit 4cb095422e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/networking/prosody.nix
View File

@ -956,14 +956,18 @@ in
environment.etc."prosody/prosody.cfg.lua".source = environment.etc."prosody/prosody.cfg.lua".source =
if cfg.checkConfig then if cfg.checkConfig then
pkgs.runCommandLocal "prosody.cfg.lua-checked" pkgs.runCommandLocal "prosody.cfg.lua"
{ {
nativeBuildInputs = [ cfg.package ]; nativeBuildInputs = [ cfg.package ];
} }
'' ''
cp ${configFile} prosody.cfg.lua cp ${configFile} prosody.cfg.lua
# Replace the hardcoded path to cacerts with one that is accessible in the build sandbox
sed 's|/etc/ssl/certs/ca-bundle.crt|${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt|' -i prosody.cfg.lua
# For some reason prosody hard fails to "find" certificates when this directory does not exist
mkdir certs
prosodyctl --config ./prosody.cfg.lua check config prosodyctl --config ./prosody.cfg.lua check config
touch $out cp prosody.cfg.lua $out
'' ''
else else
configFile; configFile;