KokaKiwi/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

skip consul tls verify for diplonat and tricot (should be reverted?)

Browse source
This commit is contained in:
Alex 2022-08-24 18:19:04 +02:00
parent cfb1d623d9
commit 0d2d46f437
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cluster/prod/app/core/deploy/core.hcl
View file

@ -18,7 +18,7 @@ job "core" {
driver = "docker" driver = "docker"
config { config {
image = "lxpz/amd64_diplonat:3" image = "lxpz/amd64_diplonat:4"
network_mode = "host" network_mode = "host"
readonly_rootfs = true readonly_rootfs = true
volumes = [ volumes = [
@ -54,7 +54,7 @@ DIPLONAT_REFRESH_TIME=60
DIPLONAT_EXPIRATION_TIME=300 DIPLONAT_EXPIRATION_TIME=300
DIPLONAT_CONSUL_NODE_NAME={{ env "attr.unique.hostname" }} DIPLONAT_CONSUL_NODE_NAME={{ env "attr.unique.hostname" }}
DIPLONAT_CONSUL_URL=https://consul.service.prod.consul:8501 DIPLONAT_CONSUL_URL=https://consul.service.prod.consul:8501
DIPLONAT_CONSUL_CA_CERT=/etc/diplonat/consul.crt DIPLONAT_CONSUL_TLS_SKIP_VERIFY=true
DIPLONAT_CONSUL_CLIENT_CERT=/etc/diplonat/consul-client.crt DIPLONAT_CONSUL_CLIENT_CERT=/etc/diplonat/consul-client.crt
DIPLONAT_CONSUL_CLIENT_KEY=/etc/diplonat/consul-client.key DIPLONAT_CONSUL_CLIENT_KEY=/etc/diplonat/consul-client.key
RUST_LOG=debug RUST_LOG=debug

8
cluster/prod/app/frontend/deploy/frontend-tricot.hcl
View file

@ -19,7 +19,7 @@ job "frontend" {
driver = "docker" driver = "docker"
config { config {
image = "lxpz/amd64_tricot:41" image = "lxpz/amd64_tricot:42"
network_mode = "host" network_mode = "host"
readonly_rootfs = true readonly_rootfs = true
ports = [ "http_port", "https_port" ] ports = [ "http_port", "https_port" ]
@ -41,8 +41,8 @@ job "frontend" {
} }
template { template {
data = "{{ key \"secrets/consul/consul.crt\" }}" data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
destination = "secrets/consul.crt" destination = "secrets/consul-ca.crt"
} }
template { template {
@ -61,7 +61,7 @@ TRICOT_NODE_NAME={{ env "attr.unique.consul.name" }}
TRICOT_LETSENCRYPT_EMAIL=alex@adnab.me TRICOT_LETSENCRYPT_EMAIL=alex@adnab.me
TRICOT_ENABLE_COMPRESSION=true TRICOT_ENABLE_COMPRESSION=true
TRICOT_CONSUL_HOST=https://consul.service.prod.consul:8501 TRICOT_CONSUL_HOST=https://consul.service.prod.consul:8501
TRICOT_CONSUL_CA_CERT=/etc/tricot/consul.crt TRICOT_CONSUL_TLS_SKIP_VERIFY=true
TRICOT_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt TRICOT_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt
TRICOT_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key TRICOT_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key
TRICOT_HTTP_BIND_ADDR=[::]:80 TRICOT_HTTP_BIND_ADDR=[::]:80