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

Commits on Jul 30, 2017

  1. tinc: allow the daemon to write to files in /etc/tinc/${network}/hosts

    Volth committed Jul 30, 2017
    Copy the full SHA
    3b82d7d View commit details

  2. Merge pull request #27756 from volth/tinc-fix 

    tinc: allow the daemon to write to files in /etc/tinc/${network}/hosts
    @Mic92
    Mic92 authored Jul 30, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    758bf31 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/networking/tinc.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/tinc.nix
View file
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@ in
(flip mapAttrsToList cfg.networks (network: data:
flip mapAttrs' data.hosts (host: text: nameValuePair
("tinc/${network}/hosts/${host}")
({ mode = "0444"; inherit text; })
({ mode = "0644"; user = "tinc.${network}"; inherit text; })
) // {
"tinc/${network}/tinc.conf" = {
mode = "0444";