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: 5bcbffe0dcf5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 02129a878842
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 9, 2017

  1. nginx: Add alias configuration option for hosts and locations. 

    It's like root, but doesn't keep the prefix.
    Evan Danaher committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    ff2e2e8 View commit details
    Browse the repository at this point in the history

  2. nginx: Assert that either root or alias is null. 

    If both are set, nginx won't start.  More error checking is certainly in
order, but this seems like a reasonable start.
    Evan Danaher committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    e7358b1 View commit details
    Browse the repository at this point in the history

  3. nginx: disallow alias directive on server level; it doesn't work.

    Evan Danaher committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    a092469 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Merge pull request #23672 from edanaher/nginx-alias 

    Nginx alias directive
    @domenkozar
    domenkozar committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    02129a8 View commit details
    Browse the repository at this point in the history