add rally job

jobs/games/minecraft/esports.hcl

@@ -1,64 +0,0 @@
-job "esports-minecraft" {
-  datacenters = ["aperture"]
-  type        = "service"
-
-  group "esports-mc" {
-    count = 1
-
-    network {
-      port "mc" {
-        to = 25565
-      }
-      port "rcon" {
-        to = 25575
-      }
-    }
-
-    service {
-      name = "esports-mc"
-      port = "mc"
-    }
-
-    service {
-      name = "esports-mc-rcon"
-      port = "rcon"
-    }
-
-    task "esports-minecraft" {
-      driver = "docker"
-      config {
-        image = "itzg/minecraft-server"
-        ports = ["mc", "rcon"]
-        volumes = [
-          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
-        ]
-      }
-
-      resources {
-        cpu    = 5000  # 5000 MHz
-        memory = 20480 # 20 GB
-      }
-
-      template {
-        data        = <<EOF
-EULA            = "TRUE"
-TYPE            = "PAPER"
-VERSION         = "1.21.4"
-ICON            = "https://liquipedia.net/commons/images/thumb/5/53/DCU_Esports_allmode.png/37px-DCU_Esports_allmode.png"
-USE_AIKAR_FLAGS = true
-MAX_MEMORY      = 18G
-MOTD            = "Powered by Redbrick"
-MAX_PLAYERS     = "32"
-VIEW_DISTANCE   = "32"
-ENABLE_RCON     = true
-RCON_PASSWORD   = {{ key "games/mc/esports-mc/rcon/password" }}
-# Auto-download plugins
-SPIGET_RESOURCES=83581,62325,118271,28140,102931 # RHLeafDecay, GSit, GravesX, Luckperms, NoChatReport
-MODRINTH_PROJECTS=datapack:no-enderman-grief,thizzyz-tree-feller,imageframe,bmarker,datapack:players-drop-heads,viaversion,viabackwards
-EOF
-        destination = "local/.env"
-        env         = true
-      }
-    }
-  }
-}

jobs/games/minecraft/vanilla.hcl

