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
base: 2f2d67320bce
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7e542f7f3304
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 7, 2018

  1. nixos/nsd: Allow to configure root zone 

    When trying to run NSD to serve the root zone, one gets the following
error message:

error: illegal name: '.'

This is because the name of the zone is used as the derivation name for
building the zone file. However, Nix doesn't allow derivation names
starting with a period.

So whenever the zone is "." now, the file name generated is "root"
instead of ".".

I also added an assertion that makes sure the user sets
services.nsd.rootServer, otherwise NSD will fail at runtime because it
prevents serving the root zone without an explicit compile-time option.

Tested this by adding a root zone to the "nsd" NixOS VM test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @hrdinka, @qknight
    @aszlig
    aszlig committed May 7, 2018
    Copy the full SHA
    1eeeceb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #40054 from aszlig/nsd-root-server 

    nixos/nsd: Allow to configure root zone
    @hrdinka
    hrdinka committed May 7, 2018
    Copy the full SHA
    7e542f7 View commit details
    Browse the repository at this point in the history