changelog

CHANGELOG.md

@@ -1,15 +1,18 @@
 # Changelog
 
-## Unreleased 2024-05-05
+## v 1.3.5
 
-### Adjust config
+* Added `prosodyctl check config` result to server test.
+* A few minor tweaks.
+* Move defaults to config files
 
+## v 1.3.4
+
+* Migration from Docker to Podman.
+* Added websocket module.
 * Replace deprecated legacy_ssl with c2s_direct_tls.
 * Removed use_libevent = true. This means the default is now used which is epoll.
-
-### Test
-
-Added a test to check that no deprecated config settings are used.
+* Added a test to check that no deprecated config settings are used.
 
 ## v 1.3.3
 

tests/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   prosody:
-    image: prosody/xmpp:latest
+    image: prosody
     restart: unless-stopped
     ports:
       - "5000:5000"
@@ -17,7 +17,7 @@ services:
       - ./certs:/usr/local/etc/prosody/certs
 
   prosody_postgres:
-    image: prosody/xmpp:latest
+    image: prosody
     restart: unless-stopped
     ports:
       - "5000:5000"
@@ -51,7 +51,7 @@ services:
       POSTGRES_PASSWORD: prosody
 
   prosody_ldap:
-    image: prosody/xmpp:latest
+    image: prosody
     restart: unless-stopped
     ports:
       - "5000:5000"

tests/test.bash

@@ -20,7 +20,6 @@ registerTestUser() {
     local containerName="$2"
     echo "Registering TestUser '$userName' in container '$containerName'"
     sudo docker compose exec "$containerName" /bin/bash -c "prosodyctl register $userName example.com 12345678"
-    #sudo docker compose exec -e DOMAIN=example.com "$containerName" prosodyctl register "$userName" example.com 12345678
 }
 
 registerTestUsers() {
@@ -48,6 +47,13 @@ runTests() {
     && ./bats/bats-core/bin/bats tests-"$containerName".bats
 }
 
+checkConfig() {
+    local containerName="$1"
+    sudo docker compose up -d "$containerName"
+    sudo docker compose exec -T "$containerName" prosodyctl check config || true
+    sudo docker compose down
+}
+
 generateCert "example.com"
 generateCert "conference.example.com"
 generateCert "proxy.example.com"
@@ -56,22 +62,25 @@ generateCert "upload.example.com"
 
 # Run tests for first container with postgres
 # Start postgres first and wait for 10 seconds before starting prosody.
-docker compose down
-docker compose up -d postgres
+sudo docker compose down
+sudo docker compose up -d postgres
 sleep 10
-docker compose up -d prosody_postgres
+sudo docker compose up -d prosody_postgres
 registerTestUsers prosody_postgres
 runTests prosody_postgres
-docker compose down
+sudo docker compose down
 
 # Run tests for second container with SQLite
-docker compose up -d prosody
+sudo docker compose up -d prosody
 sleep 5
 registerTestUsers prosody
 runTests prosody
-docker compose down
+sudo docker compose down
 
 # Run tests for prosody with ldap
-docker compose up -d prosody_ldap
+sudo docker compose up -d prosody_ldap
 runTests prosody_ldap
-docker compose down
+sudo docker compose down
+
+# Check server config
+checkConfig prosody