@@ -50,20 +50,20 @@ job "minecraft-vanilla" {
 
       resources {
         cpu    = 5000  # 5000 MHz
-        memory = 20480 # 20 GB
+        memory = 12288 # 12GB
       }
 
       template {
         data        = <<EOF
 EULA            = "TRUE"
 TYPE            = "PAPER"
-VERSION         = "1.21.3"
+VERSION         = "1.21.1"
 ICON            = "https://docs.redbrick.dcu.ie/assets/logo.png"
 USE_AIKAR_FLAGS = true
-MAX_MEMORY      = 18G
+MAX_MEMORY      = 11G
 MOTD            = "LONG LIVE THE REDBRICK"
-MAX_PLAYERS     = "32"
+MAX_PLAYERS     = "20"
-VIEW_DISTANCE   = "32"
+VIEW_DISTANCE   = "20"
 ENABLE_RCON     = true
 RCON_PASSWORD   = {{ key "games/mc/vanilla-mc/rcon/password" }}
 # Auto-download plugins

jobs/ingress/traefik.hcl

@@ -14,9 +14,6 @@ job "traefik" {
       port "admin" {
         static = 8080
       }
-      port "ssh" {
-        static = 22
-      }
       port "smtp" {
         static = 25
       }
@@ -41,12 +38,6 @@ job "traefik" {
       port "managesieve" {
         static = 4190
       }
-      port "voice-tcp" {
-        static = 4502
-      }
-      port "voice-udp" {
-        static = 4503
-      }
     }
 
     service {
@@ -64,7 +55,6 @@ job "traefik" {
         volumes = [
           "local/traefik.toml:/etc/traefik/traefik.toml",
           "/storage/nomad/traefik/acme/acme.json:/acme.json",
-          "/storage/nomad/traefik/access.log:/access.log",
         ]
       }
 
@@ -83,9 +73,6 @@ job "traefik" {
   [entryPoints.traefik]
   address = ":8080"
 
-  [entryPoints.ssh]
-  address = ":22"
-
   [entryPoints.smtp]
   address = ":25"
 
@@ -110,14 +97,6 @@ job "traefik" {
   [entryPoints.managesieve]
   address = ":4190"
 
-  [entryPoints.voice-tcp]
-  address = ":4502"
-
-  [entryPoints.voice-udp]
-    address = ":4503/udp"
-    [entryPoints.voice-udp.udp]
-      timeout = "15s" # this will help reduce random dropouts in audio https://github.com/mumble-voip/mumble/issues/3550#issuecomment-441495977
-
 [tls.options]
   [tls.options.default]
     minVersion = "VersionTLS12"
@@ -143,10 +122,6 @@ job "traefik" {
       address = "127.0.0.1:8500"
       scheme  = "http"
 
-# Enable the file provider for dynamic configuration.
-[providers.file]
-  filename = "/local/dynamic.toml"
-
 #[providers.nomad]
 #  [providers.nomad.endpoint]
 #    address = "127.0.0.1:4646"
@@ -156,50 +131,9 @@ job "traefik" {
   email = "elected-admins@redbrick.dcu.ie"
   storage = "acme.json"
   [certificatesResolvers.lets-encrypt.acme.tlsChallenge]
-
-[tracing]
-
-[accessLog]
-  filePath = "/access.log"
 EOF
         destination = "/local/traefik.toml"
       }
-      template {
-        data        = <<EOF
-[http]
-
-[http.middlewares]
-
-# handle redirects for short links
-# NOTE: this is a consul template, add entries via consul kv
-# create the middlewares with replacements for each redirect
-{{ range $pair := tree "redirect/redbrick" }}
-  [http.middlewares.redirect-{{ trimPrefix "redirect/redbrick/" $pair.Key }}.redirectRegex]
-    regex = ".*"  # match everything - hosts are handled by the router
-    replacement = "{{ $pair.Value }}"
-    permanent = true
-{{- end }}
-
-[http.routers]
-
-# create routers with middlewares for each redirect
-{{ range $pair := tree "redirect/redbrick" }}
-  [http.routers.{{ trimPrefix "redirect/redbrick/" $pair.Key }}-redirect]
-    rule = "Host(`{{ trimPrefix "redirect/redbrick/" $pair.Key }}.redbrick.dcu.ie`)"
-    entryPoints = ["web", "websecure"]
-    middlewares = ["redirect-{{ trimPrefix "redirect/redbrick/" $pair.Key }}"]
-    service = "dummy-service"  # all routers need a service, this isn't used
-    [http.routers.{{ trimPrefix "redirect/redbrick/" $pair.Key }}-redirect.tls]
-{{- end }}
-
-[http.services]
-  [http.services.dummy-service.loadBalancer]
-    [[http.services.dummy-service.loadBalancer.servers]]
-      url = "http://127.0.0.1"  # Dummy service - not used
-EOF
-        destination = "local/dynamic.toml"
-        change_mode = "noop"
-      }
     }
   }
 }

jobs/monitoring/uptime-huma.hcl

@@ -1,44 +0,0 @@
-job "uptime-kuma" {
-  datacenters = ["aperture"]
-  type        = "service"
-
-  group "web" {
-    count = 1
-
-    network {
-      port "http" {
-        to = 3001
-      }
-    }
-
-    service {
-      port = "http"
-
-      check {
-        type     = "http"
-        path     = "/"
-        interval = "10s"
-        timeout  = "2s"
-      }
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.uptime-kuma.rule=Host(`status.redbrick.dcu.ie`)",
-        "traefik.http.routers.uptime-kuma.entrypoints=web,websecure",
-        "traefik.http.routers.uptime-kuma.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-    task "web" {
-      driver = "docker"
-
-      config {
-        image = "louislam/uptime-kuma:1"
-        ports = ["http"]
-        volumes = [
-          "/storage/nomad/uptime-kuma/data:/app/data"
-        ]
-      }
-    }
-  }
-}

jobs/nginx/atlas.hcl

@@ -27,18 +27,12 @@ job "atlas" {
 
       tags = [
         "traefik.enable=true",
-        "traefik.http.routers.nginx-atlas.rule=Host(`redbrick.dcu.ie`) || Host(`www.redbrick.dcu.ie`) || Host(`www.rb.dcu.ie`) || Host(`rb.dcu.ie`)",
+        "traefik.http.routers.nginx-atlas.rule=Host(`redbrick.dcu.ie`) || Host(`rb.dcu.ie`)",
         "traefik.http.routers.nginx-atlas.entrypoints=web,websecure",
         "traefik.http.routers.nginx-atlas.tls.certresolver=lets-encrypt",
-        "traefik.http.routers.nginx-atlas.middlewares=atlas-www-redirect,redirect-user-web",
+        "traefik.http.routers.nginx-atlas.middlewares=redirect-user-web",
-        # redirect redbrick.dcu.ie/~user to user.redbrick.dcu.ie
         "traefik.http.middlewares.redirect-user-web.redirectregex.regex=https://redbrick\\.dcu\\.ie/~([^/]*)/?([^/].*)?",
         "traefik.http.middlewares.redirect-user-web.redirectregex.replacement=https://$1.redbrick.dcu.ie/$2",
-        "traefik.http.middlewares.redirect-user-web.redirectregex.permanent=true",
-        # redirect www.redbrick.dcu.ie to redbrick.dcu.ie
-        "traefik.http.middlewares.atlas-www-redirect.redirectregex.regex=^https?://www.redbrick.dcu.ie/(.*)",
-        "traefik.http.middlewares.atlas-www-redirect.redirectregex.replacement=https://redbrick.dcu.ie/$${1}",
-        "traefik.http.middlewares.atlas-www-redirect.redirectregex.permanent=true",
       ]
     }
 

jobs/services/hedgedoc.hcl

@@ -42,7 +42,7 @@ job "hedgedoc" {
       driver = "docker"
 
       config {
-        image = "quay.io/hedgedoc/hedgedoc:1.10.2"
+        image = "quay.io/hedgedoc/hedgedoc:1.10.0"
         ports = ["http"]
         volumes = [
           "/storage/nomad/hedgedoc/banner:/hedgedoc/public/banner",

jobs/services/plausible.hcl

@@ -7,15 +7,12 @@ job "plausible" {
       port "http" {
         to = 8000
       }
-      port "clickhouse" {
-        static = 8123
-      }
       port "db" {
-        static = 5432
+        static = 8123
       }
     }
 
-    task "app" {
+    task "plausible" {
       service {
         name = "plausible"
         port = "http"
@@ -38,11 +35,8 @@ job "plausible" {
       driver = "docker"
 
       config {
-        image = "ghcr.io/plausible/community-edition:v2.1"
+        image = "ghcr.io/plausible/community-edition:v2.1.1"
         ports = ["http"]
-        volumes = [
-          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/plausible"
-        ]
 
         command = "/bin/sh"
         args    = ["-c", "sleep 10 && /entrypoint.sh db migrate && /entrypoint.sh run"]
@@ -50,8 +44,6 @@ job "plausible" {
 
       template {
         data        = <<EOH
-TMPDIR=/var/lib/plausible/tmp
-
 BASE_URL=https://plausible.redbrick.dcu.ie
 SECRET_KEY_BASE={{ key "plausible/secret" }}
 TOTP_VAULT_KEY={{ key "plausible/totp/key" }}
@@ -65,8 +57,8 @@ GOOGLE_CLIENT_ID={{ key "plausible/google/client_id" }}
 GOOGLE_CLIENT_SECRET={{ key "plausible/google/client_secret" }}
 
 # Database settings
-DATABASE_URL=postgres://{{ key "plausible/db/user" }}:{{ key "plausible/db/password" }}@{{ env "NOMAD_ADDR_db" }}/{{ key "plausible/db/name" }}
+DATABASE_URL=postgres://{{ key "plausible/db/user" }}:{{ key "plausible/db/password" }}@postgres.service.consul:5432/{{ key "plausible/db/name" }}
-CLICKHOUSE_DATABASE_URL=http://{{ env "NOMAD_ADDR_clickhouse" }}/plausible_events_db
+CLICKHOUSE_DATABASE_URL=http://{{ env "NOMAD_ADDR_db" }}/plausible_events_db
 
 # Email settings
 MAILER_NAME="Redbrick Plausible"
@@ -88,43 +80,24 @@ EOH
       }
     }
 
-    task "db" {
-      driver = "docker"
-
-      config {
-        image = "postgres:17-alpine"
-        ports = ["db"]
-
-        volumes = [
-          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/postgresql/data",
-        ]
-      }
-
-      template {
-        data        = <<EOH
-POSTGRES_PASSWORD={{ key "plausible/db/password" }}
-POSTGRES_USER={{ key "plausible/db/user" }}
-POSTGRES_NAME={{ key "plausible/db/name" }}
-EOH
-        destination = "local/db.env"
-        env         = true
-      }
-    }
-
     task "clickhouse" {
+      constraint {
+        attribute = "${attr.unique.hostname}"
+        value     = "chell"
+      }
 
       service {
         name = "plausible-clickhouse"
-        port = "clickhouse"
+        port = "db"
       }
 
       driver = "docker"
 
       config {
         image = "clickhouse/clickhouse-server:24.3.3.102-alpine"
-        ports = ["clickhouse"]
+        ports = ["db"]
         volumes = [
-          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/clickhouse",
+          "/opt/plausible/clickhouse:/var/lib/clickhouse",
           "local/clickhouse.xml:/etc/clickhouse-server/config.d/logging.xml:ro",
           "local/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro"
         ]
@@ -167,7 +140,7 @@ EOH
       }
 
       resources {
-        memory = 1000
+        memory = 800
       }
     }
   }

jobs/services/postgres-backup.hcl

@@ -1,4 +1,4 @@
-job "privatebin-backup" {
+job "postgres-backup" {
   datacenters = ["aperture"]
   type        = "batch"
 
@@ -20,17 +20,17 @@ job "privatebin-backup" {
         data        = <<EOH
 #!/bin/bash
 
-file=/storage/backups/nomad/privatebin/postgresql-privatebin-$(date +%Y-%m-%d_%H-%M-%S).sql
+file=/storage/backups/nomad/postgres/postgres-$(date +%Y-%m-%d_%H-%M-%S).sql
 
-mkdir -p /storage/backups/nomad/privatebin
+mkdir -p /storage/backups/nomad/postgres
 
-alloc_id=$(nomad job status privatebin | grep running | tail -n 1 | cut -d " " -f 1)
+alloc_id=$(nomad job status postgres | grep running | tail -n 1 | cut -d " " -f 1)
 
 job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
 
-nomad alloc exec -task db $alloc_id pg_dumpall -U {{ key "privatebin/db/user" }} > "${file}"
+nomad alloc exec $alloc_id pg_dumpall -U {{ key "postgres/username/root" }} > "${file}"
 
-find /storage/backups/nomad/privatebin/postgresql-privatebin* -ctime +3 -exec rm {} \; || true
+find /storage/backups/nomad/postgres/postgres* -ctime +3 -exec rm {} \; || true
 
 if [ -s "$file" ]; then # check if file exists and is not empty
   echo "Backup successful"

jobs/services/postgres.hcl

@@ -0,0 +1,96 @@
+job "postgres" {
+  datacenters = ["aperture"]
+
+  constraint {
+    attribute = "${attr.unique.hostname}"
+    value     = "wheatley"
+  }
+
+  group "db" {
+    network {
+      port "db" {
+        static = 5432
+      }
+    }
+
+    task "postgres-db" {
+      driver = "docker"
+
+      template {
+        data = <<EOH
+POSTGRES_PASSWORD="{{ key "postgres/password/root" }}"
+POSTGRES_USER="{{ key "postgres/username/root" }}"
+EOH
+
+        destination = "local/file.env"
+        env         = true
+      }
+
+      config {
+        image = "postgres:16-alpine"
+        ports = ["db"]
+
+        volumes = [
+          "/opt/postgres:/var/lib/postgresql/data",
+          "local/postgresql.conf:/etc/postgres/postgresql.conf",
+          "local/pg_hba.conf:/pg_hba.conf",
+        ]
+      }
+
+      template {
+        data = <<EOH
+max_connections = 100
+shared_buffers = 2GB
+effective_cache_size = 6GB
+maintenance_work_mem = 512MB
+checkpoint_completion_target = 0.9
+wal_buffers = 16MB
+default_statistics_target = 100
+random_page_cost = 1.1
+effective_io_concurrency = 200
+work_mem = 5242kB
+min_wal_size = 1GB
+max_wal_size = 4GB
+max_worker_processes = 4
+max_parallel_workers_per_gather = 2
+max_parallel_workers = 4
+max_parallel_maintenance_workers = 2
+
+hba_file = "/pg_hba.conf"
+EOH
+
+        destination = "local/postgresql.conf"
+      }
+
+      template {
+        data = <<EOH
+local   all             all                                     trust
+host    all             all             127.0.0.1/32            trust
+host    all             all             ::1/128                 trust
+local   replication     all                                     trust
+host    replication     all             127.0.0.1/32            trust
+host    replication     all             ::1/128                 trust
+host 	all 		    all 		    all 			        scram-sha-256
+EOH
+
+        destination = "local/pg_hba.conf"
+      }
+
+      resources {
+        cpu    = 400
+        memory = 800
+      }
+
+      service {
+        name = "postgres"
+        port = "db"
+
+        check {
+          type     = "tcp"
+          interval = "2s"
+          timeout  = "2s"
+        }
+      }
+    }
+  }
+}

jobs/services/privatebin.hcl

@@ -10,9 +10,6 @@ job "privatebin" {
       port "http" {
         to = 8080
       }
-      port "db" {
-        to = 5432
-      }
     }
 
     service {
@@ -28,7 +25,7 @@ job "privatebin" {
 
       tags = [
         "traefik.enable=true",
-        "traefik.http.routers.privatebin.rule=Host(`paste.redbrick.dcu.ie`) || Host(`paste.rb.dcu.ie`)",
+        "traefik.http.routers.privatebin.rule=Host(`paste.rb.dcu.ie`) || Host(`paste.redbrick.dcu.ie`)",
         "traefik.http.routers.privatebin.entrypoints=web,websecure",
         "traefik.http.routers.privatebin.tls.certresolver=lets-encrypt",
       ]
@@ -45,10 +42,15 @@ job "privatebin" {
           "local/conf.php:/srv/data/conf.php",
         ]
       }
-      env {
+      template {
-        TZ          = "Europe/Dublin"
+        destination = "local/.env"
-        PHP_TZ      = "Europe/Dublin"
+        env         = true
-        CONFIG_PATH = "/srv/data/"
+        change_mode = "restart"
+        data        = <<EOH
+TZ=Europe/Dublin
+PHP_TZ=Europe/Dublin
+CONFIG_PATH=/srv/data/
+EOH
       }
 
       template {
@@ -57,7 +59,7 @@ job "privatebin" {
 [main]
 name = "Redbrick PasteBin"
 
-basepath = "https://paste.redbrick.dcu.ie/"
+basepath = "https://paste.rb.dcu.ie/"
 
 discussion = true
 
@@ -183,36 +185,13 @@ batchsize = 10
 [model]
 class = Database
 [model_options]
-dsn = "pgsql:host={{ env "NOMAD_ADDR_db" }};dbname={{ key "privatebin/db/name" }}"
+dsn = "pgsql:host=postgres.service.consul;dbname={{ key "privatebin/db/name" }}"
-tbl = "{{ key "privatebin/db/name" }}"     ; table prefix
+tbl = "privatebin_"     ; table prefix
 usr = "{{ key "privatebin/db/user" }}"
 pwd = "{{ key "privatebin/db/password" }}"
 opt[12] = true    ; PDO::ATTR_PERSISTENT ; use persistent connections - default
 EOH
       }
     }
-
-    task "db" {
-      driver = "docker"
-
-      config {
-        image = "postgres:17-alpine"
-        ports = ["db"]
-
-        volumes = [
-          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/postgresql/data",
-        ]
-      }
-
-      template {
-        data        = <<EOH
-POSTGRES_PASSWORD={{ key "privatebin/db/password" }}
-POSTGRES_USER={{ key "privatebin/db/user" }}
-POSTGRES_NAME={{ key "privatebin/db/name" }}
-EOH
-        destination = "local/db.env"
-        env         = true
-      }
-    }
   }
 }

jobs/services/rally.hcl

@@ -0,0 +1,121 @@
+job "rally" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  group "rally-web" {
+    network {
+      port "http" {
+        to = 3000
+      }
+      port "db" {
+        to = 5432
+      }
+    }
+
+    service {
+      name = "rally"
+      port = "http"
+
+      check {
+        type     = "http"
+        path     = "/"
+        interval = "10s"
+        timeout  = "2s"
+      }
+
+      tags = [
+        "traefik.enable=true",
+        "traefik.http.routers.rally.rule=Host(`vote.rb.dcu.ie`)",
+        "traefik.http.routers.rally.entrypoints=websecure",
+        "traefik.http.routers.rally.tls=true",
+        "traefik.http.routers.rally.tls.certresolver=lets-encrypt",
+      ]
+    }
+
+    task "web" {
+      driver = "docker"
+
+      config {
+        image = "lukevella/rallly:latest"
+        ports = ["http"]
+      }
+
+      template {
+        data        = <<EOH
+DATABASE_URL=postgres://{{ key "rally/db/user" }}:{{ key "rally/db/password" }}@{{ env "NOMAD_ADDR_db" }}/{{ key "rally/db/name" }}
+PG_PASSWD={{ key "rally/db/password" }}
+PG_DB={{ key "rally/db/name" }}
+
+# A random 32-character secret key used to encrypt user sessions
+SECRET_PASSWORD={{ key "rally/secret" }}
+
+# The base url where this instance is accessible, including the scheme.
+# Example: https://example.com
+NEXT_PUBLIC_BASE_URL={{ key "rally/base_url" }}
+
+# NEXTAUTH_URL should be the same as NEXT_PUBLIC_BASE_URL
+NEXTAUTH_URL={{ key "rally/base_url" }}
+
+# Toggle Self-Hosted mode
+NEXT_PUBLIC_SELF_HOSTED=true
+
+# Comma separated list of email addresses that are allowed to register and login.
+# You can use wildcard syntax to match a range of email addresses.
+# Example: "john@example.com,jane@example.com" or "*@example.com"
+ALLOWED_EMAILS={{ key "rally/email/allowed_emails" }}
+
+# EMAIL CONFIG (required for sending emails)
+
+# The email of whoever is managing this instance in case a user needs support.
+SUPPORT_EMAIL={{ key "rally/email/support" }}
+
+# The host address of your SMTP server
+SMTP_HOST={{ key "rally/email/host" }}
+
+# The port of your SMTP server
+SMTP_PORT={{ key "rally/email/port" }}
+
+# Set to "true" if SSL is enabled for your SMTP connection
+SMTP_SECURE=true
+
+# The username (if auth is enabled on your SMTP server)
+SMTP_USER={{ key "rally/email/user" }}
+
+# The password (if auth is enabled on your SMTP server)
+SMTP_PWD={{ key "rally/email/password" }}
+EOH
+        destination = "local/.env"
+        env         = true
+      }
+
+      resources {
+        cpu    = 800
+        memory = 1000
+      }
+    }
+
+    task "db" {
+      driver = "docker"
+
+      config {
+        image = "postgres:17.2-alpine"
+        ports = ["db"]
+
+        volumes = [
+          "/storage/nomad/rally/db:/var/lib/postgresql/data"
+        ]
+      }
+
+      template {
+        data        = <<EOH
+POSTGRES_PASSWORD={{ key "rally/db/password" }}
+POSTGRES_USER={{ key "rally/db/user" }}
+POSTGRES_NAME={{ key "rally/db/name" }}
+EOH
+        destination = "local/db.env"
+        env         = true
+      }
+    }
+  }
+}
+

jobs/services/vaultwarden-backup.hcl

@@ -1,50 +0,0 @@
-job "vaultwarden-backup" {
-  datacenters = ["aperture"]
-  type        = "batch"
-
-  periodic {
-    crons            = ["0 */3 * * * *"]
-    prohibit_overlap = true
-  }
-
-  group "db-backup" {
-    task "postgres-backup" {
-      driver = "raw_exec"
-
-      config {
-        command = "/bin/bash"
-        args    = ["local/script.sh"]
-      }
-
-      template {
-        data        = <<EOH
-#!/bin/bash
-
-file=/storage/backups/nomad/vaultwarden/postgresql-vaultwarden-$(date +%Y-%m-%d_%H-%M-%S).sql
-
-mkdir -p /storage/backups/nomad/vaultwarden
-
-alloc_id=$(nomad job status vaultwarden | grep running | tail -n 1 | cut -d " " -f 1)
-
-job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
-
-nomad alloc exec -task db $alloc_id pg_dumpall -U {{ key "vaultwarden/db/user" }} > "${file}"
-
-find /storage/backups/nomad/vaultwarden/postgresql-vaultwarden* -ctime +3 -exec rm {} \; || true
-
-if [ -s "$file" ]; then # check if file exists and is not empty
-  echo "Backup successful"
-  exit 0
-else
-  rm $file
-  curl -H "Content-Type: application/json" -d \
-  '{"content": "<@&585512338728419341> `PostgreSQL` backup for **'"${job_name}"'** has just **FAILED**\nFile name: `'"$file"'`\nDate: `'"$(TZ=Europe/Dublin date)"'`\nTurn off this script with `nomad job stop '"${job_name}"'` \n\n## Remember to restart this backup job when fixed!!!"}' \
-  {{ key "postgres/webhook/discord" }}
-fi
-EOH
-        destination = "local/script.sh"
-      }
-    }
-  }
-}
-

jobs/services/vaultwarden.hcl

@@ -9,9 +9,6 @@ job "vaultwarden" {
       port "http" {
         to = 80
       }
-      port "db" {
-        to = 5432
-      }
     }
 
     service {
@@ -34,15 +31,14 @@ job "vaultwarden" {
         ports = ["http"]
 
         volumes = [
-          "/storage/nomad/${NOMAD_JOB_NAME}:/data",
+          "/storage/nomad/vaultwarden:/data"
-          "/etc/localtime:/etc/localtime:ro"
         ]
       }
 
       template {
         data = <<EOF
 DOMAIN=https://vault.redbrick.dcu.ie
-DATABASE_URL=postgresql://{{ key "vaultwarden/db/user" }}:{{ key "vaultwarden/db/password" }}@{{ env "NOMAD_ADDR_db" }}/{{ key "vaultwarden/db/name" }}
+DATABASE_URL=postgresql://{{ key "vaultwarden/db/user" }}:{{ key "vaultwarden/db/password" }}@postgres.service.consul:5432/{{ key "vaultwarden/db/name" }}
 SIGNUPS_ALLOWED=false
 INVITATIONS_ALLOWED=true
 
@@ -59,37 +55,14 @@ EOF
         destination = "local/env"
         env         = true
       }
-      # These yubico variables are not necessary for yubikey support, only to verify the keys with yubico.
+# These yubico variables are not necessary for yubikey support, only to verify the keys with yubico.
-      #YUBICO_CLIENT_ID={{ key "vaultwarden/yubico/client_id" }}
+#YUBICO_CLIENT_ID={{ key "vaultwarden/yubico/client_id" }}
-      #YUBICO_SECRET_KEY={{ key "vaultwarden/yubico/secret_key" }}
+#YUBICO_SECRET_KEY={{ key "vaultwarden/yubico/secret_key" }}
 
       resources {
         cpu    = 500
         memory = 500
       }
     }
-
-    task "db" {
-      driver = "docker"
-
-      config {
-        image = "postgres:17-alpine"
-        ports = ["db"]
-
-        volumes = [
-          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/postgresql/data",
-        ]
-      }
-
-      template {
-        data        = <<EOH
-POSTGRES_PASSWORD={{ key "vaultwarden/db/password" }}
-POSTGRES_USER={{ key "vaultwarden/db/user" }}
-POSTGRES_NAME={{ key "vaultwarden/db/name" }}
-EOH
-        destination = "local/db.env"
-        env         = true
-      }
-    }
   }
 }

jobs/services/wiki/LocalSettings.php

@@ -41,7 +41,7 @@ $wgDBpassword = "{{ key "mediawiki/db/password" }}";
 # MySQL specific settings
 $wgDBprefix = "rbwiki_";
 # MySQL table options to use during installation or update
-$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=utf8mb4";
+$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
 
 ## Shared memory settings
 $wgMainCacheType = CACHE_NONE;
@@ -89,15 +89,11 @@ wfLoadSkin( 'Vector' );
 wfLoadSkin( 'Citizen' );
 wfLoadSkin( 'Timeless' );
 wfLoadSkin( 'MinervaNeue' );
-wfLoadSkin( 'Medik' );
 
 $wgCitizenThemeColor = "#a81e22";
 $wgCitizenShowPageTools = "permission";
 $wgCitizenSearchDescriptionSource = "pagedescription";
 
-$wgMedikColor = "#a81e22";
-$wgMedikShowLogo = "main";
-
 $wgLocalisationUpdateDirectory = "$IP/cache";
 
 # load extensions

jobs/services/wiki/mediawiki-backup.hcl

@@ -17,7 +17,7 @@ job "mediawiki-backup" {
       }
 
       template {
-        data        = <<EOH
+        data = <<EOH
 #!/bin/bash
 
 file=/storage/backups/nomad/wiki/mysql/rbwiki-mysql-$(date +%Y-%m-%d_%H-%M-%S).sql
@@ -30,7 +30,7 @@ job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
 
 nomad alloc exec -task rbwiki-db $alloc_id mariadb-dump -u {{ key "mediawiki/db/username" }} -p'{{ key "mediawiki/db/password"}}' {{ key "mediawiki/db/name" }} > "${file}"
 
-find /storage/backups/nomad/wiki/mysql/rbwiki-mysql* -ctime +30 -exec rm {} \; || true
+find /storage/backups/nomad/wiki/mysql/rbwiki-mysql* -ctime +3 -exec rm {} \; || true
 
 if [ -s "$file" ]; then # check if file exists and is not empty
   echo "Backup successful"
@@ -56,7 +56,7 @@ EOH
       }
 
       template {
-        data        = <<EOH
+        data = <<EOH
 #!/bin/bash
 
 file=/storage/backups/nomad/wiki/xml/rbwiki-dump-$(date +%Y-%m-%d_%H-%M-%S).xml

jobs/services/wiki/mediawiki.hcl

@@ -1,6 +1,6 @@
 job "mediawiki" {
   datacenters = ["aperture"]
-  type        = "service"
+  type = "service"
 
   meta {
     domain = "wiki.redbrick.dcu.ie"
@@ -27,10 +27,10 @@ job "mediawiki" {
       port = "http"
 
       check {
-        type     = "http"
+        type = "http"
-        path     = "/Main_Page"
+        path = "/Main_Page"
         interval = "10s"
-        timeout  = "5s"
+        timeout = "5s"
       }
 
       tags = [
@@ -61,11 +61,11 @@ job "mediawiki" {
         ]
       }
       resources {
-        cpu    = 200
+          cpu    = 200
-        memory = 100
+          memory = 100
-      }
+        }
       template {
-        data        = <<EOH
+        data = <<EOH
 # user www-data www-data;
 error_log /dev/stderr error;
 events {
@@ -139,9 +139,9 @@ EOH
       }
 
       resources {
-        cpu    = 4000
+          cpu    = 4000
-        memory = 1200
+          memory = 1200
-      }
+        }
 
       template {
         data = <<EOH
@@ -179,7 +179,7 @@ EOH
       }
 
       template {
-        data        = file("LocalSettings.php")
+        data = file("LocalSettings.php")
         destination = "local/LocalSettings.php"
       }
     }
@@ -189,10 +189,10 @@ EOH
       port = "db"
 
       check {
-        name     = "mariadb_probe"
+        name = "mariadb_probe"
-        type     = "tcp"
+        type = "tcp"
         interval = "10s"
-        timeout  = "2s"
+        timeout = "2s"
       }
     }
 
@@ -213,18 +213,6 @@ EOH
       template {
         data = <<EOH
 [mysqld]
-# Ensure full UTF-8 support
-character-set-server = utf8mb4
-collation-server = utf8mb4_unicode_ci
-skip-character-set-client-handshake
-
-# Fix 1000-byte key length issue
-innodb_large_prefix = 1
-innodb_file_format = Barracuda
-innodb_file_per_table = 1
-innodb_default_row_format = dynamic
-
-# Performance optimizations (Keep these based on your system)
 max_connections = 100
 key_buffer_size = 2G
 query_cache_size = 0
@@ -236,23 +224,22 @@ innodb_io_capacity = 200
 tmp_table_size = 5242K
 max_heap_table_size = 5242K
 innodb_log_buffer_size = 16M
+innodb_file_per_table = 1
 
+bind-address = 0.0.0.0
 # Logging
 slow_query_log = 1
 slow_query_log_file = /var/log/mysql/slow.log
 long_query_time = 1
-
-# Network
-bind-address = 0.0.0.0
 EOH
 
         destination = "local/conf.cnf"
       }
 
       resources {
-        cpu    = 800
+          cpu    = 800
-        memory = 2500
+          memory = 1200
-      }
+        }
 
       template {
         data = <<EOH
@@ -263,7 +250,7 @@ MYSQL_RANDOM_ROOT_PASSWORD=yes
 EOH
 
         destination = "local/.env"
-        env         = true
+        env = true
       }
     }
   }

jobs/socs/ams-amikon.hcl

@@ -12,7 +12,7 @@ job "ams-amikon" {
 
     network {
       port "http" {
-        to = 3000
+        to = 80
       }
     }
 
@@ -20,45 +20,35 @@ job "ams-amikon" {
       port = "http"
 
       check {
-        type     = "http"
+        type = "http"
-        path     = "/"
+        path = "/"
         interval = "10s"
-        timeout  = "2s"
+        timeout = "2s"
       }
       tags = [
         "traefik.enable=true",
         "traefik.http.routers.ams-amikon.rule=Host(`amikon.me`) || Host(`www.amikon.me`)",
         "traefik.http.routers.ams-amikon.entrypoints=web,websecure",
         "traefik.http.routers.ams-amikon.tls.certresolver=lets-encrypt",
-        "traefik.http.routers.ams-amikon.middlewares=amikon-www-redirect",
+        "traefik.http.routers.ams-amikon.middlewares=www-redirect",
-        "traefik.http.middlewares.amikon-www-redirect.redirectregex.regex=^https?://www.amikon.me/(.*)",
+        "traefik.http.middlewares.www-redirect.redirectregex.regex=^https?://www.amikon.me/(.*)",
-        "traefik.http.middlewares.amikon-www-redirect.redirectregex.replacement=https://amikon.me/$${1}",
+        "traefik.http.middlewares.www-redirect.redirectregex.replacement=https://amikon.me/$${1}",
-        "traefik.http.middlewares.amikon-www-redirect.redirectregex.permanent=true",
+        "traefik.http.middlewares.www-redirect.redirectregex.permanent=true",
       ]
     }
 
-    task "amikon-node" {
+    task "amikon-nginx" {
       driver = "docker"
 
       config {
-        image      = "ghcr.io/dcuams/amikon-site-v2:latest"
+        image = "ghcr.io/dcuams/amikon-site-v2:latest"
         force_pull = true
-        ports      = ["http"]
+        ports = ["http"]
-      }
-
-      template {
-        data        = <<EOF
-      EMAIL={{ key "ams/amikon/email/user" }}
-      EMAIL_PASS={{ key "ams/amikon/email/password" }}
-      TO_EMAIL={{ key "ams/amikon/email/to" }}
-      EOF
-        destination = ".env"
-        env         = true
       }
 
       resources {
-        cpu    = 800
+        cpu    = 100
-        memory = 500
+        memory = 50
       }
     }
   }

jobs/socs/esports-discord-bot.hcl

@@ -10,7 +10,6 @@ job "esports-discord-bot" {
 
       config {
         image = "ghcr.io/aydenjahola/discord-multipurpose-bot:main"
-        force_pull = true
       }
 
       resources {
@@ -29,15 +28,6 @@ RAPIDAPI_KEY={{ key "socs/esports/bot/rapidapi/key" }}
 TRACKER_API_KEY={{ key "socs/esports/bot/trackerapi/key" }}
 TRACKER_API_URL={{ key "socs/esports/bot/trackerapi/url" }}
 WORDNIK_API_KEY={{key "socs/esports/bot/wordnikapi/key" }}
-HUGGING_FACE_API_KEY={{ key "socs/esports/bot/huggingface/key" }}
-
-RCON_HOST=esports-mc-rcon.service.consul
-
-# https://discuss.hashicorp.com/t/passing-registered-ip-and-port-from-consul-to-env-nomad-job-section/35647
-{{ range service "esports-mc-rcon" }}
-RCON_PORT={{ .Port }}{{ end }}
-
-RCON_PASSWORD={{ key "games/mc/esports-mc/rcon/password" }}
 EOH
         destination = "local/.env"
         env = true

jobs/socs/mps-site.hcl

@@ -46,6 +46,9 @@ job "mps-site" {
           username = "${DOCKER_USER}"
           password = "${DOCKER_PASS}"
         }
+        volumes = [
+          "local/hosts:/etc/hosts",
+        ]
       }
 
       template {
@@ -57,6 +60,23 @@ EOH
         env         = true
       }
 
+      template {
+        data        = <<EOF
+127.0.0.1	localhost
+::1	localhost ip6-localhost ip6-loopback
+fe00::0	ip6-localnet
+ff00::0	ip6-mcastprefix
+ff02::1	ip6-allnodes
+ff02::2	ip6-allrouters
+172.17.0.17	{{ env "NOMAD_TASK_NAME" }}
+# use internal IP for thecollegeview.ie as external IP isn't routable
+192.168.0.158 thecollegeview.ie
+192.168.0.158 www.thecollegeview.ie
+EOF
+        destination = "local/hosts"
+      }
+
+
       resources {
         cpu    = 300
         memory = 500

jobs/socs/mps-thecollegeview-backup.hcl

@@ -1,49 +0,0 @@
-job "mps-thecollegeview-backup" {
-  datacenters = ["aperture"]
-  type        = "batch"
-
-  periodic {
-    crons            = ["0 */3 * * * *"]
-    prohibit_overlap = true
-  }
-
-  group "db-backup" {
-    task "mysql-backup" {
-      driver = "raw_exec"
-
-      config {
-        command = "/bin/bash"
-        args    = ["local/mysql-backup.sh"]
-      }
-
-      template {
-        data        = <<EOH
-#!/bin/bash
-
-file=/storage/backups/nomad/mps-thecollegeview/mysql/tcv-mysql-$(date +%Y-%m-%d_%H-%M-%S).sql
-
-mkdir -p /storage/backups/nomad/mps-thecollegeview/mysql
-
-alloc_id=$(nomad job status mps-thecollegeview | grep running | tail -n 1 | cut -d " " -f 1)
-
-job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
-
-nomad alloc exec -task tcv-db $alloc_id mariadb-dump -u {{ key "mps/thecollegeview/db/username" }} -p'{{ key "mps/thecollegeview/db/password"}}' {{ key "mps/thecollegeview/db/name" }} > "${file}"
-
-find /storage/backups/nomad/mps-thecollegeview/mysql/tcv-mysql* -ctime +3 -exec rm {} \; || true
-
-if [ -s "$file" ]; then # check if file exists and is not empty
-  echo "Backup successful"
-  exit 0
-else
-  rm $file
-  curl -H "Content-Type: application/json" -d \
-  '{"content": "# <@&585512338728419341> `MySQL` backup for **'"${job_name}"'** has just **FAILED**\nFile name: `'"$file"'`\nDate: `'"$(TZ=Europe/Dublin date)"'`\nTurn off this script with `nomad job stop '"${job_name}"'` \n\n## Remember to restart this backup job when fixed!!!"}' \
-  {{ key "mysql/webhook/discord" }}
-fi
-EOH
-        destination = "local/mysql-backup.sh"
-      }
-    }
-  }
-}

jobs/socs/mps-thecollegeview.hcl

@@ -1,257 +0,0 @@
-job "mps-thecollegeview" {
-  datacenters = ["aperture"]
-  type        = "service"
-
-  meta {
-    domain = "thecollegeview.ie"
-  }
-
-  group "tcv" {
-    count = 1
-
-    network {
-      mode = "bridge"
-      port "http" {
-        to = 80
-      }
-      port "fpm" {
-        to = 9000
-      }
-      port "db" {
-        to = 3306
-      }
-      port "redis" {
-        to = 6379
-      }
-    }
-
-    service {
-      name = "tcv-web"
-      port = "http"
-
-      check {
-        type     = "http"
-        path     = "/"
-        interval = "10s"
-        timeout  = "5s"
-      }
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.tcv.rule=Host(`${NOMAD_META_domain}`)",
-        "traefik.http.routers.tcv.entrypoints=web,websecure",
-        "traefik.http.routers.tcv.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-
-    task "tcv-nginx" {
-      driver = "docker"
-
-      config {
-        image = "nginx:alpine"
-        ports = ["http"]
-        volumes = [
-          "local/nginx.conf:/etc/nginx/nginx.conf",
-          "/storage/nomad/mps-thecollegeview:/var/www/html/",
-        ]
-        group_add = [82] # www-data in alpine
-      }
-
-      resources {
-        cpu    = 200
-        memory = 100
-      }
-
-      template {
-        data        = <<EOH
-# user www-data www-data;
-error_log /dev/stderr error;
-events {
-    worker_connections 1024;
-}
-http {
-    include /etc/nginx/mime.types;
-    server_tokens off;
-    error_log /dev/stderr error;
-    access_log /dev/stdout;
-    charset utf-8;
-
-    server {
-      server_name {{ env "NOMAD_META_domain" }};
-      listen 80;
-      listen [::]:80;
-      root /var/www/html;
-      index index.php index.html index.htm;
-
-      client_max_body_size 5m;
-      client_body_timeout 60;
-
-      # NOTE: Not used here, WP super cache rule used instead
-      # # Pass all folders to FPM
-      # location / {
-      #   try_files $uri $uri/ /index.php?$args;
-      # }
-
-      # Pass the PHP scripts to FastCGI server
-      location ~ \.php$ {
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_pass {{ env "NOMAD_ADDR_fpm" }};
-        fastcgi_index index.php;
-      }
-
-      location ~ /\.ht {
-        deny all;
-      }
-
-      # WP Super Cache rules.
-
-      set $cache_uri $request_uri;
-
-      # POST requests and urls with a query string should always go to PHP
-      if ($request_method = POST) {
-          set $cache_uri 'null cache';
-      }
-
-      if ($query_string != "") {
-          set $cache_uri 'null cache';
-      }
-
-      # Don't cache uris containing the following segments
-      if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php|wp-.*.php|/feed/|index.php|wp-comments-popup.php|wp-links-opml.php|wp-locations.php|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
-          set $cache_uri 'null cache';
-      }
-
-      # Don't use the cache for logged in users or recent commenters
-      if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in") {
-          set $cache_uri 'null cache';
-      }
-
-      # Use cached or actual file if they exists, otherwise pass request to WordPress
-      location / {
-          try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args ;
-      }
-    }
-}
-EOH
-        destination = "local/nginx.conf"
-      }
-    }
-
-    task "tcv-phpfpm" {
-      driver = "docker"
-
-      config {
-        image = "wordpress:php8.3-fpm-alpine"
-        ports = ["fpm"]
-
-        volumes = [
-          "/storage/nomad/mps-thecollegeview:/var/www/html/",
-          "local/custom.ini:/usr/local/etc/php/conf.d/custom.ini",
-        ]
-      }
-
-      resources {
-        cpu    = 800
-        memory = 500
-      }
-
-      template {
-        data        = <<EOH
-WORDPRESS_DB_HOST={{ env "NOMAD_ADDR_db" }}
-WORDPRESS_DB_USER={{ key "mps/thecollegeview/db/username" }}
-WORDPRESS_DB_PASSWORD={{  key "mps/thecollegeview/db/password" }}
-WORDPRESS_DB_NAME={{ key "mps/thecollegeview/db/name" }}
-WORDPRESS_TABLE_PREFIX=wp_2
-WORDPRESS_CONFIG_EXTRA="define('WP_REDIS_HOST', '{{ env "NOMAD_ADDR_redis" }}');"
-EOH
-        destination = "local/.env"
-        env         = true
-      }
-
-      template {
-        data        = <<EOH
-pm.max_children = 10
-upload_max_filesize = 64M
-post_max_size = 64M
-EOH
-        destination = "local/custom.ini"
-      }
-    }
-
-    service {
-      name = "tcv-db"
-      port = "db"
-    }
-
-    task "tcv-db" {
-      driver = "docker"
-
-      config {
-        image = "mariadb"
-        ports = ["db"]
-
-        volumes = [
-          "/storage/nomad/mps-thecollegeview/db:/var/lib/mysql",
-        ]
-      }
-
-      template {
-        data = <<EOH
-[mysqld]
-max_connections = 100
-key_buffer_size = 2G
-query_cache_size = 0
-innodb_buffer_pool_size = 6G
-innodb_log_file_size = 512M
-innodb_flush_log_at_trx_commit = 1
-innodb_flush_method = O_DIRECT
-innodb_io_capacity = 200
-tmp_table_size = 5242K
-max_heap_table_size = 5242K
-innodb_log_buffer_size = 16M
-innodb_file_per_table = 1
-
-bind-address = 0.0.0.0
-# Logging
-slow_query_log = 1
-slow_query_log_file = /var/log/mysql/slow.log
-long_query_time = 1
-EOH
-
-        destination = "local/conf.cnf"
-      }
-
-      resources {
-        cpu    = 800
-        memory = 800
-      }
-
-      template {
-        data = <<EOH
-MYSQL_DATABASE={{ key "mps/thecollegeview/db/name" }}
-MYSQL_USER={{ key "mps/thecollegeview/db/username" }}
-MYSQL_PASSWORD={{ key "mps/thecollegeview/db/password" }}
-MYSQL_RANDOM_ROOT_PASSWORD=yes
-EOH
-
-        destination = "local/.env"
-        env         = true
-      }
-    }
-
-    task "redis" {
-      driver = "docker"
-
-      config {
-        image = "redis:latest"
-        ports = ["redis"]
-      }
-
-      resources {
-        cpu = 200
-      }
-    }
-  }
-}

jobs/socs/style-thelook-backup.hcl

@@ -1,49 +0,0 @@
-job "style-thelook-backup" {
-  datacenters = ["aperture"]
-  type        = "batch"
-
-  periodic {
-    crons            = ["0 */3 * * * *"]
-    prohibit_overlap = true
-  }
-
-  group "db-backup" {
-    task "mysql-backup" {
-      driver = "raw_exec"
-
-      config {
-        command = "/bin/bash"
-        args    = ["local/mysql-backup.sh"]
-      }
-
-      template {
-        data        = <<EOH
-#!/bin/bash
-
-file=/storage/backups/nomad/style-thelook/mysql/thelook-mysql-$(date +%Y-%m-%d_%H-%M-%S).sql
-
-mkdir -p /storage/backups/nomad/style-thelook/mysql
-
-alloc_id=$(nomad job status style-thelook | grep running | tail -n 1 | cut -d " " -f 1)
-
-job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
-
-nomad alloc exec -task thelook-db $alloc_id mariadb-dump -u {{ key "style/thelook/db/username" }} -p'{{ key "style/thelook/db/password"}}' {{ key "style/thelook/db/name" }} > "${file}"
-
-find /storage/backups/nomad/style-thelook/mysql/thelook-mysql* -ctime +3 -exec rm {} \; || true
-
-if [ -s "$file" ]; then # check if file exists and is not empty
-  echo "Backup successful"
-  exit 0
-else
-  rm $file
-  curl -H "Content-Type: application/json" -d \
-  '{"content": "# <@&585512338728419341> `MySQL` backup for **'"${job_name}"'** has just **FAILED**\nFile name: `'"$file"'`\nDate: `'"$(TZ=Europe/Dublin date)"'`\nTurn off this script with `nomad job stop '"${job_name}"'` \n\n## Remember to restart this backup job when fixed!!!"}' \
-  {{ key "mysql/webhook/discord" }}
-fi
-EOH
-        destination = "local/mysql-backup.sh"
-      }
-    }
-  }
-}

jobs/socs/style-thelook.hcl

@@ -1,257 +0,0 @@
-job "style-thelook" {
-  datacenters = ["aperture"]
-  type        = "service"
-
-  meta {
-    domain = "thelookonline.dcu.ie"
-  }
-
-  group "thelook" {
-    count = 1
-
-    network {
-      mode = "bridge"
-      port "http" {
-        to = 80
-      }
-      port "fpm" {
-        to = 9000
-      }
-      port "db" {
-        to = 3306
-      }
-      port "redis" {
-        to = 6379
-      }
-    }
-
-    service {
-      name = "thelook-web"
-      port = "http"
-
-      check {
-        type     = "http"
-        path     = "/"
-        interval = "10s"
-        timeout  = "5s"
-      }
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.thelook.rule=Host(`${NOMAD_META_domain}`) || Host(`style.redbrick.dcu.ie`)",
-        "traefik.http.routers.thelook.entrypoints=web,websecure",
-        "traefik.http.routers.thelook.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-
-    task "thelook-nginx" {
-      driver = "docker"
-
-      config {
-        image = "nginx:alpine"
-        ports = ["http"]
-        volumes = [
-          "local/nginx.conf:/etc/nginx/nginx.conf",
-          "/storage/nomad/style-thelook:/var/www/html/",
-        ]
-        group_add = [82] # www-data in alpine
-      }
-
-      resources {
-        cpu    = 200
-        memory = 100
-      }
-
-      template {
-        data        = <<EOH
-# user www-data www-data;
-error_log /dev/stderr error;
-events {
-    worker_connections 1024;
-}
-http {
-    include /etc/nginx/mime.types;
-    server_tokens off;
-    error_log /dev/stderr error;
-    access_log /dev/stdout;
-    charset utf-8;
-
-    server {
-      server_name {{ env "NOMAD_META_domain" }};
-      listen 80;
-      listen [::]:80;
-      root /var/www/html;
-      index index.php index.html index.htm;
-
-      client_max_body_size 5m;
-      client_body_timeout 60;
-
-      # NOTE: Not used here, WP super cache rule used instead
-      # Pass all folders to FPM
-      # location / {
-      #   try_files $uri $uri/ /index.php?$args;
-      # }
-
-      # Pass the PHP scripts to FastCGI server
-      location ~ \.php$ {
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_pass {{ env "NOMAD_ADDR_fpm" }};
-        fastcgi_index index.php;
-      }
-
-      location ~ /\.ht {
-        deny all;
-      }
-
-      # WP Super Cache rules.
-
-      set $cache_uri $request_uri;
-
-      # POST requests and urls with a query string should always go to PHP
-      if ($request_method = POST) {
-          set $cache_uri 'null cache';
-      }
-
-      if ($query_string != "") {
-          set $cache_uri 'null cache';
-      }
-
-      # Don't cache uris containing the following segments
-      if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php|wp-.*.php|/feed/|index.php|wp-comments-popup.php|wp-links-opml.php|wp-locations.php|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
-          set $cache_uri 'null cache';
-      }
-
-      # Don't use the cache for logged in users or recent commenters
-      if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in") {
-          set $cache_uri 'null cache';
-      }
-
-      # Use cached or actual file if they exists, otherwise pass request to WordPress
-      location / {
-          try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args ;
-      }
-    }
-}
-EOH
-        destination = "local/nginx.conf"
-      }
-    }
-
-    task "thelook-phpfpm" {
-      driver = "docker"
-
-      config {
-        image = "wordpress:php8.3-fpm-alpine"
-        ports = ["fpm"]
-
-        volumes = [
-          "/storage/nomad/style-thelook:/var/www/html/",
-          "local/custom.ini:/usr/local/etc/php/conf.d/custom.ini",
-        ]
-      }
-
-      resources {
-        cpu    = 800
-        memory = 500
-      }
-
-      template {
-        data        = <<EOH
-WORDPRESS_DB_HOST={{ env "NOMAD_ADDR_db" }}
-WORDPRESS_DB_USER={{ key "style/thelook/db/username" }}
-WORDPRESS_DB_PASSWORD={{  key "style/thelook/db/password" }}
-WORDPRESS_DB_NAME={{ key "style/thelook/db/name" }}
-WORDPRESS_TABLE_PREFIX=wp_
-WORDPRESS_CONFIG_EXTRA="define('WP_REDIS_HOST', '{{ env "NOMAD_ADDR_redis" }}');"
-EOH
-        destination = "local/.env"
-        env         = true
-      }
-
-      template {
-        data        = <<EOH
-pm.max_children = 10
-upload_max_filesize = 64M
-post_max_size = 64M
-EOH
-        destination = "local/custom.ini"
-      }
-    }
-
-    service {
-      name = "thelook-db"
-      port = "db"
-    }
-
-    task "thelook-db" {
-      driver = "docker"
-
-      config {
-        image = "mariadb"
-        ports = ["db"]
-
-        volumes = [
-          "/storage/nomad/style-thelook/db:/var/lib/mysql",
-        ]
-      }
-
-      template {
-        data = <<EOH
-[mysqld]
-max_connections = 100
-key_buffer_size = 2G
-query_cache_size = 0
-innodb_buffer_pool_size = 6G
-innodb_log_file_size = 512M
-innodb_flush_log_at_trx_commit = 1
-innodb_flush_method = O_DIRECT
-innodb_io_capacity = 200
-tmp_table_size = 5242K
-max_heap_table_size = 5242K
-innodb_log_buffer_size = 16M
-innodb_file_per_table = 1
-
-bind-address = 0.0.0.0
-# Logging
-slow_query_log = 1
-slow_query_log_file = /var/log/mysql/slow.log
-long_query_time = 1
-EOH
-
-        destination = "local/conf.cnf"
-      }
-
-      resources {
-        cpu    = 800
-        memory = 800
-      }
-
-      template {
-        data = <<EOH
-MYSQL_DATABASE={{ key "style/thelook/db/name" }}
-MYSQL_USER={{ key "style/thelook/db/username" }}
-MYSQL_PASSWORD={{ key "style/thelook/db/password" }}
-MYSQL_RANDOM_ROOT_PASSWORD=yes
-EOH
-
-        destination = "local/.env"
-        env         = true
-      }
-    }
-
-    task "redis" {
-      driver = "docker"
-
-      config {
-        image = "redis:latest"
-        ports = ["redis"]
-      }
-
-      resources {
-        cpu = 200
-      }
-    }
-  }
-}

jobs/user-projects/general/urri-meetups-update.hcl

@@ -1,36 +0,0 @@
-job "urri-meetups-update" {
-  datacenters = ["aperture"]
-  type        = "batch"
-
-  periodic {
-    crons            = ["0 */6 * * * *"]
-    prohibit_overlap = true
-  }
-
-  group "urri-meetups-update" {
-
-    task "urri-meetups-update" {
-      driver = "raw_exec"
-
-      config {
-        command = "/bin/bash"
-        args    = ["local/script.sh"]
-      }
-
-      template {
-        data        = <<EOH
-#!/bin/bash
-
-# stop the urri-meetups job
-nomad job stop urri-meetups
-sleep 1
-# revert the urri-meetups job to the previous version
-# this will trigger a new deployment, which will pull the latest image
-nomad job revert urri-meetups $(($(nomad job inspect urri-meetups | jq '.Job.Version')-1))
-EOH
-        destination = "local/script.sh"
-      }
-    }
-  }
-}
-

jobs/user-projects/general/urri-meetups.hcl

@@ -1,47 +0,0 @@
-job "urri-meetups" {
-  datacenters = ["aperture"]
-  type        = "service"
-
-  group "urri-meetups" {
-    count = 1
-
-    network {
-      port "http" {
-        to = 8000
-      }
-    }
-
-    service {
-      port = "http"
-
-      check {
-        type     = "http"
-        path     = "/"
-        interval = "10s"
-        timeout  = "2s"
-      }
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.urri-meetups.rule=Host(`urri-meetups.rb.dcu.ie`)",
-        "traefik.http.routers.urri-meetups.entrypoints=web,websecure",
-        "traefik.http.routers.urri-meetups.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-    task "web" {
-      driver = "docker"
-
-      config {
-        image      = "ghcr.io/haefae222/pizza_app:latest"
-        ports      = ["http"]
-        force_pull = true
-      }
-
-      resources {
-        cpu    = 1000
-        memory = 800
-      }
-    }
-  }
-}

jobs/user-projects/general/wizzdom-clubsandsocs.hcl

@@ -1,61 +0,0 @@
-job "cands-room-bookings" {
-  datacenters = ["aperture"]
-  type        = "service"
-
-  meta {
-    git-sha = ""
-  }
-
-  group "clubsandsocs-room-bookings" {
-    count = 1
-
-    network {
-      port "http" {
-        to = 5000
-      }
-    }
-
-    service {
-      port = "http"
-
-      check {
-        type     = "http"
-        path     = "/"
-        interval = "10s"
-        timeout  = "2s"
-      }
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.clubsandsocs-room-bookings.rule=Host(`rooms.rb.dcu.ie`)",
-        "traefik.http.routers.clubsandsocs-room-bookings.entrypoints=web,websecure",
-        "traefik.http.routers.clubsandsocs-room-bookings.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-    task "web" {
-      driver = "docker"
-
-      config {
-        image      = "ghcr.io/wizzdom/clubsandsocs-room-bookings:latest"
-        ports      = ["http"]
-        force_pull = true
-        volumes = [
-          "local/.env:/app/.env"
-        ]
-      }
-
-      template {
-        data        = <<EOF
-UPLOAD_FOLDER=uploads
-SECRET_KEY={{ key "user-projects/wizzdom/clubsandsocs-room-bookings/secret" }}
-EOF
-        destination = "local/.env"
-      }
-      resources {
-        cpu    = 1000
-        memory = 800
-      }
-    }
-  }
-}

jobs/user-vms/bastion-vm-backup.hcl

@@ -38,7 +38,7 @@ alloc_id=$(nomad job status -verbose bastion-vm | grep running | tail -n 1 | cut
 job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
 
 echo "Backing up alloc id: ${alloc_id} on: ${host} to ${path}/${file}..."
-ssh -i {{ key "bastion-vm/service/key" }} {{ key "bastion-vm/service/user" }}@${host} "sudo cat /opt/nomad/alloc/${alloc_id}/bastion-vm/local/bastion-vm.qcow2" > ${path}/${file}
+scp -B -i {{ key "bastion-vm/service/key" }} {{ key "bastion-vm/service/user" }}@${host}:/opt/nomad/alloc/${alloc_id}/bastion-vm/local/bastion-vm.qcow2 ${path}/${file}
 
 find ${path}/bastion-vm-* -ctime +2 -exec rm {} \; || true