From 1c297637f1cb5f241b2c29a0ab76ae835b62c006 Mon Sep 17 00:00:00 2001
From: wizzdom <dom@wizzdom.xyz>
Date: Thu, 22 Jan 2026 16:59:51 +0000
Subject: [PATCH 1/3] add roundcube

---
 jobs/services/mail/roundcube.hcl | 108 ++++++++++++++++++++++++++++---
 1 file changed, 100 insertions(+), 8 deletions(-)

diff --git a/jobs/services/mail/roundcube.hcl b/jobs/services/mail/roundcube.hcl
index 9fadd8a..00e4ab8 100644
--- a/jobs/services/mail/roundcube.hcl
+++ b/jobs/services/mail/roundcube.hcl
@@ -7,7 +7,7 @@ job "roundcube" {
   }
 
   group "roundcube" {
-    count = 1
+    count = 2
 
     network {
       port "http" {
@@ -16,9 +16,13 @@ job "roundcube" {
       port "fpm" {
         to = 9000
       }
-      port "db" {
-        to = 5432
-      }
+    }
+
+    update {
+      max_parallel     = 1
+      health_check     = "checks"
+      min_healthy_time = "10s"
+      healthy_deadline = "5m"
     }
 
     service {
@@ -92,7 +96,8 @@ EOH
 
         volumes = [
           "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/www/html",
-          "local/rb-custom.php:/var/roundcube/config/rb-custom.php"
+          "local/rb-custom.php:/var/roundcube/config/rb-custom.php",
+          "local/php.ini:/usr/local/etc/php/conf.d/php.ini"
         ]
       }
 
@@ -101,8 +106,10 @@ EOH
         env         = true
         data        = <<EOH
 ROUNDCUBEMAIL_DB_TYPE=pgsql
-ROUNDCUBEMAIL_DB_HOST={{ env "NOMAD_IP_db" }}
-ROUNDCUBEMAIL_DB_PORT={{ env "NOMAD_HOST_PORT_db" }}
+{{ range service "roundcube-db" }}
+ROUNDCUBEMAIL_DB_HOST={{ .Name }}.service.consul
+ROUNDCUBEMAIL_DB_PORT={{ .Port }}
+{{ end }}
 ROUNDCUBEMAIL_DB_NAME={{ key "roundcube/db/name" }}
 ROUNDCUBEMAIL_DB_USER={{ key "roundcube/db/user" }}
 ROUNDCUBEMAIL_DB_PASSWORD={{ key "roundcube/db/password" }}
@@ -128,13 +135,98 @@ $config['product_name'] = 'Redbrick Webmail';
 $config['skin_logo'] = 'https://raw.githubusercontent.com/redbrick/design-system/main/assets/logos/redbrick.svg';
 $config['support_url'] = 'https://redbrick.dcu.ie/';
 
+EOH
+      }
+      template {
+        destination = "local/php.ini"
+        data        = <<EOH
+pm = dynamic
+pm.max_children = 20
+pm.start_servers = 4
+pm.min_spare_servers = 4
+pm.max_spare_servers = 8
+pm.max_requests = 500
+request_terminate_timeout = 120s
+
+opcache.enable=1
+opcache.enable_cli=0
+opcache.memory_consumption=128
+opcache.interned_strings_buffer=16
+opcache.max_accelerated_files=20000
+opcache.validate_timestamps=0
+opcache.save_comments=1
 EOH
       }
     }
 
-    task "roundcube-db" {
+    task "wait-for-db" {
       driver = "docker"
 
+      lifecycle {
+        hook    = "prestart"
+        sidecar = false
+      }
+
+      config {
+        image   = "postgres:18-alpine"
+        command = "sh"
+        args = [
+          "-c",
+          "while ! pg_isready -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER}; do echo 'Waiting for DB...'; sleep 1; done; echo 'DB is ready!'"
+        ]
+      }
+      template {
+        data        = <<EOH
+{{ range service "roundcube-db" }}
+DB_HOST={{ .Address }}
+DB_PORT={{ .Port }}
+{{ end }}
+DB_USER={{ key "roundcube/db/user" }}
+EOH
+        destination = "local/wait.env"
+        env         = true
+      }
+
+      resources {
+        memory = 128
+      }
+    }
+  }
+
+  group "database" {
+    count = 1
+
+    network {
+      port "db" {
+        to = 5432
+      }
+    }
+
+    update {
+      max_parallel = 0 # don't update this group automatically
+      auto_revert  = false
+    }
+
+    task "db" {
+      driver         = "docker"
+      kill_signal    = "SIGTERM" # SIGTERM instead of SIGKILL so database can shutdown safely
+      kill_timeout   = "30s"
+      shutdown_delay = "5s"
+
+      service {
+        name = "roundcube-db"
+        port = "db"
+
+        check {
+          type     = "script"
+          name     = "postgres-ready"
+          command  = "/bin/sh"
+          args     = ["-c", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+
       config {
         image = "postgres:17-alpine"
         ports = ["db"]

From efa4a12886b3799fc0d2607fd7af596799a32ecc Mon Sep 17 00:00:00 2001
From: wizzdom <dom@wizzdom.xyz>
Date: Sat, 24 Jan 2026 00:38:20 +0000
Subject: [PATCH 2/3] su-listmonk

---
 jobs/socs/su-listmonk.hcl | 53 +++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/jobs/socs/su-listmonk.hcl b/jobs/socs/su-listmonk.hcl
index c4193da..6156ec8 100644
--- a/jobs/socs/su-listmonk.hcl
+++ b/jobs/socs/su-listmonk.hcl
@@ -10,10 +10,13 @@ job "su-listmonk" {
     network {
       mode = "bridge"
       port "http" {}
+    }
 
-      port "db" {
-        to = 5432
-      }
+    update {
+      max_parallel     = 1
+      health_check     = "checks"
+      min_healthy_time = "10s"
+      healthy_deadline = "5m"
     }
 
     service {
@@ -48,7 +51,7 @@ job "su-listmonk" {
         args    = ["-c", "./listmonk --install --idempotent --yes --config '' && ./listmonk --upgrade --yes --config '' && ./listmonk --config ''"] # empty config so envvars are used instead
 
         volumes = [
-          "/storage/nomad/su-listmonk/uploads:/uploads",
+          "/storage/nomad/${NOMAD_JOB_NAME}/uploads:/uploads",
         ]
       }
 
@@ -67,8 +70,10 @@ LISTMONK_app__public_url  = {{ env "NOMAD_META_domain" }}
 LISTMONK_db__user         = {{ key "su/listmonk/db/username" }}
 LISTMONK_db__password     = {{ key "su/listmonk/db/password" }}
 LISTMONK_db__database     = {{ key "su/listmonk/db/name" }}
-LISTMONK_db__host         = {{ env "NOMAD_HOST_IP_db" }}
-LISTMONK_db__port         = {{ env "NOMAD_HOST_PORT_db" }}
+{{- range service "su-listmonk-db" }}
+LISTMONK_db__host         = {{ .Address }}
+LISTMONK_db__port         = {{ .Port }}
+{{- end }}
 LISTMONK_db__ssl_mode     = disable
 LISTMONK_db__max_open     = 25
 LISTMONK_db__max_idle     = 25
@@ -101,8 +106,10 @@ EOH
         destination = "local/wait.env"
         env         = true
         data        = <<EOH
-DB_HOST={{ env "NOMAD_IP_db" }}
-DB_PORT={{ env "NOMAD_HOST_PORT_db" }}
+{{- range service "su-listmonk-db" }}
+DB_HOST={{ .Address }}
+DB_PORT={{ .Port }}
+{{- end }}
 DB_USER={{ key "su/listmonk/db/username" }}
 EOH
       }
@@ -112,8 +119,27 @@ EOH
       }
     }
 
-    task "db" {
-      driver = "docker"
+  }
+
+  group "database" {
+    count = 1
+
+    network {
+      port "db" {
+        to = 5432
+      }
+    }
+
+    update {
+      max_parallel = 0 # don't update this group automatically
+      auto_revert  = false
+    }
+
+    task "postgres" {
+      driver         = "docker"
+      kill_signal    = "SIGTERM" # SIGTERM instead of SIGKILL so database can shutdown safely
+      kill_timeout   = "30s"
+      shutdown_delay = "5s"
 
       service {
         name = "su-listmonk-db"
@@ -129,17 +155,12 @@ EOH
         }
       }
 
-      lifecycle {
-        hook    = "prestart"
-        sidecar = true
-      }
-
       config {
         image = "postgres:17-alpine"
         ports = ["db"]
 
         volumes = [
-          "/storage/nomad/su-listmonk/postgres:/var/lib/postgresql/data"
+          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/postgresql/data"
         ]
       }
 

From 99bb675b0e0d27dc7816a5f8dbc657579f97e354 Mon Sep 17 00:00:00 2001
From: wizzdom <dom@wizzdom.xyz>
Date: Sat, 24 Jan 2026 00:38:42 +0000
Subject: [PATCH 3/3] cleanup

---
 jobs/services/mail/roundcube.hcl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jobs/services/mail/roundcube.hcl b/jobs/services/mail/roundcube.hcl
index 00e4ab8..20bd631 100644
--- a/jobs/services/mail/roundcube.hcl
+++ b/jobs/services/mail/roundcube.hcl
@@ -106,10 +106,10 @@ EOH
         env         = true
         data        = <<EOH
 ROUNDCUBEMAIL_DB_TYPE=pgsql
-{{ range service "roundcube-db" }}
+{{- range service "roundcube-db" }}
 ROUNDCUBEMAIL_DB_HOST={{ .Name }}.service.consul
 ROUNDCUBEMAIL_DB_PORT={{ .Port }}
-{{ end }}
+{{- end }}
 ROUNDCUBEMAIL_DB_NAME={{ key "roundcube/db/name" }}
 ROUNDCUBEMAIL_DB_USER={{ key "roundcube/db/user" }}
 ROUNDCUBEMAIL_DB_PASSWORD={{ key "roundcube/db/password" }}
@@ -177,10 +177,10 @@ EOH
       }
       template {
         data        = <<EOH
-{{ range service "roundcube-db" }}
+{{- range service "roundcube-db" }}
 DB_HOST={{ .Address }}
 DB_PORT={{ .Port }}
-{{ end }}
+{{- end }}
 DB_USER={{ key "roundcube/db/user" }}
 EOH
         destination = "local/wait.env"