From 0fb1932c556070acd425d8740d1dc1bc0978a555 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Fri, 14 Mar 2025 20:59:28 +0100
Subject: [PATCH] Upgrade + pin NodeBB version and increase number of workers
 and rename stuff

---
 roles/docker/defaults/main.yml                           | 8 ++++----
 roles/docker/templates/fedi_dk_nodebb/config.json.j2     | 4 ++--
 roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index ff477b6..25de169 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -225,13 +225,13 @@ services:
     domain: forum.fedi.dk
     volume_folder: "{{ volume_root_folder }}/fedidk-nodebb"
     pre_deploy_tasks: true
-    version: "4.0.4"
+    version: "4.1.1"
     nginx_version: 1.27.4-alpine
     redis_version: 7.4.2-alpine
-    mongodb_version: 7-jammy
+    mongodb_version: 7.0.17-jammy
     allowed_sender_domain: true
-    nodebb_port_begin: 4567
-    nodebb_processes: 8
+    port_begin: 4567
+    workers: 16
 
   ### Uptime monitoring ###
   uptime_kuma:
diff --git a/roles/docker/templates/fedi_dk_nodebb/config.json.j2 b/roles/docker/templates/fedi_dk_nodebb/config.json.j2
index f49119f..e20137c 100644
--- a/roles/docker/templates/fedi_dk_nodebb/config.json.j2
+++ b/roles/docker/templates/fedi_dk_nodebb/config.json.j2
@@ -2,8 +2,8 @@
     "url": "https://{{ services.fedi_dk_nodebb.domain }}",
     "secret": "{{ fedi_dk_nodebb_secrets.secret_value }}",
     "database": "mongo",
-    "port": [{% for port in range(services.fedi_dk_nodebb.nodebb_port_begin,
-                                  services.fedi_dk_nodebb.nodebb_port_begin + services.fedi_dk_nodebb.nodebb_processes)
+    "port": [{% for port in range(services.fedi_dk_nodebb.port_begin,
+                                  services.fedi_dk_nodebb.port_begin + services.fedi_dk_nodebb.workers)
     %}"{{ port }}"{% if not loop.last %}, {% endif %}{% endfor %}],
     "mongo": {
         "host": "mongodb",
diff --git a/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2 b/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2
index 4bf4270..36095ac 100644
--- a/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2
+++ b/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2
@@ -11,8 +11,8 @@ map $http_upgrade $connection_upgrade {
 
 upstream workers {
     ip_hash;
-{% for port in range(services.fedi_dk_nodebb.nodebb_port_begin,
-                     services.fedi_dk_nodebb.nodebb_port_begin + services.fedi_dk_nodebb.nodebb_processes) %}
+{% for port in range(services.fedi_dk_nodebb.port_begin,
+                     services.fedi_dk_nodebb.port_begin + services.fedi_dk_nodebb.workers) %}
     server app.nodebb:{{ port }};
 {% endfor %}
 }