aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cluster/prod/app/plume/config/app.env2
-rw-r--r--cluster/prod/app/plume/deploy/plume.hcl58
-rw-r--r--cluster/prod/app/telemetry/deploy/telemetry-service.hcl6
-rw-r--r--cluster/prod/app/woodpecker-ci/deploy/server.hcl2
-rw-r--r--cluster/prod/app/woodpecker-ci/integration/docker-compose.yml2
-rw-r--r--cluster/prod/cluster.nix3
-rw-r--r--cluster/staging/app/telemetry/deploy/telemetry-service.hcl2
-rw-r--r--cluster/staging/cluster.nix3
8 files changed, 60 insertions, 18 deletions
diff --git a/cluster/prod/app/plume/config/app.env b/cluster/prod/app/plume/config/app.env
index b663d81..36000c2 100644
--- a/cluster/prod/app/plume/config/app.env
+++ b/cluster/prod/app/plume/config/app.env
@@ -28,7 +28,7 @@ MIGRATION_DIRECTORY=migrations/postgres
USE_HTTPS=0
ROCKET_ADDRESS=::
-ROCKET_PORT={{ env "NOMAD_PORT_web_port" }}
+ROCKET_PORT={{ env "NOMAD_PORT_back_port" }}
MEDIA_UPLOAD_DIRECTORY=/app/static/media
SEARCH_INDEX=/app/search_index
diff --git a/cluster/prod/app/plume/deploy/plume.hcl b/cluster/prod/app/plume/deploy/plume.hcl
index d9e276e..c759a02 100644
--- a/cluster/prod/app/plume/deploy/plume.hcl
+++ b/cluster/prod/app/plume/deploy/plume.hcl
@@ -6,7 +6,45 @@ job "plume-blog" {
count = 1
network {
- port "web_port" { }
+ port "back_port" { }
+ port "cache_port" { }
+ }
+
+ task "varnish" {
+ driver = "docker"
+ config {
+ image = "varnish:7.6.1"
+ network_mode = "host"
+ ports = [ "cache_port" ]
+
+ # cache
+ mount {
+ type = "tmpfs"
+ target = "/var/lib/varnish/varnishd:exec"
+ readonly = false
+ tmpfs_options {
+ size = 2684354559 # 2.5GB in bytes
+ }
+ }
+ }
+
+ env {
+ VARNISH_SIZE = "2G"
+ VARNISH_BACKEND_HOST = "localhost"
+ VARNISH_BACKEND_PORT = "${NOMAD_PORT_back_port}"
+ VARNISH_HTTP_PORT = "${NOMAD_PORT_cache_port}"
+ }
+
+ service {
+ name = "plume-cache"
+ tags = [
+ "plume",
+ "tricot plume.deuxfleurs.fr",
+ "d53-cname plume.deuxfleurs.fr",
+ ]
+ port = "cache_port"
+ address_mode = "host"
+ }
}
task "plume" {
@@ -14,9 +52,9 @@ job "plume-blog" {
config {
image = "lxpz/plume_s3:v1"
network_mode = "host"
- ports = [ "web_port" ]
+ ports = [ "back_port" ]
command = "sh"
- args = [ "-c", "plm search init; plm search refill; plume" ]
+ args = [ "-c", "plm search init; plume" ]
}
template {
@@ -26,24 +64,22 @@ job "plume-blog" {
}
resources {
- memory = 1024
- memory_max = 1024
+ memory = 512
+ memory_max = 512
cpu = 100
}
service {
- name = "plume"
+ name = "plume-back"
tags = [
"plume",
- "tricot plume.deuxfleurs.fr",
- "d53-cname plume.deuxfleurs.fr",
]
- port = "web_port"
+ port = "back_port"
address_mode = "host"
check {
type = "http"
protocol = "http"
- port = "web_port"
+ port = "back_port"
path = "/"
interval = "60s"
timeout = "5s"
@@ -55,7 +91,7 @@ job "plume-blog" {
}
}
restart {
- interval = "30m"
+ interval = "20m"
attempts = 20
delay = "15s"
mode = "delay"
diff --git a/cluster/prod/app/telemetry/deploy/telemetry-service.hcl b/cluster/prod/app/telemetry/deploy/telemetry-service.hcl
index 8b120e6..0744abc 100644
--- a/cluster/prod/app/telemetry/deploy/telemetry-service.hcl
+++ b/cluster/prod/app/telemetry/deploy/telemetry-service.hcl
@@ -45,7 +45,7 @@ job "telemetry-service" {
task "grafana" {
driver = "docker"
config {
- image = "grafana/grafana:11.4.0"
+ image = "grafana/grafana:11.4.1"
network_mode = "host"
ports = [ "grafana" ]
volumes = [
@@ -76,9 +76,9 @@ EOH
}
resources {
- memory = 100
+ memory = 200
memory_max = 400
- cpu = 500
+ cpu = 300
}
service {
diff --git a/cluster/prod/app/woodpecker-ci/deploy/server.hcl b/cluster/prod/app/woodpecker-ci/deploy/server.hcl
index e0788de..60806b9 100644
--- a/cluster/prod/app/woodpecker-ci/deploy/server.hcl
+++ b/cluster/prod/app/woodpecker-ci/deploy/server.hcl
@@ -23,7 +23,7 @@ job "woodpecker-ci" {
task "server" {
driver = "docker"
config {
- image = "woodpeckerci/woodpecker-server:v2.7.1"
+ image = "woodpeckerci/woodpecker-server:v3.0.1"
ports = [ "web_port", "grpc_port" ]
network_mode = "host"
}
diff --git a/cluster/prod/app/woodpecker-ci/integration/docker-compose.yml b/cluster/prod/app/woodpecker-ci/integration/docker-compose.yml
index 7b825df..5756b25 100644
--- a/cluster/prod/app/woodpecker-ci/integration/docker-compose.yml
+++ b/cluster/prod/app/woodpecker-ci/integration/docker-compose.yml
@@ -10,7 +10,7 @@ services:
- "./nix.conf:/etc/nix/nix.conf:ro"
woodpecker-runner:
- image: woodpeckerci/woodpecker-agent:v2.4.1
+ image: woodpeckerci/woodpecker-agent:v3.0.1
restart: always
environment:
# -- change these for each agent
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index 080b258..66da48d 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -133,6 +133,9 @@
kokakiwi = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFPTsEgcOtb2bij+Ih8eg8ZqO7d3IMiWykv6deMzlSSS kokakiwi@kira"
];
+ stitch = [
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdT28Emp9yJqTPrxz+oDP08KZaN1kbsNyVqt9p9IMED"
+ ];
};
# For Garage external communication
diff --git a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
index 4bc9f8a..5fcaa7a 100644
--- a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
+++ b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
@@ -45,7 +45,7 @@ job "telemetry-service" {
task "grafana" {
driver = "docker"
config {
- image = "grafana/grafana:11.4.0"
+ image = "grafana/grafana:11.4.1"
network_mode = "host"
ports = [ "grafana" ]
volumes = [
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index 26011d2..8a71424 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -90,6 +90,9 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJX0A2P59or83EKhh32o8XumGz0ToTEsoq89hMbMtr7h"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB540H9kn+Ocs4Wjc1Y3f3OkHFYEqc5IM/FiCyoVVoh3"
];
+ stitch = [
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdT28Emp9yJqTPrxz+oDP08KZaN1kbsNyVqt9p9IMED"
+ ];
};
# For Garage ipv6 communication
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-05 15:09:57 +0000