Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 12abbe5134df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27a5ddcf747f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 23, 2019

  1. nixos/smokeping: replace smokeping.fcgi with a symlink 

    This fixes a regression from bb649d9.
There were permission problems, when the preStart script tried to copy
the smokeping.fcgi file over the old file.

(cherry picked from commit 9eb067b)
    @erictapen @wizeman
    erictapen authored and wizeman committed Oct 23, 2019
    Copy the full SHA
    990f5f4 View commit details

  2. smokeping: add erictapen as maintainer 

    (cherry picked from commit b8cd11f)
    @erictapen @wizeman
    erictapen authored and wizeman committed Oct 23, 2019
    Copy the full SHA
    27a5ddc View commit details
Showing with 5 additions and 1 deletion.
  1. +4 −1 nixos/modules/services/networking/smokeping.nix
  2. +1 −0 pkgs/tools/networking/smokeping/default.nix
5 changes: 4 additions & 1 deletion nixos/modules/services/networking/smokeping.nix
View file
Original file line number Diff line number Diff line change
@@ -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}
'';
@@ -314,5 +315,7 @@ in
serviceConfig.Restart = "always";
};
};

meta.maintainers = with lib.maintainers; [ erictapen ];
}

1 change: 1 addition & 0 deletions pkgs/tools/networking/smokeping/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}