From 9eb067b0d7ea796f2c7c3b8b6a870e320e90863c Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Mon, 14 Oct 2019 21:03:24 +0200 Subject: [PATCH 1/2] nixos/smokeping: replace smokeping.fcgi with a symlink This fixes a regression from bb649d96b038ab2c567439987bc182f6797bae5a. There were permission problems, when the preStart script tried to copy the smokeping.fcgi file over the old file. --- nixos/modules/services/networking/smokeping.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index d4d0594a9cd..49080cf4820 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -299,7 +299,8 @@ in mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data rm -f ${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 --static --config=${configPath} ''; From b8cd11f347d6f7a9b2993553247ee774b61ff721 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Mon, 14 Oct 2019 21:23:11 +0200 Subject: [PATCH 2/2] smokeping: add erictapen as maintainer --- nixos/modules/services/networking/smokeping.nix | 2 ++ pkgs/tools/networking/smokeping/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 49080cf4820..b48b0b3a9d6 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -315,5 +315,7 @@ in serviceConfig.Restart = "always"; }; }; + + meta.maintainers = with lib.maintainers; [ erictapen ]; } diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 0c9079240d0..6a816615e9c 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://oss.oetiker.ch/smokeping; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.erictapen ]; }; }