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

Commits on Nov 1, 2020

  1. stunnel service: fix servers example 

    examples incorrectly had 'enable' set, the option is not defined
and reproducing would error out
    @martinetd
    martinetd committed Nov 1, 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
    05eef80 View commit details

Commits on Nov 2, 2020

  1. stunnel: make servers accept more lenient 

    stunnel config's accept syntax is [host:]port -- this is required to e.g. listen on ipv6
where one would set :::port
    @martinetd
    martinetd committed Nov 2, 2020
    Copy the full SHA
    1fb2990 View commit details

Commits on Nov 4, 2020

  1. Merge pull request #99003 from martinetd/stunnel-doc

    @JohnAZoidberg
    JohnAZoidberg authored Nov 4, 2020
    Copy the full SHA
    d4905b1 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 nixos/modules/services/networking/stunnel.nix
9 changes: 6 additions & 3 deletions nixos/modules/services/networking/stunnel.nix
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,12 @@ let
serverConfig = {
options = {
accept = mkOption {
type = types.int;
description = "On which port stunnel should listen for incoming TLS connections.";
type = types.either types.str types.int;
description = ''
On which [host:]port stunnel should listen for incoming TLS connections.
Note that unlike other softwares stunnel ipv6 address need no brackets,
so to listen on all IPv6 addresses on port 1234 one would use ':::1234'.
'';
};

connect = mkOption {
@@ -129,7 +133,6 @@ in
type = with types; attrsOf (submodule serverConfig);
example = {
fancyWebserver = {
enable = true;
accept = 443;
connect = 8080;
cert = "/path/to/pem/file";