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

Commits on Dec 26, 2019

  1. nixos/nginx: fixup permissions for Nginx state dir 

    The commit b0bbacb was a bit too fast
It did set executable bit for log files.

Also, it didn't account for other directories in state dir:
```
 # ls -la /var/spool/nginx/
total 32
drwxr-x--- 8 nginx nginx 4096 Dec 26 12:00 .
drwxr-xr-x 4 root  root  4096 Oct 10 20:24 ..
drwx------ 2 root  root  4096 Oct 10 20:24 client_body_temp
drwx------ 2 root  root  4096 Oct 10 20:24 fastcgi_temp
drwxr-x--- 2 nginx nginx 4096 Dec 26 12:00 logs
drwx------ 2 root  root  4096 Oct 10 20:24 proxy_temp
drwx------ 2 root  root  4096 Oct 10 20:24 scgi_temp
drwx------ 2 root  root  4096 Oct 10 20:24 uwsgi_temp
```

With proposed change, only ownership is changed for state files, and mode is left as is
except that statedir/logs is now group accessible.
    @danbst
    danbst committed Dec 26, 2019
    Copy the full SHA
    50d6e93 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #76533 from danbst/nginx-correct-dir-mode 

    nixos/nginx: fixup permissions for Nginx state dir
    @flokli
    flokli committed Dec 26, 2019
    Copy the full SHA
    c9a80e7 View commit details
    Browse the repository at this point in the history