diff --git a/docker/backend-dev-demo/Dockerfile b/docker/backend-dev-demo/Dockerfile index af510f9d..6b43ed5c 100644 --- a/docker/backend-dev-demo/Dockerfile +++ b/docker/backend-dev-demo/Dockerfile @@ -22,10 +22,11 @@ RUN ./entrypoint.sh \ RUN ./entrypoint.sh \ # and a demo account libervia-cli profile create demo -j demo@server1.test -p "demo" && \ - # we create a bookmark to have something to test in chat - libervia-cli bookmarks add -pdemo -a demo@server1.test\ libervia-backend stop +COPY --chown=libervia:libervia forums.json /home/libervia/ +COPY --chown=libervia:libervia scripts/init_script.sh /home/libervia/ + USER libervia # HTTP Upload EXPOSE 7777 diff --git a/docker/backend-dev-demo/forums.json b/docker/backend-dev-demo/forums.json new file mode 100644 index 00000000..8caaff73 --- /dev/null +++ b/docker/backend-dev-demo/forums.json @@ -0,0 +1,38 @@ +[ + { + "main-language": "en", + "name": "Libervia", + "title": "Libervia", + "short-desc": "Forums about Libervia demo", + "sub-forums": [ + { + "uri": "", + "title": "tools and features", + "short-desc": "Discussions about Libervia frontends, tools, features, or changes" + }, + { + "uri": "", + "title": "questions and help", + "short-desc": "Mutual assistance for installation or using Libervia and its ecosystem" + } + ], + "desc": "Those are example forums." + }, + { + "main-language": "en", + "title": "XMPP and associated", + "sub-forums": [ + { + "uri": "", + "title": "XMPP software", + "short-desc": "Topics about XMPP software other than Libervia" + }, + { + "uri": "", + "title": "outside XMPP", + "short-desc": "You can discuss or present here protocols or software similar to XMPP" + } + ], + "desc": "Forums about XMPP in general, or similar protocols" + } +] diff --git a/docker/backend-dev-demo/libervia.conf b/docker/backend-dev-demo/libervia.conf index 001e6c89..b432053b 100644 --- a/docker/backend-dev-demo/libervia.conf +++ b/docker/backend-dev-demo/libervia.conf @@ -1,4 +1,7 @@ [DEFAULT] +log_fmt = [%%(name)s] %%(message)s +init_wait_for_service=prosody:5222::Prosody +init_script_path=/home/libervia/init_script.sh xmpp_domain = server1.test email_server = libervia-backend.test email_port = 8025 diff --git a/docker/backend-dev-demo/scripts/init_script.sh b/docker/backend-dev-demo/scripts/init_script.sh new file mode 100755 index 00000000..79db20a1 --- /dev/null +++ b/docker/backend-dev-demo/scripts/init_script.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +SETUP_INDICATOR="/home/libervia/.local/share/libervia/setup_complete.flag" +FORUMS_JSON_FILE="/home/libervia/forums.json" + +if [ ! -f "$SETUP_INDICATOR" ]; then + echo "First run detected. Setting up the environment and configuration." + + libervia-cli profile modify -D -cp demo --pwd demo + libervia-cli forums set -p demo < $FORUMS_JSON_FILE + libervia-cli bookmarks add -pdemo -a demo@chat.server1.test + + touch "$SETUP_INDICATOR" + echo "Initial setup complete." +else + echo "Not the first run. Skipping setup." +fi diff --git a/docker/backend-dev/libervia.conf b/docker/backend-dev/libervia.conf index 5f8f5cce..0d63b124 100644 --- a/docker/backend-dev/libervia.conf +++ b/docker/backend-dev/libervia.conf @@ -1,2 +1,3 @@ [DEFAULT] +log_fmt = [%%(name)s] %%(message)s media_dir = /src/libervia-media diff --git a/docker/prosody-e2e/prosody.cfg.lua b/docker/prosody-e2e/prosody.cfg.lua index e2c91dce..8be717f5 100644 --- a/docker/prosody-e2e/prosody.cfg.lua +++ b/docker/prosody-e2e/prosody.cfg.lua @@ -109,11 +109,11 @@ VirtualHost "server2.test" VirtualHost "server3.test" --- Component "muc.server1.test" "muc" --- modules_enabled = { --- "muc_mam"; --- "vcard"; --- } +Component "chat.server1.test" "muc" + modules_enabled = { + "muc_mam"; + "vcard"; + } Component "pubsub.server1.test" component_secret = "test_e2e"