aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-04-05 16:30:28 +0200
committerAlex Auvolat <alex@adnab.me>2023-04-05 16:30:28 +0200
commit07f50f297a8fcb3ccee167ca486084bafb2c1120 (patch)
treef64bc59833ed1458a6a90aa144881a95a4499656
parentc08bc17cc0ca37557a4b43f3ef2e1bcf8a1db2c0 (diff)
downloadnixcfg-07f50f297a8fcb3ccee167ca486084bafb2c1120.tar.gz
nixcfg-07f50f297a8fcb3ccee167ca486084bafb2c1120.zip
D53 with addresses from DiploNAT autodiscovery; diplonat fw opening for tricot
-rw-r--r--cluster/staging/app/core/deploy/core-service.hcl2
-rw-r--r--cluster/staging/app/core/deploy/core-system.hcl4
2 files changed, 3 insertions, 3 deletions
diff --git a/cluster/staging/app/core/deploy/core-service.hcl b/cluster/staging/app/core/deploy/core-service.hcl
index 6799e01..bf835c7 100644
--- a/cluster/staging/app/core/deploy/core-service.hcl
+++ b/cluster/staging/app/core/deploy/core-service.hcl
@@ -11,7 +11,7 @@ job "core-service" {
config {
packages = [
- "git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=86c255dfeabc60b0ef46ff78bc487c61c9548c79"
+ "git+https://git.deuxfleurs.fr/lx/D53.git?ref=diplonat-autodiscovery&rev=d906a6ebb5d977f44340b157a520477849ced161"
]
command = "d53"
}
diff --git a/cluster/staging/app/core/deploy/core-system.hcl b/cluster/staging/app/core/deploy/core-system.hcl
index dba6b95..2ec9b58 100644
--- a/cluster/staging/app/core/deploy/core-system.hcl
+++ b/cluster/staging/app/core/deploy/core-system.hcl
@@ -140,7 +140,7 @@ EOH
tags = [
"d53-aaaa ${meta.site}.site.staging.deuxfleurs.org",
"d53-aaaa staging.deuxfleurs.org",
- # "(diplonat (tcp_port 80))"
+ "(diplonat (tcp_port 80))"
]
address_mode = "host"
}
@@ -149,7 +149,7 @@ EOH
name = "tricot-https"
port = "https_port"
tags = [
- # "(diplonat (tcp_port 443))"
+ "(diplonat (tcp_port 443))"
]
address_mode = "host"
}