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

Commits on Jun 3, 2017

  1. dnschain: allow different bind and external addresses

    @rnhmjoj
    rnhmjoj committed Jun 3, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2606d39 View commit details

  2. Merge pull request #26346 from rnhmjoj/dnschain 

    dnschain: allow different bind and external addresses
    @Mic92
    Mic92 authored Jun 3, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c1aeb6 View commit details
Showing with 13 additions and 3 deletions.
  1. +13 −3 nixos/modules/services/networking/dnschain.nix
16 changes: 13 additions & 3 deletions nixos/modules/services/networking/dnschain.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ let
host = ${cfg.dns.address}
port = ${toString cfg.dns.port}
oldDNSMethod = NO_OLD_DNS
externalIP = ${cfg.dns.address}
externalIP = ${cfg.dns.externalAddress}
[http]
host = ${cfg.api.hostname}
@@ -47,8 +47,18 @@ in
type = types.str;
default = "127.0.0.1";
description = ''
The IP address that will be used to reach this machine.
Leave this unchanged if you do not wish to directly expose the DNSChain resolver.
The IP address the DNSChain resolver will bind to.
Leave this unchanged if you do not wish to directly expose the resolver.
'';
};

dns.externalAddress = mkOption {
type = types.str;
default = cfg.dns.address;
description = ''
The IP address used by clients to reach the resolver and the value of
the <literal>namecoin.dns</literal> record. Set this in case the bind address
is not the actual IP address (e.g. the machine is behind a NAT).
'';
};