From c773c8060f679965c65943063ebcab778dac40c2 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sat, 15 Feb 2025 17:13:03 +0100
Subject: [PATCH] Lint and more

---
 roles/docker/defaults/main.yml                | 12 +++--
 .../templates/compose-files/nodebb.yml.j2     | 54 +++++--------------
 roles/docker/templates/nodebb/setup.json.j2   | 12 -----
 3 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 8a12d09..7202e9d 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -219,6 +219,13 @@ services:
     matrix_user: "@diun:data.coop"
     matrix_room: "#datacoop-services-update:data.coop"
 
+  nodebb:
+    domain: "forum.{{ base_domain }}"
+    version: 4.x
+    mongodb_version: 7-jammy
+    pre_deploy_tasks: true
+    volume_folder: "{{ volume_root_folder }}/nodebb"
+
   ### Uptime monitoring ###
   uptime_kuma:
     domain: "uptime.{{ base_domain }}"
@@ -226,11 +233,6 @@ services:
     volume_folder: "{{ volume_root_folder }}/uptime_kuma"
     pre_deploy_tasks: true
     version: "latest"
-  nodebb:
-    domain: "forum.{{ base_domain }}"
-    version: "4.x"
-    pre_deploy_tasks: true
-    volume_folder: "{{ volume_root_folder }}/nodebb"
 
 services_exclude: []
 services_include: "{{ services | dict2items | map(attribute='key') | list | difference(services_exclude) }}"
diff --git a/roles/docker/templates/compose-files/nodebb.yml.j2 b/roles/docker/templates/compose-files/nodebb.yml.j2
index 2c3b66a..7a6521e 100644
--- a/roles/docker/templates/compose-files/nodebb.yml.j2
+++ b/roles/docker/templates/compose-files/nodebb.yml.j2
@@ -1,48 +1,22 @@
 services:
-  nodebb:
-    image: ghcr.io/nodebb/nodebb:{{ services.nodebb.version }}
-    restart: unless-stopped
-    ports:
-      # - '4567:4567' # comment this out if you don't want to expose NodeBB to the host, or change the first number to any port you want
+  mongodb:
+    image: mongo:{{ services.nodebb.monogdb_version }}
+    restart: always
     volumes:
-      - ./nodebb-build:/usr/src/app/build
-      - ./nodebb-uploads:/usr/src/app/public/uploads
-      - ./nodebb-config:/opt/config
-      - ./setup.json:/usr/src/app/setup.json
-      environment:
-        VIRTUAL_HOST: "{{ services.nodebb.domain }}"
-        VIRTUAL_PORT: 4567
-
-  mongo:
-    image: 'mongo:7-jammy'
-    restart: unless-stopped
-    ports:
-      - '27017:27017'
+      - ./mongodb:/data/db
+      - ./mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
     environment:
       MONGO_INITDB_ROOT_USERNAME: nodebb
       MONGO_INITDB_ROOT_PASSWORD: nodebb
       MONGO_INITDB_DATABASE: nodebb
-    volumes:
-      - ./mongo-data:/data/db
-      - ./mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
-  redis:
-    image: redis:7.4.2-alpine
-    restart: unless-stopped
-    command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
-    # command: ['redis-server', '--save', '60', '1', '--loglevel', 'warning'] # uncomment if you want to use snapshotting instead of AOF
-    volumes:
-      - ./redis-data:/data
-    profiles:
-      - redis
 
-  postgres:
-    image: postgres:17.2-alpine
-    restart: unless-stopped
-    environment:
-      POSTGRES_USER: nodebb
-      POSTGRES_PASSWORD: nodebb
-      POSTGRES_DB: nodebb
+  app:
+    image: ghcr.io/nodebb/nodebb:{{ services.nodebb.version }}
+    restart: always
     volumes:
-      - ./postgres-data:/var/lib/postgresql/data
-    profiles:
-      - postgres
+      - ./nodebb-uploads:/usr/src/app/public/uploads
+      - ./nodebb-config:/opt/config
+      - ./setup.json:/usr/src/app/setup.json
+    environment:
+        VIRTUAL_HOST: "{{ services.nodebb.domain }}"
+        VIRTUAL_PORT: 4567
diff --git a/roles/docker/templates/nodebb/setup.json.j2 b/roles/docker/templates/nodebb/setup.json.j2
index a9fa901..163cc16 100644
--- a/roles/docker/templates/nodebb/setup.json.j2
+++ b/roles/docker/templates/nodebb/setup.json.j2
@@ -7,17 +7,5 @@
             "username": "nodebb",
             "password": "nodebb"
         },
-        "redis": {
-            "host": "redis",
-            "port": 6379,
-            "database": 0
-        },
-        "postgres": {
-            "host": "postgres",
-            "port": 5432,
-            "database": "nodebb",
-            "username": "nodebb",
-            "password": "nodebb"
-        }
     }
 }
\ No newline at end of file