From 083faa2209d3cb5c8d5133fe4bf13793341111de Mon Sep 17 00:00:00 2001
From: nova <110734810+novanai@users.noreply.github.com>
Date: Sun, 29 Sep 2024 18:35:33 +0100
Subject: [PATCH] Add database to nova-timetable job (#62)

---
 jobs/user-projects/general/nova-timetable.hcl | 46 ++++++++++++++++---
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/jobs/user-projects/general/nova-timetable.hcl b/jobs/user-projects/general/nova-timetable.hcl
index c9cb555..82cf2b7 100644
--- a/jobs/user-projects/general/nova-timetable.hcl
+++ b/jobs/user-projects/general/nova-timetable.hcl
@@ -6,10 +6,14 @@ job "nova-timetable" {
     count = 1
 
     network {
-      port "db" {
+      port "redis" {
         to = 6379
       }
 
+      port "db" {
+        to = 5432
+      }
+
       port "frontend" {
         to = 3000
       }
@@ -52,7 +56,7 @@ job "nova-timetable" {
       driver = "docker"
 
       env {
-        REDIS_ADDRESS = "${NOMAD_ADDR_db}"
+        REDIS_ADDRESS = "${NOMAD_ADDR_redis}"
       }
 
       config {
@@ -81,16 +85,39 @@ job "nova-timetable" {
       }
     }
 
-    task "redis-db" {
+    task "redis" {
       driver = "docker"
 
       config {
         image = "redis:latest"
-        ports = ["db"]
+        ports = ["redis"]
       }
     }
 
-    task "timetablebot" {
+    task "timetable-db" {
+      driver = "docker"
+
+      config {
+        image = "postgres:17.0-alpine"
+        ports = ["db"]
+
+        volumes = [
+          "/opt/postgres/nova-timetable:/var/lib/postgresql/data"
+        ]
+      }
+
+      template {
+        data        = <<EOH
+POSTGRES_USER={{ key "user-projects/nova/db/user" }}
+POSTGRES_PASSWORD={{ key "user-projects/nova/db/password" }}
+POSTGRES_DB={{ key "user-projects/nova/db/db" }}
+EOH
+        destination = "local/db.env"
+        env         = true
+      }
+    }
+
+    task "timetable-bot" {
       driver = "docker"
 
       config {
@@ -99,8 +126,13 @@ job "nova-timetable" {
 
       template {
         data        = <<EOH
-BOT_TOKEN={{ key "user-projects/nova/timetablebot/token" }}
-REDIS_ADDRESS={{ env "NOMAD_ADDR_db" }}
+BOT_TOKEN={{ key "user-projects/nova/bot/token" }}
+REDIS_ADDRESS={{ env "NOMAD_ADDR_redis" }}
+POSTGRES_USER={{ key "user-projects/nova/db/user" }}
+POSTGRES_PASSWORD={{ key "user-projects/nova/db/password" }}
+POSTGRES_DB={{ key "user-projects/nova/db/db" }}
+POSTGRES_HOST={{ env "NOMAD_IP_db" }}
+POSTGRES_PORT={{ env "NOMAD_PORT_db" }}
 EOH
         destination = "local/.env"
         env         = true