diff options
| -rw-r--r-- | app/jitsi/deploy/jitsi.hcl | 2 | ||||
| -rw-r--r-- | app/postgres/deploy/postgres.hcl | 2 | ||||
| -rw-r--r-- | os/config/production.yml | 22 | ||||
| -rw-r--r-- | os/config/roles/consul/templates/consul.json.j2 | 5 |
4 files changed, 17 insertions, 14 deletions
diff --git a/app/jitsi/deploy/jitsi.hcl b/app/jitsi/deploy/jitsi.hcl index 87ba81f..a06cf73 100644 --- a/app/jitsi/deploy/jitsi.hcl +++ b/app/jitsi/deploy/jitsi.hcl @@ -218,7 +218,7 @@ EOF # Our container can autodetect the public IP with the ifconfig.me service # However we would like to avoid relying on a 3rd party service for production use # That's why I am setting the public IP address statically here VVVV - JITSI_NAT_PUBLIC_IP = "78.197.205.190" + JITSI_NAT_PUBLIC_IP = "82.64.119.240" } template { diff --git a/app/postgres/deploy/postgres.hcl b/app/postgres/deploy/postgres.hcl index 8c72ee3..96f44fa 100644 --- a/app/postgres/deploy/postgres.hcl +++ b/app/postgres/deploy/postgres.hcl @@ -1,4 +1,4 @@ -job "postgres" { +job "postgres9.6" { datacenters = ["dc1"] type = "system" priority = 90 diff --git a/os/config/production.yml b/os/config/production.yml index c0f6371..7cb4d9c 100644 --- a/os/config/production.yml +++ b/os/config/production.yml @@ -4,9 +4,9 @@ cluster_nodes: ansible_host: atuin.site.deuxfleurs.fr ansible_port: 110 ansible_become: true - ipv4: 192.168.1.2 - gatewayv4: 192.168.1.254 - ipv6: 2a01:e34:ec5c:dbe0::2 + ipv4: 192.168.0.2 + gatewayv4: 192.168.0.254 + ipv6: 2a01:e0a:260:b5b0::2 gatewayv6: 2a01:e34:ec5c:dbe0::1 interface: eno1 dns_1: 212.27.40.240 @@ -18,10 +18,10 @@ cluster_nodes: ansible_host: atuin.site.deuxfleurs.fr ansible_port: 111 ansible_become: true - ipv4: 192.168.1.3 - gatewayv4: 192.168.1.254 - ipv6: 2a01:e34:ec5c:dbe0::3 - gatewayv6: 2a01:e34:ec5c:dbe0::1 + ipv4: 192.168.0.3 + gatewayv4: 192.168.0.254 + ipv6: 2a01:e0a:260:b5b0::3 + gatewayv6: 2a01:e0a:260:b5b0::1 interface: eno1 dns_1: 212.27.40.240 dns_2: 212.27.40.241 @@ -32,10 +32,10 @@ cluster_nodes: ansible_host: atuin.site.deuxfleurs.fr ansible_port: 112 ansible_become: true - ipv4: 192.168.1.4 - gatewayv4: 192.168.1.254 - ipv6: 2a01:e34:ec5c:dbe0::4 - gatewayv6: 2a01:e34:ec5c:dbe0::1 + ipv4: 192.168.0.4 + gatewayv4: 192.168.0.254 + ipv6: 2a01:e0a:260:b5b0::4 + gatewayv6: 2a01:e0a:260:b5b0::1 interface: eno1 dns_1: 212.27.40.240 dns_2: 212.27.40.241 diff --git a/os/config/roles/consul/templates/consul.json.j2 b/os/config/roles/consul/templates/consul.json.j2 index 6172cc4..73446fe 100644 --- a/os/config/roles/consul/templates/consul.json.j2 +++ b/os/config/roles/consul/templates/consul.json.j2 @@ -24,10 +24,13 @@ "encrypt": "{{ consul_gossip_encrypt }}", "domain": "2.cluster.deuxfleurs.fr", "performance": { - "raft_multiplier": 10, + "raft_multiplier": 5, "rpc_hold_timeout": "30s", "leave_drain_time": "30s" }, + "dns_config": { + "allow_stale": true + }, "telemetry": { "disable_hostname": true, "prometheus_retention_time": "2h" |