diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-20 00:44:48 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-20 00:44:48 +0200 |
| commit | 5a03af38ae88636d13f05c80c63caa02afa9e2b4 (patch) | |
| tree | 24b9962847b8469cf726b52417b8dd6319b3af4f | |
| parent | fixes (diff) | |
| download | concourse-5a03af38ae88636d13f05c80c63caa02afa9e2b4.tar.gz concourse-5a03af38ae88636d13f05c80c63caa02afa9e2b4.tar.xz | |
fixes
| -rw-r--r-- | manifests/proxy/nginx.pp | 6 | ||||
| -rw-r--r-- | manifests/web.pp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/manifests/proxy/nginx.pp b/manifests/proxy/nginx.pp index eb2aabb..77c561b 100644 --- a/manifests/proxy/nginx.pp +++ b/manifests/proxy/nginx.pp @@ -15,7 +15,9 @@ define concourse::proxy::nginx ( ) { include concourse - nginx::resource::upstream { "concourse - ${cluster}": + # Members are collected through the puppet database. + # TODO optionally allow manually specifying them. + nginx::resource::upstream { $cluster: ensure => $ensure, } @@ -31,11 +33,13 @@ define concourse::proxy::nginx ( } nginx::resource::location { "${server_name} - /": + server => $server_name, location => '/', proxy => "http://${cluster}", } nginx::resource::location { "${server_name} - ~ /hijack$": + server => $server_name, location => '~ /hijack$', proxy => "http://${cluster}", proxy_set_header => [ diff --git a/manifests/web.pp b/manifests/web.pp index db28e07..ede7ce1 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -191,7 +191,7 @@ class concourse::web ( # Exported resource @@nginx::resource::upstream::member { $trusted['certname']: ensure => $ensure, - upstream => "concourse - ${cluster}", + upstream => $cluster, server => "${peer_address}:8080", } } |