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

Commits on Jun 20, 2020

  1. Copy the full SHA
    dbb5bdf View commit details
  2. Merge pull request #91128 from bbigras/rslsync-localhost

    nixos/resilio: listen on [::1] by default
    rnhmjoj authored Jun 20, 2020
    Copy the full SHA
    1eef920 View commit details
Showing with 7 additions and 2 deletions.
  1. +5 −0 nixos/doc/manual/release-notes/rl-2009.xml
  2. +2 −2 nixos/modules/services/networking/resilio.nix
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-2009.xml
Original file line number Diff line number Diff line change
@@ -490,6 +490,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/89205">#89205</link>.
</para>
</listitem>
<listitem>
<para>
In the <literal>resilio</literal> module, <xref linkend="opt-services.resilio.httpListenAddr"/> has been changed to listen to <literal>[::1]</literal> instead of <literal>0.0.0.0</literal>.
</para>
</listitem>
</itemizedlist>
</section>

4 changes: 2 additions & 2 deletions nixos/modules/services/networking/resilio.nix
Original file line number Diff line number Diff line change
@@ -109,8 +109,8 @@ in

httpListenAddr = mkOption {
type = types.str;
default = "0.0.0.0";
example = "1.2.3.4";
default = "[::1]";
example = "0.0.0.0";
description = ''
HTTP address to bind to.
'';