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: 853bac5b2b01
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 824d2c92bd57
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 12, 2020

  1. nixos/dnscrypt-proxy2: base settings on example config 

    Dnscrypt-proxy needs some options to be set before it can do anything useful.

Currently, we only apply what the user configured which, by default, is nothing.

This leads to the dnscrypt-proxy2 service failing to start when you only set
`enable = true;` which is not a great user experience.

This patch makes the module take the example config from the upstream repo as a
base on top of which the user-specified settings are applied (it contains sane
defaults).

An option has been added to restore the old behaviour.
    @Atemu
    Atemu committed Dec 12, 2020
    Copy the full SHA
    e4c49db View commit details
    Browse the repository at this point in the history

  2. rl-2103: document nixos/dnscrypt-proxy2's default config change

    @Atemu
    Atemu committed Dec 12, 2020
    Copy the full SHA
    5242cec View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. Merge pull request #82584 from Atemu/dnscrypt-default-config 

    dnscrypt-proxy2: base settings on example config
    @symphorien
    symphorien committed Dec 15, 2020
    Copy the full SHA
    824d2c9 View commit details
    Browse the repository at this point in the history