From 4cd583622b4e4128b8a3613e53bc8cc95ddec095 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Wed, 1 Nov 2023 08:42:04 +0100
Subject: [PATCH] database DNS entry in consul

---
 ansible/group_vars/database/database |  3 +++
 ansible/group_vars/database_active   |  1 +
 ansible/group_vars/database_standby  |  1 +
 ansible/production                   | 10 ++++++++--
 ansible/staging                      |  8 +++++++-
 nomad-job/backup-postgress.nomad     |  4 ++--
 nomad-job/decom/matrix.nomad         |  2 +-
 nomad-job/decom/nextcloud.nomad      |  2 +-
 nomad-job/decom/wikijs.nomad         |  2 +-
 nomad-job/drone.nomad                |  2 +-
 nomad-job/ghostfolio.nomad           |  2 +-
 nomad-job/gitea.nomad                |  2 +-
 nomad-job/paperless-ng.nomad         |  2 +-
 nomad-job/seedboxsync.nomad          |  2 +-
 nomad-job/supysonic.nomad            |  2 +-
 nomad-job/tt-rss.nomad               |  4 ++--
 nomad-job/vaultwarden.nomad          |  2 +-
 nomad-job/vikunja.nomad              |  2 +-
 18 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 ansible/group_vars/database_active
 create mode 100644 ansible/group_vars/database_standby

diff --git a/ansible/group_vars/database/database b/ansible/group_vars/database/database
index 3c0540b..74b49ca 100644
--- a/ansible/group_vars/database/database
+++ b/ansible/group_vars/database/database
@@ -18,3 +18,6 @@ postgresql_databases:
     owner: vikunja
   - name: ghostfolio
     owner: ghostfolio
+
+postgres_consul_service: true
+postgres_consul_service_name: db
diff --git a/ansible/group_vars/database_active b/ansible/group_vars/database_active
new file mode 100644
index 0000000..723e354
--- /dev/null
+++ b/ansible/group_vars/database_active
@@ -0,0 +1 @@
+postgres_consul_tag: "active"
diff --git a/ansible/group_vars/database_standby b/ansible/group_vars/database_standby
new file mode 100644
index 0000000..0a2c263
--- /dev/null
+++ b/ansible/group_vars/database_standby
@@ -0,0 +1 @@
+postgres_consul_tag: "standby"
diff --git a/ansible/production b/ansible/production
index ba5847c..c1d5f0d 100644
--- a/ansible/production
+++ b/ansible/production
@@ -4,10 +4,16 @@ gerard
 [dhcp]
 gerard
 
-[database]
-oscar
+[database_active]
 bleys
 
+[database_standby]
+oscar
+
+[database:children]
+database_active
+database_standby
+
 [rsyncd]
 oscar
 bleys
diff --git a/ansible/staging b/ansible/staging
index ad06426..63843d3 100644
--- a/ansible/staging
+++ b/ansible/staging
@@ -1,9 +1,15 @@
 [DNS]
 oscar-dev
 
-[database]
+[database_active]
 oscar-dev
 
+[database_standby]
+
+[database:children]
+database_active
+database_standby
+
 [wireguard:children]
 staging
 
