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: b5476e4c985a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f0f385ae7604
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 11, 2018

  1. nixos/tor: add tor-init service to fix directory ownerships, fix hard… 

    …enings

This reverts a part of 5bd12c6.

Apparently there's no way to specify user for RuntimeDirectory in systemd
service file (it's always root) but tor won't create control socket if the dir
is owned by anybody except the tor user.

These hardenings were adopted from the upstream service file, checked
against systemd.service(5) and systemd.exec(5) manuals, and tested to
actually work with all the options enabled.

`PrivateDevices` implies `DevicePolicy=closed` according to systemd.exec(5),
removed.

`--RunAsDaemon 0` is the default value according to tor(5), removed.
    @oxij
    SLNOS authored and oxij committed Jun 11, 2018
    Copy the full SHA
    2de3c4b View commit details
    Browse the repository at this point in the history

  2. nixos/tor: use ControlPort for controlSocket for simplicity

    @oxij
    SLNOS authored and oxij committed Jun 11, 2018
    Copy the full SHA
    adab27a View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Merge pull request #41852 from oxij/nixos/tor-service 

    nixos/tor: fix systemd service
    @joachifm
    joachifm committed Jun 13, 2018
    Copy the full SHA
    f0f385a View commit details
    Browse the repository at this point in the history