diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-20 16:14:30 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-20 16:14:30 +0200 |
| commit | 9ff5c209579b4ab0a983daba121e8665a984bec3 (patch) | |
| tree | 0f4f6800df11d7d470b56104bf5a7bfa8c2c61f4 | |
| parent | fixes (diff) | |
| download | concourse-9ff5c209579b4ab0a983daba121e8665a984bec3.tar.gz concourse-9ff5c209579b4ab0a983daba121e8665a984bec3.tar.xz | |
fixes
| -rw-r--r-- | manifests/proxy/nginx.pp | 7 | ||||
| -rw-r--r-- | manifests/web.pp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/manifests/proxy/nginx.pp b/manifests/proxy/nginx.pp index ad4fa17..c5b0132 100644 --- a/manifests/proxy/nginx.pp +++ b/manifests/proxy/nginx.pp @@ -20,7 +20,7 @@ define concourse::proxy::nginx ( ) { include concourse - nginx::resource::upstream { $cluster: + nginx::resource::upstream { "concourse_${cluster}": ensure => $ensure, members => $upstream_members, } @@ -32,6 +32,7 @@ define concourse::proxy::nginx ( # TODO SSL } + # TODO proxy to upstream nginx::resource::streamhost { "${server_name}-stream": listen_port => 2222, ipv6_enable => true, @@ -42,13 +43,13 @@ define concourse::proxy::nginx ( nginx::resource::location { "${server_name} - /": server => $server_name, location => '/', - proxy => "http://${cluster}", + proxy => "http://concourse_${cluster}", } nginx::resource::location { "${server_name} - ~ /hijack$": server => $server_name, location => '~ /hijack$', - proxy => "http://${cluster}", + proxy => "http://concourse_${cluster}", proxy_set_header => [ 'Host $host', 'X-Real-IP $remote_addr', diff --git a/manifests/web.pp b/manifests/web.pp index eace9a6..fd87a67 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -197,7 +197,7 @@ class concourse::web ( # Exported resource @@nginx::resource::upstream::member { $trusted['certname']: ensure => $ensure, - upstream => $cluster, + upstream => "concourse_${cluster}", server => $peer_address, port => 8080, } |