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: 04713663ddec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 57b862bb53d8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 13, 2020

  1. iodine: improve test in view of #58806

    @iblech
    iblech committed Apr 13, 2020
    Copy the full SHA
    f379e74 View commit details

Commits on Apr 14, 2020

  1. Merge pull request #85125 from iblech/patch-iodine-test 

    iodine: improve test in view of #58806
    @worldofpeace
    worldofpeace authored Apr 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    57b862b View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 nixos/tests/iodine.nix
5 changes: 3 additions & 2 deletions nixos/tests/iodine.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import ./make-test-python.nix (
{ pkgs, ... }: let
domain = "whatever.example.com";
password = "false;foo;exit;withspecialcharacters";
in
{
name = "iodine";
@@ -21,7 +22,7 @@ import ./make-test-python.nix (
services.iodine.server = {
enable = true;
ip = "10.53.53.1/24";
passwordFile = "${builtins.toFile "password" "foo"}";
passwordFile = "${builtins.toFile "password" password}";
inherit domain;
};

@@ -41,7 +42,7 @@ import ./make-test-python.nix (
server = domain;
};
systemd.tmpfiles.rules = [
"f /root/pw 0666 root root - foo"
"f /root/pw 0666 root root - ${password}"
];
environment.systemPackages = [
pkgs.nagiosPluginsOfficial