From 5a03af38ae88636d13f05c80c63caa02afa9e2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Tue, 20 Jun 2023 00:44:48 +0200
Subject: fixes

---
 manifests/proxy/nginx.pp | 6 +++++-
 manifests/web.pp         | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'manifests')

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",
   }
 }
-- 
cgit v1.2.3