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

Merge pull request #71137 from erictapen/smokeping-fix-permission

Browse Source 
nixos/smokeping: replace smokeping.fcgi with a symlink
This commit is contained in:
Ricardo M. Correia 2019-10-23 18:19:15 +00:00 committed by GitHub
commit 4cd2cb43fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/networking/smokeping.nix
View File

@ -299,7 +299,8 @@ in
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
rm -f ${smokepingHome}/cropper rm -f ${smokepingHome}/cropper
ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper
cp ${cgiHome} ${smokepingHome}/smokeping.fcgi rm -f ${smokepingHome}/smokeping.fcgi
ln -s ${cgiHome} ${smokepingHome}/smokeping.fcgi
${cfg.package}/bin/smokeping --check --config=${configPath} ${cfg.package}/bin/smokeping --check --config=${configPath}
${cfg.package}/bin/smokeping --static --config=${configPath} ${cfg.package}/bin/smokeping --static --config=${configPath}
''; '';
@ -314,5 +315,7 @@ in
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
}; };
}; };
meta.maintainers = with lib.maintainers; [ erictapen ];
} }

1
pkgs/tools/networking/smokeping/default.nix
View File

@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://oss.oetiker.ch/smokeping; homepage = http://oss.oetiker.ch/smokeping;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.erictapen ];
}; };
} }