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

Commits on Jun 12, 2018

  1. nixos/tinc: minor fixes

    volth authored Jun 12, 2018
    Copy the full SHA
    3ae0185 View commit details

Commits on Jun 13, 2018

  1. Merge pull request #41904 from volth/patch-156

    nixos/tinc: minor fixes
    Mic92 authored Jun 13, 2018
    Copy the full SHA
    69ffc8d View commit details
Showing with 3 additions and 7 deletions.
  1. +3 −7 nixos/modules/services/networking/tinc.nix
10 changes: 3 additions & 7 deletions nixos/modules/services/networking/tinc.nix
Original file line number Diff line number Diff line change
@@ -163,12 +163,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ data.package ];
restartTriggers =
let
drvlist = [ config.environment.etc."tinc/${network}/tinc.conf".source ]
++ mapAttrsToList (host: _: config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts;
in # drvlist might be too long to be used directly
[ (builtins.hashString "sha256" (concatMapStrings (d: d.outPath) drvlist)) ];
restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ];
serviceConfig = {
Type = "simple";
Restart = "always";
@@ -207,7 +202,8 @@ in
${concatStringsSep "\n" (mapAttrsToList (network: data:
optionalString (versionAtLeast data.package.version "1.1pre") ''
makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \
--add-flags "--pidfile=/run/tinc.${network}.pid"
--add-flags "--pidfile=/run/tinc.${network}.pid" \
--add-flags "--config=/etc/tinc/${network}"
'') cfg.networks)}
'';
};