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

Commits on Oct 25, 2019

  1. nixos/stunnel: Fix CA files

    dasJ authored and Lassulus committed Oct 25, 2019
    Copy the full SHA
    4a32dbd View commit details
  2. nixos/stunnel: Add maintainers

    dasJ authored and Lassulus committed Oct 25, 2019
    Copy the full SHA
    2abe2b2 View commit details
Showing with 14 additions and 1 deletion.
  1. +14 −1 nixos/modules/services/networking/stunnel.nix
15 changes: 14 additions & 1 deletion nixos/modules/services/networking/stunnel.nix
Original file line number Diff line number Diff line change
@@ -57,7 +57,13 @@ let
};

CAPath = mkOption {
type = types.path;
type = types.nullOr types.path;
default = null;
description = "Path to a directory containing certificates to validate against.";
};

CAFile = mkOption {
type = types.nullOr types.path;
default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
description = "Path to a file containing certificates to validate against.";
};
@@ -196,6 +202,7 @@ in
verifyChain = ${yesNo v.verifyChain}
verifyPeer = ${yesNo v.verifyPeer}
${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"}
${optionalString (v.CAFile != null) "CAFile = ${v.CAFile}"}
${optionalString (v.verifyHostname != null) "checkHost = ${v.verifyHostname}"}
OCSPaia = yes
@@ -216,6 +223,12 @@ in
};
};

meta.maintainers = with maintainers; [
# Server side
lschuermann
# Client side
das_j
];
};

}