nomad

commit ec1782dfa461138aa201d0d0fe78c4fa7d4be156
parent c23a298dfade9e7656a74ad38692975b89c9ba85
Author: Andreas Gruhler <andreas.gruhler@adfinis.com>
Date:   Wed, 27 Sep 2023 02:36:35 +0200

fix(hivedav): tls health check

Diffstat:
M
hcl/default/hivedav-demo/hivedav-demo.nomad
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hcl/default/hivedav-demo/hivedav-demo.nomad b/hcl/default/hivedav-demo/hivedav-demo.nomad
@@ -25,7 +25,7 @@ job "hivedav-demo" {
 
     service {
       port = "hivedav"
-      tags = ["http", "hivedav"]
+      tags = ["http"]
       check {
         type     = "http"
         interval = "10s"
@@ -37,7 +37,7 @@ job "hivedav-demo" {
       port = "https"
       tags = ["https"]
       check {
-        type     = "http"
+        type     = "tcp"
         interval = "10s"
         timeout  = "5s"
         path     = "/healthz"
@@ -89,9 +89,8 @@ job "hivedav-demo" {
       }
 
       env {
-        HIVEDAV_CALDAV_URI = "https://mail.adfinis.com:8443"
         HIVEDAV_CALENDAR = 2
-        HIVEDAV_CALDAV_USER = "andreas.gruhler@adfinis.com"
+        HIVEDAV_HOST = "meet.in0rdr.ch"
       }
 
       template {
@@ -99,6 +98,8 @@ job "hivedav-demo" {
         env = true
         destination = "${NOMAD_SECRETS_DIR}/env"
         data = <<EOT
+HIVEDAV_CALDAV_URI = "{{with secret "kv/hivedav"}}{{index .Data.data.HIVEDAV_CALDAV_URI}}{{end}}"
+HIVEDAV_CALDAV_USER = "{{with secret "kv/hivedav"}}{{index .Data.data.HIVEDAV_CALDAV_USER}}{{end}}"
 HIVEDAV_CALDAV_PASSWORD = "{{with secret "kv/hivedav"}}{{index .Data.data.HIVEDAV_CALDAV_PASSWORD}}{{end}}"
 EOT
       }