Rename postgres -> db for consistency, fix missing keys
This commit is contained in:
parent
ce6ac5d88b
commit
d1f5b0853b
1 changed files with 12 additions and 12 deletions
|
@ -10,7 +10,7 @@ job "nova-timetable" {
|
||||||
to = 6379
|
to = 6379
|
||||||
}
|
}
|
||||||
|
|
||||||
port "postgres" {
|
port "db" {
|
||||||
to = 5432
|
to = 5432
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,12 +94,12 @@ job "nova-timetable" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task "postgres" {
|
task "timetable-db" {
|
||||||
driver = "docker"
|
driver = "docker"
|
||||||
|
|
||||||
config {
|
config {
|
||||||
image = "postgres:17.0-alpine"
|
image = "postgres:17.0-alpine"
|
||||||
ports = ["postgres"]
|
ports = ["db"]
|
||||||
|
|
||||||
volumes = [
|
volumes = [
|
||||||
"/opt/postgres/nova-timetable:/var/lib/postgresql/data"
|
"/opt/postgres/nova-timetable:/var/lib/postgresql/data"
|
||||||
|
@ -108,16 +108,16 @@ job "nova-timetable" {
|
||||||
|
|
||||||
template {
|
template {
|
||||||
data = <<EOH
|
data = <<EOH
|
||||||
POSTGRES_USER={{ key "user-projects/nova/postgres/user" }}
|
POSTGRES_USER={{ key "user-projects/nova/db/user" }}
|
||||||
POSTGRES_PASSWORD={{ key "user-projects/nova/postgres/password" }}
|
POSTGRES_PASSWORD={{ key "user-projects/nova/db/password" }}
|
||||||
POSTGRES_DB={{ key "user-projects/nova/postgres/db" }}
|
POSTGRES_DB={{ key "user-projects/nova/db/db" }}
|
||||||
EOH
|
EOH
|
||||||
destination = "local/db.env"
|
destination = "local/db.env"
|
||||||
env = true
|
env = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task "bot" {
|
task "timetable-bot" {
|
||||||
driver = "docker"
|
driver = "docker"
|
||||||
|
|
||||||
config {
|
config {
|
||||||
|
@ -128,11 +128,11 @@ EOH
|
||||||
data = <<EOH
|
data = <<EOH
|
||||||
BOT_TOKEN={{ key "user-projects/nova/bot/token" }}
|
BOT_TOKEN={{ key "user-projects/nova/bot/token" }}
|
||||||
REDIS_ADDRESS={{ env "NOMAD_ADDR_redis" }}
|
REDIS_ADDRESS={{ env "NOMAD_ADDR_redis" }}
|
||||||
POSTGRES_USER={{ "user-projects/nova/postgres/user" }}
|
POSTGRES_USER={{ key "user-projects/nova/db/user" }}
|
||||||
POSTGRES_PASSWORD={{ key "user-projects/nova/postgres/password" }}
|
POSTGRES_PASSWORD={{ key "user-projects/nova/db/password" }}
|
||||||
POSTGRES_DB={{ "user-projects/nova/postgres/db" }}
|
POSTGRES_DB={{ key "user-projects/nova/db/db" }}
|
||||||
POSTGRES_HOST={{ env "NOMAD_IP_postgres" }}
|
POSTGRES_HOST={{ env "NOMAD_IP_db" }}
|
||||||
POSTGRES_PORT={{ env "NOMAD_PORT_postgres" }}
|
POSTGRES_PORT={{ env "NOMAD_PORT_db" }}
|
||||||
EOH
|
EOH
|
||||||
destination = "local/.env"
|
destination = "local/.env"
|
||||||
env = true
|
env = true
|
||||||
|
|
Loading…
Reference in a new issue