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: fddeb7cb7309
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 22e8ada3b3c5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 12, 2020

  1. nixos/nginx: move configuration testing script into reload command 

    nginx -t not only verifies configuration, but also creates (and chowns)
files. When the `nginx-config-reload` service is used, this can cause
directories to be chowned to `root`, causing nginx to fail.

This moves the nginx -t command into a second ExecReload command, which
runs as nginx's user. While fixing above issue, this will also cause the
configuration to be verified when running `systemctl reload nginx`, not
only when restarting the dummy `nginx-config-reload` unit. The latter is
mostly a workaround for missing features in our activation script
anyways.
    @flokli
    flokli committed Aug 12, 2020
    Copy the full SHA
    300049c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #95264 from flokli/nginx-config-reload 

    nixos/nginx: move configuration testing script into reload command
    @flokli
    flokli committed Aug 12, 2020
    Copy the full SHA
    22e8ada View commit details
    Browse the repository at this point in the history