diff --git a/nomad-job/backup-postgress.nomad b/nomad-job/backup-postgress.nomad
index 3c4b0ec..cf3e93f 100644
--- a/nomad-job/backup-postgress.nomad
+++ b/nomad-job/backup-postgress.nomad
@@ -12,7 +12,7 @@ job "backup-postgress" {
     value     = "amd64"
   }
   periodic {
-    cron             = "0 3 * * *"
+    crons             = ["0 3 * * *"]
     prohibit_overlap = true
   }
   group "backup-postgress" {
@@ -38,7 +38,7 @@ job "backup-postgress" {
           {{ with secret "secrets/data/database/dump"}}
           PGUSER = "dump"
           PGPASSWORD = "{{ .Data.data.password }}"
-          PGHOST = "db1.ducamps.win"
+          PGHOST = "active.db.service.consul"
           {{end}}
           EOH
         destination = "secrets/secrets.env"
diff --git a/nomad-job/decom/matrix.nomad b/nomad-job/decom/matrix.nomad
index 89509ac..265f9a4 100644
--- a/nomad-job/decom/matrix.nomad
+++ b/nomad-job/decom/matrix.nomad
@@ -64,7 +64,7 @@ global:
   database:
 
   {{ with secret "secrets/data/database/dendrite"}}
-    connection_string: postgresql://dendrite:{{.Data.data.password}}@db1.ducamps.win/dendrite?sslmode=disable
+    connection_string: postgresql://dendrite:{{.Data.data.password}}@active.db.service.consul/dendrite?sslmode=disable
   {{end}}
 
     max_open_conns: 100
diff --git a/nomad-job/decom/nextcloud.nomad b/nomad-job/decom/nextcloud.nomad
index abc4def..9f0ff5a 100644
--- a/nomad-job/decom/nextcloud.nomad
+++ b/nomad-job/decom/nextcloud.nomad
@@ -63,7 +63,7 @@ job "nextcloud" {
           NEXTCLOUD_ADMIN_USER="vincent"
           NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.ADMIN_PASSWORD }}"
           NEXTCLOUD_TRUSTED_DOMAINS="file.ducamps.win"
-          POSTGRES_HOST="db1.ducamps.win"
+          POSTGRES_HOST="active.db.service.consul"
           {{end}}
           EOH
         destination = "secrets/nextcloud.env"
diff --git a/nomad-job/decom/wikijs.nomad b/nomad-job/decom/wikijs.nomad
index 8302219..4f72732 100644
--- a/nomad-job/decom/wikijs.nomad
+++ b/nomad-job/decom/wikijs.nomad
@@ -56,7 +56,7 @@ job "wikijs" {
         data= <<EOH
 {{ with secret "secrets/data/database/wikijs"}}
 DB_TYPE="postgres"
-DB_HOST="db1.ducamps.win"
+DB_HOST="active.db.service.consul"
 DB_PORT="5432"
 DB_USER="wikijs"
 DB_PASS="{{.Data.data.password}}"
diff --git a/nomad-job/drone.nomad b/nomad-job/drone.nomad
index 2d50937..9254329 100644
--- a/nomad-job/drone.nomad
+++ b/nomad-job/drone.nomad
@@ -68,7 +68,7 @@ job "drone" {
           {{end}}
 
           {{ with secret "secrets/data/database/droneci"}}
-          DRONE_DATABASE_DATASOURCE="postgres://drone:{{ .Data.data.password }}@db1.ducamps.win:5432/drone?sslmode=disable"
+          DRONE_DATABASE_DATASOURCE="postgres://drone:{{ .Data.data.password }}@active.db.service.consul:5432/drone?sslmode=disable"
           {{end}}
           EOH
         destination = "secrets/drone.env"
diff --git a/nomad-job/ghostfolio.nomad b/nomad-job/ghostfolio.nomad
index 82984a9..d51faa6 100644
--- a/nomad-job/ghostfolio.nomad
+++ b/nomad-job/ghostfolio.nomad
@@ -69,7 +69,7 @@ job "ghostfolio" {
       template {
         data= <<EOH
           {{ with secret "secrets/data/database/ghostfolio"}}
-           DATABASE_URL = postgresql://ghostfolio:{{.Data.data.password}}@db1.ducamps.win:5432/ghostfolio?connect_timeout=300&sslmode=prefer
+           DATABASE_URL = postgresql://ghostfolio:{{.Data.data.password}}@active.db.service.consul/ghostfolio?connect_timeout=300&sslmode=prefer
           {{end}}
           {{ with secret "secrets/data/nomad/ghostfolio"}}
           ACCESS_TOKEN_SALT = {{.Data.data.token}}
diff --git a/nomad-job/gitea.nomad b/nomad-job/gitea.nomad
index 5ab7be2..df72bf2 100644
--- a/nomad-job/gitea.nomad
+++ b/nomad-job/gitea.nomad
@@ -74,7 +74,7 @@ job "git" {
         GITEA__server__SSH_LISTEN_PORT       = "2222"
         GITEA__server__START_SSH_SERVER      = "false"
         GITEA__database__DB_TYPE             = "postgres"
-        GITEA__database__HOST                = "db1.ducamps.win"
+        GITEA__database__HOST                = "active.db.service.consul"
         GITEA__database__NAME                = "gitea"
         GITEA__database__USER                = "gitea"
         GITEA__service__DISABLE_REGISTRATION = "true"
diff --git a/nomad-job/paperless-ng.nomad b/nomad-job/paperless-ng.nomad
index cb49e2d..6da443e 100644
--- a/nomad-job/paperless-ng.nomad
+++ b/nomad-job/paperless-ng.nomad
@@ -75,7 +75,7 @@ job "paperless-ng" {
       }
       env {
         PAPERLESS_REDIS            = "redis://${NOMAD_ADDR_redis}"
-        PAPERLESS_DBHOST           = "db1.ducamps.win"
+        PAPERLESS_DBHOST           = "active.db.service.consul"
         PAPERLESS_DBNAME           = "paperless"
         PAPERLESS_DBUSER           = "paperless"
         PAPERLESS_OCR_LANGUAGE     = "fra"
diff --git a/nomad-job/seedboxsync.nomad b/nomad-job/seedboxsync.nomad
index f299779..6c3d40f 100644
--- a/nomad-job/seedboxsync.nomad
+++ b/nomad-job/seedboxsync.nomad
@@ -12,7 +12,7 @@ job "seedboxsync" {
     value     = "amd64"
   }
   periodic {
-    cron             = "0,30 * * * *"
+    crons             = ["0,30 * * * *"]
     prohibit_overlap = true
   }
   group "seedboxsync" {
diff --git a/nomad-job/supysonic.nomad b/nomad-job/supysonic.nomad
index 71fbdac..459feff 100644
--- a/nomad-job/supysonic.nomad
+++ b/nomad-job/supysonic.nomad
@@ -114,7 +114,7 @@ http {
       template {
         data        = <<EOH
           {{ with secret "secrets/data/database/supysonic"}}
-            SUPYSONIC_DB_URI = "postgres://supysonic:{{ .Data.data.password}}@db1.ducamps.win/supysonic"
+            SUPYSONIC_DB_URI = "postgres://supysonic:{{ .Data.data.password}}@active.db.service.consul/supysonic"
           {{end}}
           {{ with secret "secrets/data/nomad/supysonic"}}
             SUPYSONIC_LDAP_BIND_DN     = "{{ .Data.data.serviceAccountName }}"
diff --git a/nomad-job/tt-rss.nomad b/nomad-job/tt-rss.nomad
index 64d5b95..54a9ea7 100644
--- a/nomad-job/tt-rss.nomad
+++ b/nomad-job/tt-rss.nomad
@@ -60,7 +60,7 @@ job "tt-rss" {
       }
       env {
         TTRSS_DB-TYPE       = "pgsql"
-        TTRSS_DB_HOST       = "db1.ducamps.win"
+        TTRSS_DB_HOST       = "active.db.serice.consul"
         TTRSS_DB_NAME       = "ttrss"
         TTRSS_DB_USER       = "ttrss"
         TTRSS_SELF_URL_PATH = "https://www.ducamps.win/tt-rss"
@@ -92,7 +92,7 @@ job "tt-rss" {
       }
       env {
         TTRSS_DB-TYPE       = "pgsql"
-        TTRSS_DB_HOST       = "db1.ducamps.win"
+        TTRSS_DB_HOST       = "active.db.service.consul"
         TTRSS_DB_NAME       = "ttrss"
         TTRSS_DB_USER       = "ttrss"
         TTRSS_SELF_URL_PATH = "https://www.ducamps.win/tt-rss"
diff --git a/nomad-job/vaultwarden.nomad b/nomad-job/vaultwarden.nomad
index 35e4185..c488160 100644
--- a/nomad-job/vaultwarden.nomad
+++ b/nomad-job/vaultwarden.nomad
@@ -67,7 +67,7 @@ job "vaultwarden" {
       template {
         data        = <<EOH
           {{ with secret "secrets/data/database/vaultwarden"}}
-          DATABASE_URL=postgresql://vaultwarden:{{ .Data.data.password }}@db1.ducamps.win/vaultwarden
+          DATABASE_URL=postgresql://vaultwarden:{{ .Data.data.password }}@active.db.service.consul/vaultwarden
           {{end}}
           EOH
         destination = "secrets/vaultwarden.env"
diff --git a/nomad-job/vikunja.nomad b/nomad-job/vikunja.nomad
index 36eb9da..1817eea 100644
--- a/nomad-job/vikunja.nomad
+++ b/nomad-job/vikunja.nomad
@@ -39,7 +39,7 @@ job "vikunja" {
         ports = ["api"]
       }
       env {
-        VIKUNJA_DATABASE_HOST = "db1.ducamps.win"
+        VIKUNJA_DATABASE_HOST = "active.db.service.consul"
         VIKUNJA_DATABASE_TYPE = "postgres"
         VIKUNJA_DATABASE_USER = "vikunja"
         VIKUNJA_DATABASE_DATABASE = "vikunja"