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/infra
base: 13e2cb0d37d9
Choose a base ref
...
head repository: NixOS/infra
compare: 5a83e7c5cc0c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 22, 2020

  1. delft/eris: include Prometheus port in nginx proxy_pass directive 

    In NixOS 20.09, the listenAddress directive was changed to be purely
for the address and not for the address:port combination as previously.

This results in nginx now talking to *itself* using plaintext HTTP on
0.0.0.0. With forceSSL, this means nginx issues a redirect for the
hostname -> the client gets a redirect to
https://0.0.0.0/prometheus/....

Fixes #133
    @lukegb
    lukegb committed Nov 22, 2020
    Copy the full SHA
    8e4bfa5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #134 from lukegb/lukegb/fix-133 

    delft/eris: include Prometheus port in nginx proxy_pass directive
    @grahamc
    grahamc committed Nov 22, 2020
    Copy the full SHA
    5a83e7c View commit details
    Browse the repository at this point in the history