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: 4eb94d0ca13c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 07aff199ad88
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 6, 2020

  1. nixos/nginx: improve documentation for config

    Unfortunately, I had a use-case where `services.nginx.config` was
    necessary quite recently. While working on that config I had to look up
    the module's code to understand which options can be used and which
    don't.
    
    To slightly improve the situation, I changed the documentation like
    this:
    
    * Added `types.str` as type since `config` is not mergeable on purpose.
      It must be a string as it's rendered verbatim into `nginx.conf` and if
      the type is `unspecified`, it can be confused with RFC42-like options.
    
    * Mention which config options that don't generate config in
      `nginx.conf` are NOT mutually exclusive.
    Ma27 committed Dec 6, 2020
    Copy the full SHA
    55ef961 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. Merge pull request #106080 from Ma27/nginx-config-doc

    nixos/nginx: improve documentation for `config`
    Ma27 committed Dec 10, 2020
    Copy the full SHA
    07aff19 View commit details
    Browse the repository at this point in the history