Fix reverse_proxy

ComputeCanada · Jul 14, 2023 · 5cab270 · 5cab270
1 parent 9c3c7de
commit 5cab270
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/data/common.yaml b/data/common.yaml
@@ -252,6 +252,6 @@ profile::nfs::server::devices: "%{alias('terraform.volumes.nfs')}"
 
 profile::reverse_proxy::domain_name: "%{alias('terraform.data.domain_name')}"
 profile::reverse_proxy::subdomains:
-  ipa: "ipa.int.%{alias('terraform.data.domain_name')}"
-  mokey: "%{alias('terraform.data.tag_ip.mgmt.0')}:%{alias('profile::freeipa::mokey::port')}"
+  ipa: "ipa.int.%{lookup('terraform.data.domain_name')}"
+  mokey: "%{lookup('terraform.data.tag_ip.mgmt.0')}:%{lookup('profile::freeipa::mokey::port')}"
   jupyter: "https://127.0.0.1:8000"
diff --git a/site/profile/manifests/reverse_proxy.pp b/site/profile/manifests/reverse_proxy.pp
@@ -135,6 +135,6 @@
     ],
     subscribe => [
       File['/etc/caddy/Caddyfile'],
-    ] + $subdomains.map |$key| { File[$key] },
+    ] + $subdomains.map |$key| { File["/etc/caddy/conf.d/${key}.conf"] },
   }
 }