Add SECURITY.md in hex docs

With this change we will no longer abort connection if all -PLUS
methods are disabled by administrator using `disable_sasl_mechanisms`.

Additionally when using SASL2 authentication we will also allow
connections to continue, if filtering methods based on stored
user passwords, removed all offered -PLUS mechanisms.

.devcontainer/Dockerfile

@@ -1,4 +1 @@
-# Update the VARIANT arg to pick an Elixir version: latest, 1.11.4, etc.
-ARG VARIANT=latest
-
-FROM ghcr.io/processone/elixir:${VARIANT}
+FROM ghcr.io/processone/devcontainer:latest

.devcontainer/devcontainer.json

@@ -1,48 +1,7 @@
 {
 	"name": "ejabberd",
-	// "dockerComposeFile": "docker-compose.yml",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"VARIANT": "latest" // 1.11.4
-		}	
-	},
-	"workspaceFolder": "/workspace",
-
-	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"terminal.integrated.defaultProfile.linux": "/bin/zsh",
-	},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": ["pgourlain.erlang", "jakebecker.elixir-ls"],
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [5222, 5280, 5269],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "sh .devcontainer/post-create.sh",
-
-	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-	"portsAttributes": {
-		"1883": {
-			"label": "MQTT"
-		},
-		"5222": {
-			"label": "XMPP C2S"
-		},
-		"5223": {
-			"label": "Legacy XMPP C2S"
-		},
-		"5269": {
-			"label": "XMPP S2S"
-		},
-		"5280": {
-			"label": "ejabberd HTTP"
-		},
-		"5443": {
-			"label": "ejabberd HTTPS"
-		}
-	}
+	"build": {"dockerfile": "Dockerfile"},
+	"extensions": ["erlang-ls.erlang-ls"],
+	"postCreateCommand": ".devcontainer/prepare-container.sh",
+	"remoteUser": "vscode"
 }

.devcontainer/docker-compose.yml

@@ -1,8 +0,0 @@
-ejabberd:
-  image: ejabberd/ecs
-  ports:
-    - 5222:5222
-    - 5223:5223
-    - 5269:5269
-    - 5280:5280
-    - 1883:1883

.devcontainer/prepare-container.sh

@@ -0,0 +1,3 @@
+echo "export PATH=/workspaces/ejabberd/_build/relive:$PATH" >>$HOME/.bashrc
+echo "COOKIE" >$HOME/.erlang.cookie
+chmod 400 $HOME/.erlang.cookie

.dockerignore

@@ -1,3 +1,46 @@
 .git
 .win32
 .examples
+*.swp
+*~
+\#*#
+.#*
+.edts
+*.dump
+/Makefile
+/config.log
+/config.status
+/config/releases.exs
+/configure
+/aclocal.m4
+/*.cache
+/deps/
+/.deps-update/
+/ebin/
+/ejabberd.init
+/ejabberd.service
+/ejabberdctl
+/ejabberdctl.example
+/rel/ejabberd/
+/rel/overlays/
+/src/eldap_filter_yecc.erl
+/vars.config
+/dialyzer/
+/test/*.beam
+/test/*.ctc
+/logs/
+/priv/bin/captcha*sh
+/priv/sql
+/rel/ejabberd
+/_build
+/database/
+/.rebar
+/rebar.lock
+/log/
+Mnesia.nonode@nohost/
+# Binaries created with tools/make-{binaries,installers,packages}:
+/ejabberd_*.deb
+/ejabberd-*.rpm
+/ejabberd-*.run
+/ejabberd-*.tar.gz
+/.github/container/Dockerfile

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,8 +6,7 @@ assignees: ''
 
 ---
 
-Before creating a ticket, please consider if this should fit the discussion forum better:
-https://github.com/processone/ejabberd/discussions
+Before creating a ticket, please consider if this should fit the [discussion forum](https://github.com/processone/ejabberd/discussions) better.
 
 ## Environment
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,17 +7,20 @@ assignees: ''
 
 ---
 
-Before creating a ticket, please consider if this should fit the discussion forum better:
-https://github.com/processone/ejabberd/discussions
+Before creating a ticket, please consider if this should fit the [discussion forum](https://github.com/processone/ejabberd/discussions) better.
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when...
 
 **Describe the solution you'd like**
+
 A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
+
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
+
 Add any other context or screenshots about the feature request here.

.github/actions/manage-database/action.yml

@@ -0,0 +1,155 @@
+name: 'Manage Database'
+
+inputs:
+  for:
+    default: ""
+    description: 'One or more databases to manage:
+                  mysql, pgsql, redis, mssql'
+
+  do:
+    default: ""
+    description: 'One or more tasks to do:
+                  install, start, user, create, drop, dump'
+
+  dump-suffix:
+    default: ""
+    description: 'Suffix to append to the dump file name'
+
+  mssql-schema:
+    default: ""
+    description: 'SQL schema for the MSSQL database:
+                  singlehost or multihost'
+
+runs:
+  using: "composite"
+  steps:
+
+    ############################################################# Install #####
+
+    - if: contains(inputs.for, 'pgsql') && contains(inputs.do, 'install')
+      shell: sh
+      run: |
+        sudo sed -i 's/yes/no/g' /etc/initramfs-tools/update-initramfs.conf
+        sudo rm -f /var/lib/man-db/auto-update || echo ok
+        sudo apt-get -q update
+        sudo apt-get -q -y install postgresql
+
+    - if: contains(inputs.for, 'redis') && contains(inputs.do, 'install')
+      shell: sh
+      run: |
+        sudo sed -i 's/yes/no/g' /etc/initramfs-tools/update-initramfs.conf
+        sudo rm -f /var/lib/man-db/auto-update || echo ok
+        sudo apt-get -q update
+        sudo apt-get -q -y install redis-server
+
+    - if: contains(inputs.for, 'mssql') && contains(inputs.do, 'install')
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: tdsodbc
+
+    - if: contains(inputs.for, 'mssql') && contains(inputs.do, 'install')
+      shell: sh
+      run: |
+        docker run -d -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=ejabberd_Test1" \
+                   -v $(pwd)/test/docker/db/mssql/initdb/initdb_mssql.sql:/initdb_mssql.sql:ro \
+                   -v $(pwd)/sql/mssql.sql:/mssql.sql:ro \
+                   -v $(pwd)/sql/mssql.new.sql:/mssql.new.sql:ro \
+                   -p 1433:1433 --name ejabberd-mssql \
+                   "mcr.microsoft.com/mssql/server:2019-latest"
+        sleep 10
+        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd \
+               -C -U SA -P ejabberd_Test1 -S localhost -i /initdb_mssql.sql
+
+    - if: contains(inputs.for, 'mssql') && contains(inputs.do, 'install')
+          && inputs.mssql-schema == 'singlehost'
+      shell: sh
+      run: |
+        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd \
+               -C -U SA -P ejabberd_Test1 -S localhost -d ejabberd_test \
+               -i /mssql.sql
+
+    - if: contains(inputs.for, 'mssql') && contains(inputs.do, 'install')
+          && inputs.mssql-schema == 'multihost'
+      shell: sh
+      run: |
+        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd \
+               -C -U SA -P ejabberd_Test1 -S localhost -d ejabberd_test \
+               -i /mssql.new.sql
+
+    ############################################################### Start #####
+
+    - if: contains(inputs.for, 'mysql') && contains(inputs.do, 'start')
+      shell: sh
+      run: |
+        sudo systemctl start mysql.service
+
+    - if: contains(inputs.for, 'pgsql') && contains(inputs.do, 'start')
+      shell: sh
+      run: |
+        sudo systemctl start postgresql.service
+        pg_isready
+
+    ################################################################ User #####
+
+    - if: contains(inputs.for, 'mysql') && contains(inputs.do, 'user')
+      shell: sh
+      run: |
+        mysql -u root -proot -e "CREATE USER 'ejabberd_test'@'localhost'
+                                 IDENTIFIED BY 'ejabberd_test';"
+
+    - if: contains(inputs.for, 'pgsql') && contains(inputs.do, 'user')
+      shell: sh
+      run: |
+        sudo -u postgres psql -c "CREATE USER ejabberd_test
+                                  WITH PASSWORD 'ejabberd_test';"
+
+    ################################################################ Dump #####
+
+    - if: contains(inputs.for, 'mysql') && contains(inputs.do, 'dump')
+      shell: sh
+      run: |
+        sudo mysqldump -u root -proot ejabberd_test \
+             > mysql-${{ inputs.dump-suffix }}.sql
+
+    - if: contains(inputs.for, 'pgsql') && contains(inputs.do, 'dump')
+      shell: sh
+      run: |
+        sudo -u postgres pg_dump ejabberd_test \
+             > pgsql-${{ inputs.dump-suffix }}.sql
+
+    ################################################################ Drop #####
+
+    - if: contains(inputs.for, 'mysql') && contains(inputs.do, 'drop')
+      shell: sh
+      run: |
+        mysql -u root -proot -e "DROP DATABASE ejabberd_test;"
+
+    - if: contains(inputs.for, 'pgsql') && contains(inputs.do, 'drop')
+      shell: sh
+      run: |
+        sudo -u postgres psql -c "DROP DATABASE ejabberd_test;"
+
+    ############################################################## Create #####
+
+    - if: contains(inputs.for, 'mysql') && contains(inputs.do, 'create')
+      shell: sh
+      run: |
+        mysql -u root -proot -e "CREATE DATABASE ejabberd_test;"
+        mysql -u root -proot -e "GRANT ALL ON ejabberd_test.*
+                                 TO 'ejabberd_test'@'localhost';"
+
+    - if: contains(inputs.for, 'pgsql') && contains(inputs.do, 'create')
+      shell: sh
+      run: |
+        sudo -u postgres psql -c "CREATE DATABASE ejabberd_test;"
+        sudo -u postgres psql -c "GRANT ALL PRIVILEGES
+                                  ON DATABASE ejabberd_test TO ejabberd_test;"
+        sudo -u postgres psql -c "GRANT ALL ON SCHEMA public TO ejabberd_test;"
+        sudo -u postgres psql -c "ALTER DATABASE ejabberd_test
+                                  OWNER TO ejabberd_test;"
+        sudo -u postgres psql ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL
+                                                TABLES IN SCHEMA public
+                                                TO ejabberd_test;"
+        sudo -u postgres psql ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL
+                                                SEQUENCES IN SCHEMA public
+                                                TO ejabberd_test;"

.github/actions/manage-ejabberd/action.yml

@@ -0,0 +1,195 @@
+name: 'Manage ejabberd'
+
+inputs:
+  for:
+    default: ""
+    description: 'Release method, one of:
+                  prod, dev, install, run, deb'
+  do:
+    default: ""
+    description: 'One or more tasks to perform:
+                  deploy, no_acme, no_tls,
+                  start, register, update_sql, stop,
+                  check, logs'
+  username:
+    default: "user1"
+    description: 'Username part of the account JID'
+  host:
+    default: "localhost"
+    description: 'Host part of the account JID'
+  tool:
+    default: "rebar3"
+    description: 'Build tool to use:
+                  rebar or rebar3 (only relevant to make rebar2)'
+  rel_name_vsn:
+    default: ""
+    description: 'Base name of installer files'
+  configure:
+    default: ""
+    description: 'Options to append to ./configure'
+
+runs:
+  using: "composite"
+  steps:
+
+    - name: Path Definitions
+      id: path
+      shell: bash
+      run: |
+        case ${{ inputs.for }} in
+          'prod')
+             BASE="_build/prod/rel/ejabberd"
+             echo "conf=$BASE/conf" >> $GITHUB_OUTPUT
+             echo "logs=$BASE/logs" >> $GITHUB_OUTPUT
+             echo "ectl=$BASE/bin/ejabberdctl" >> $GITHUB_OUTPUT
+             ;;
+          'dev')
+             BASE="_build/dev/rel/ejabberd"
+             echo "conf=$BASE/conf" >> $GITHUB_OUTPUT
+             echo "logs=$BASE/logs" >> $GITHUB_OUTPUT
+             echo "ectl=$BASE/bin/ejabberdctl" >> $GITHUB_OUTPUT
+             ;;
+          'install')
+             BASE="/tmp/ejabberd"
+             echo "conf=$BASE/etc/ejabberd" >> $GITHUB_OUTPUT
+             echo "logs=$BASE/var/log/ejabberd" >> $GITHUB_OUTPUT
+             echo "ectl=$BASE/sbin/ejabberdctl" >> $GITHUB_OUTPUT
+             ;;
+          'deb')
+             BASE="/opt/ejabberd"
+             echo "base=$BASE" >> $GITHUB_OUTPUT
+             echo "conf=$BASE/conf" >> $GITHUB_OUTPUT
+             echo "logs=$BASE/logs" >> $GITHUB_OUTPUT
+             echo "ectl=sudo /opt/${{ inputs.rel_name_vsn }}/bin/ejabberdctl" >> $GITHUB_OUTPUT
+             ;;
+          'run')
+             BASE="$HOME/opt/ejabberd"
+             echo "base=$BASE" >> $GITHUB_OUTPUT
+             echo "conf=$BASE/conf" >> $GITHUB_OUTPUT
+             echo "logs=$BASE/logs" >> $GITHUB_OUTPUT
+             echo "ectl=$HOME/opt/${{ inputs.rel_name_vsn }}/bin/ejabberdctl" >> $GITHUB_OUTPUT
+             ;;
+        esac
+
+    ############################################################# Compile #####
+
+    - if: contains(inputs.do, 'compile')
+      shell: sh
+      run: |
+        TOOL=${{ inputs.tool }}
+        [ "${TOOL%3}" = "rebar" ] && TOOL="./$TOOL"
+        ./autogen.sh
+        ./configure --with-rebar=$TOOL \
+                    --prefix=/tmp/ejabberd \
+                    --enable-all ${{ inputs.configure }}
+        sed -i 's|, syntax_tools||g' src/ejabberd.app.src.script
+        REBAR_PROFILE=test make
+
+    ############################################################## Deploy #####
+
+    - if: contains(inputs.do, 'deploy') &&
+          inputs.for == 'prod' && inputs.tool == 'rebar'
+      shell: sh
+      run: |
+        mkdir -p _build/prod && ln -s `pwd`/rel/ _build/prod/rel
+
+    - if: contains(inputs.do, 'deploy') &&
+          inputs.for == 'dev' && inputs.tool == 'rebar'
+      shell: sh
+      run: |
+        mkdir -p _build/dev && ln -s `pwd`/rel/ _build/dev/rel
+
+    - if: contains(inputs.do, 'deploy') &&
+          (inputs.for == 'prod' ||
+           inputs.for == 'dev' ||
+           inputs.for == 'install')
+      shell: sh
+      run: |
+        make ${{ inputs.for }}
+
+    - if: contains(inputs.do, 'deploy') &&
+          inputs.for == 'deb'
+      shell: sh
+      run: |
+        sudo dpkg -i $(ls -1 *.deb)
+
+    - if: contains(inputs.do, 'deploy') &&
+          inputs.for == 'run'
+      shell: sh
+      run: |
+        ./$(ls -1 *.run)
+
+    ################################################################ ACME #####
+
+    - if: contains(inputs.do, 'no_acme')
+      shell: sh
+      run: |
+        sed -i 's/loglevel/acme:\n  auto: false\nloglevel/g' \
+            ${{ steps.path.outputs.conf }}/ejabberd.yml
+
+    ################################################################# TLS #####
+
+    - if: contains(inputs.do, 'no_tls') &&
+          inputs.for == 'dev'
+      shell: sh
+      run: |
+        sed -i 's/starttls_required: true/starttls_required: false/g' \
+            ${{ steps.path.outputs.conf }}/ejabberd.yml
+
+    ############################################################### Start #####
+
+    - if: contains(inputs.do, 'start')
+      shell: sh
+      run: |
+        ${{ steps.path.outputs.ectl }} start
+        ${{ steps.path.outputs.ectl }} started
+
+    ############################################################ Register #####
+
+    - if: contains(inputs.do, 'register')
+      shell: sh
+      run: |
+        ${{ steps.path.outputs.ectl }} \
+            register ${{ inputs.username }} ${{ inputs.host }} s0mePass
+        ${{ steps.path.outputs.ectl }} \
+            registered_users ${{ inputs.host }} >> registered.log
+        grep -q '${{ inputs.username }}' registered.log
+
+    ########################################################### UpdateSQL #####
+
+    - if: contains(inputs.do, 'update_sql')
+      shell: sh
+      run: |
+        ${{ steps.path.outputs.ectl }} \
+            update_sql
+
+    ################################################################ Stop #####
+
+    - if: contains(inputs.do, 'stop')
+      shell: sh
+      run: |
+        ${{ steps.path.outputs.ectl }} stop
+        ${{ steps.path.outputs.ectl }} stopped
+
+    ############################################################### Check #####
+
+    - if: contains(inputs.do, 'check')
+      shell: sh
+      run: |
+        grep -q 'is started' ${{ steps.path.outputs.logs }}/ejabberd.log
+        grep -q 'is stopped' ${{ steps.path.outputs.logs }}/ejabberd.log
+        test $(find ${{ steps.path.outputs.logs }}/ -empty -name error.log)
+
+    ################################################################ Logs #####
+
+    - if: contains(inputs.do, 'logs') || failure()
+      shell: sh
+      run: |
+        SUDO=sudo
+        [ "${{ inputs.for }}" = "deb" ] || SUDO=""
+        echo "::group::View ejabberd.log"
+        $SUDO cat ${{ steps.path.outputs.logs }}/ejabberd.log
+        echo "::endgroup::"
+        echo "::group::View error.log"
+        $SUDO cat ${{ steps.path.outputs.logs }}/error.log
+        echo "::endgroup::"

.github/container/Dockerfile

@@ -1,54 +1,101 @@
-FROM alpine:3.15.4 AS build
-ARG VERSION=master
+#' Define default build variables
+ARG OTP_VSN='28.4.1.0'
+ARG ELIXIR_VSN='1.19.5'
+ARG UID='9000'
+ARG USER='ejabberd'
+ARG HOME="opt/$USER"
+ARG BUILD_DIR="/$USER"
+ARG VERSION='master'
 
-RUN apk upgrade --update musl \
-    && apk add \
-    autoconf \
-    automake \
-    bash \
-    build-base \
-    curl \
-    elixir \
-    erlang-odbc \
-    erlang-reltool \
-    expat-dev \
-    file \
-    gd-dev \
-    git \
-    jpeg-dev \
-    libpng-dev \
-    libwebp-dev \
-    linux-pam-dev \
-    openssl \
-    openssl-dev \
-    sqlite-dev \
-    yaml-dev \
-    zlib-dev
+################################################################################
+#' Compile ejabberdapi
+FROM docker.io/golang:1.25-alpine AS api
+RUN go install -v \
+    github.com/processone/ejabberd-api/cmd/ejabberd@master \
+    && mv bin/ejabberd bin/ejabberdapi
+
+################################################################################
+#' build and install ejabberd directly from source
+FROM docker.io/erlang:${OTP_VSN}-alpine AS ejabberd
+
+RUN apk -U add --no-cache \
+        ca-certificates \
+        autoconf \
+        automake \
+        bash \
+        build-base \
+        curl \
+        expat-dev \
+        file \
+        gd-dev \
+        git \
+        jpeg-dev \
+        libpng-dev \
+        libwebp-dev \
+        linux-pam-dev \
+        npm \
+        openssl-dev \
+        sqlite-dev \
+        yaml-dev \
+        zlib-dev
+
+ARG ELIXIR_VSN
+RUN wget -O - https://github.com/elixir-lang/elixir/archive/v$ELIXIR_VSN.tar.gz \
+        | tar -xzf -
+
+WORKDIR /elixir-$ELIXIR_VSN
+ENV ERL_FLAGS="+JPperf true"
+RUN make install clean
 
 RUN mix local.hex --force \
     && mix local.rebar --force
 
-WORKDIR ejabberd
+ARG BUILD_DIR
+COPY / $BUILD_DIR/
 
-RUN git clone https://github.com/processone/ejabberd.git . \
-    && git checkout $VERSION \
-    && mv .github/container/ejabberdctl.template . \
+WORKDIR $BUILD_DIR
+
+RUN mv .github/container/ejabberdctl.template . \
+    && mv .github/container/ejabberd.yml.example . \
     && ./autogen.sh \
     && ./configure --with-rebar=mix --enable-all \
-    && mix deps.get \
-    && make rel
+    && make deps \
+    && make prod
 
-RUN cp -r _build/prod/rel/ejabberd/ /opt/ejabberd-$VERSION \
-    && mkdir -p /opt/ejabberd \
-    && mv /opt/ejabberd-$VERSION/conf /opt/ejabberd/conf
+WORKDIR /rootfs
+ARG VERSION
+ARG HOME
+RUN mkdir -p $HOME $HOME-$VERSION \
+    && cp -r $BUILD_DIR/_build/prod/rel/ejabberd/* $HOME-$VERSION \
+    && mv $HOME-$VERSION/conf $HOME/conf
 
-RUN DESCRIBE=$(git describe --tags) \
-    && MIXVER=$(echo $DESCRIBE.0 | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') \
-    && mkdir /opt/ejabberd-$VERSION/lib/ejabberd-$MIXVER/priv/bin \
-    && cp tools/captcha*.sh /opt/ejabberd-$VERSION/lib/ejabberd-$MIXVER/priv/bin/
+RUN cp -p $BUILD_DIR/tools/captcha*.sh $HOME-$VERSION/lib
 
-RUN export PEM=/opt/ejabberd/conf/server.pem \
-    && curl -o "/opt/ejabberd/conf/cacert.pem" 'https://curl.se/ca/cacert.pem' \
+RUN find "$HOME-$VERSION/bin" -name 'ejabberd' -delete \
+    && find "$HOME-$VERSION/releases" -name 'COOKIE' -delete
+
+RUN wget -O "$HOME/conf/cacert.pem" 'https://curl.se/ca/cacert.pem'
+
+#' Prepare ejabberd for runtime
+RUN apk -U add --no-cache \
+        git \
+        libcap \
+        openssl
+
+RUN mkdir -p usr/local/bin $HOME/conf $HOME/database $HOME/logs $HOME/upload
+
+COPY --from=api /go/bin/ejabberdapi usr/local/bin/
+
+RUN if [ ! -d $HOME/.ejabberd-modules ]; \
+    then \
+        if [ -d $BUILD_DIR/.ejabberd-modules ]; \
+        then cp -r $BUILD_DIR/.ejabberd-modules $HOME; \
+        else git clone https://github.com/processone/ejabberd-contrib --depth 1 \
+                $HOME/.ejabberd-modules/sources/ejabberd-contrib; \
+        fi \
+    fi
+
+RUN export PEM=$HOME/conf/server.pem \
     && openssl req -x509 \
             -batch \
             -nodes \
@@ -56,62 +103,106 @@ RUN export PEM=/opt/ejabberd/conf/server.pem \
             -keyout $PEM \
             -out $PEM \
             -days 3650 \
-            -subj "/CN=localhost" \
-    && sed -i '/^loglevel:/a \ \
-        \nca_file: /opt/ejabberd/conf/cacert.pem \
-        \ncertfiles: \
-        \n  - /opt/ejabberd/conf/server.pem' "/opt/ejabberd/conf/ejabberd.yml"
+            -subj "/CN=localhost"
 
-FROM alpine:3.15.4
-ENV HOME=/opt/ejabberd
+RUN sed -i 's|^#CTL_OVER_HTTP=|CTL_OVER_HTTP=../|' "$HOME/conf/ejabberdctl.cfg"
 
-RUN apk upgrade --update musl \
-    && apk add \
-    expat \
-    freetds \
-    gd \
-    jpeg \
-    libgd \
-    libpng \
-    libstdc++ \
-    libwebp \
-    linux-pam \
-    ncurses-libs \
-    openssl \
-    sqlite \
-    sqlite-libs \
-    unixodbc \
-    yaml \
-    zlib \
-    && ln -fs /usr/lib/libtdsodbc.so.0 /usr/lib/libtdsodbc.so \
-    && rm -rf /var/cache/apk/*
+RUN home_root_dir=$(echo $HOME | sed 's|\(.*\)/.*|\1 |') \
+    && setcap 'cap_net_bind_service=+ep' $(find $home_root_dir -name beam.smp) \
+    && echo -e \
+        "#!/bin/sh \
+        \n[ -z \$ERLANG_NODE_ARG ] && export ERLANG_NODE_ARG=ejabberd@localhost \
+        \nexport EMA=\"\$EJABBERD_MACRO_ADMIN\" \
+        \nexport HOST=\"\${EJABBERD_MACRO_HOST:-localhost}\" \
+        \nif [ -n \"\$EMA\" ] \
+        \nthen \
+        \n    if [ \"\$EMA\" != \"\${EMA%%@*}\" ] \
+        \n    then \
+        \n        export USERNAME=\"\${EMA%%@*}\" \
+        \n        export HOST=\"\${EMA##*@}\" \
+        \n    else \
+        \n        export USERNAME=\"\$EMA\" \
+        \n        export SHOW_WARNING=\"true\" \
+        \n    fi \
+        \nelif [ -n \"\$REGISTER_ADMIN_PASSWORD\" ] \
+        \nthen \
+        \n    export USERNAME=\"admin\" \
+        \nelse \
+        \n    export USERNAME=\"\$(od -A n -N 8 -t x8 /dev/urandom)\" \
+        \nfi \
+        \nexport EJABBERD_MACRO_ADMIN=\"\$USERNAME@\$HOST\" \
+        \n[ -n \"\$SHOW_WARNING\" ] && echo \"WARNING: The EJABBERD_MACRO_ADMIN environment variable was set to '\$EMA', but it should include the host... I'll overwrite it to become '\$EJABBERD_MACRO_ADMIN'.\" \
+        \n[ -n \"\$CTL_ON_CREATE\" ] && export SEPARATOR=\";\" \
+        \n[ -n \"\$REGISTER_ADMIN_PASSWORD\" ] && export CTL_ON_CREATE=\"register \${EJABBERD_MACRO_ADMIN%%@*} \${EJABBERD_MACRO_ADMIN##*@} \$REGISTER_ADMIN_PASSWORD \$SEPARATOR \$CTL_ON_CREATE\" \
+        \nexport CONFIG_DIR=/$HOME/conf \
+        \nexport LOGS_DIR=/$HOME/logs \
+        \nexport SPOOL_DIR=/$HOME/database \
+        \nexec /$(find $home_root_dir -name ejabberdctl) \"\$@\"" \
+            > usr/local/bin/ejabberdctl \
+    && chmod +x usr/local/bin/* \
+    && scanelf --needed --nobanner --format '%n#p' --recursive $home_root_dir \
+        | tr ',' '\n' \
+        | sort -u \
+        | awk 'system("[ -e $home_root_dir" $1 " ]") == 0 { next } { print "so:" $1 }' \
+        | sed -e "s|so:libc.so|so:libc.musl-$(uname -m).so.1|" \
+            > /tmp/runDeps
 
-COPY --from=build /opt /opt
-RUN echo -e \
-     "#!/bin/sh \
-    \n[ -z \$ERLANG_NODE_ARG ] && export ERLANG_NODE_ARG=ejabberd@localhost \
-    \nexport CONFIG_DIR=/opt/ejabberd/conf \
-    \nexport LOGS_DIR=/opt/ejabberd/logs \
-    \nexport SPOOL_DIR=/opt/ejabberd/database \
-    \nexec $(find /opt -name ejabberdctl) \"\$@\"" > /usr/local/bin/ejabberdctl \
-    && chmod +x /usr/local/bin/ejabberdctl
+ARG UID
+RUN chown -R $UID:$UID $HOME
 
-RUN addgroup ejabberd -g 9000 \
-    && adduser -s /bin/sh -D -G ejabberd ejabberd -u 9000 \
-    && mkdir -p $HOME/conf $HOME/database $HOME/logs $HOME/upload \
-    && chown -R ejabberd:ejabberd $HOME
+RUN cp /rootfs/$HOME-$VERSION/lib/captcha*.sh usr/local/bin/
+RUN mkdir $HOME/sql \
+    && find /rootfs/$HOME-$VERSION/lib/ -name *.sql -exec cp {} $HOME/sql \; -exec cp {} $HOME/database \;
+
+################################################################################
+#' Remove erlang/OTP & rebar3
+FROM docker.io/erlang:${OTP_VSN}-alpine AS runtime
+RUN apk del .erlang-rundeps \
+    && rm -f $(which rebar3) \
+    && find /usr -type d -name 'erlang' -exec rm -rf {} + \
+    && find /usr -type l -exec test ! -e {} \; -delete
+
+#' Update alpine, finalize runtime environment
+COPY --from=ejabberd /tmp/runDeps /tmp/runDeps
+RUN apk -U upgrade --available --no-cache \
+    && apk add --no-cache \
+        $(cat /tmp/runDeps) \
+        so:libcap.so.2 \
+        so:libtdsodbc.so \
+        curl \
+        tini \
+    && rm /tmp/runDeps
+
+ARG USER
+ARG UID
+ARG HOME
+RUN addgroup $USER -g $UID \
+    && adduser -s /sbin/nologin -D -u $UID -h /$HOME -G $USER $USER
+
+RUN ln -fs /usr/local/bin/ /opt/ejabberd/bin
+RUN rm -rf /home \
+    && ln -fs /opt /home
+
+################################################################################
+#' Build together production image
+FROM scratch
+ARG USER
+ARG HOME
+
+COPY --from=runtime / /
+COPY --from=ejabberd /rootfs /
 
 HEALTHCHECK \
-    --interval=5s \
+    --interval=1m \
     --timeout=5s \
     --start-period=5s \
-    --retries=120 \
-    CMD /usr/local/bin/ejabberdctl status
+    --retries=10 \
+    CMD ejabberdctl status
 
-WORKDIR $HOME
-USER ejabberd
-VOLUME ["$HOME/conf", "$HOME/database", "$HOME/logs", "$HOME/upload"]
-EXPOSE 1883 4369-4399 5222 5269 5280 5443
+WORKDIR /$HOME
+USER $USER
+VOLUME ["/$HOME"]
+EXPOSE 1880 1883 4369-4399 5210 5222 5269 5280 5443 5478 7777 50000-50099
 
-ENTRYPOINT ["/usr/local/bin/ejabberdctl"]
+ENTRYPOINT ["/sbin/tini","--","ejabberdctl"]
 CMD ["foreground"]

.github/container/ejabberd-container-install.bat

@@ -0,0 +1,294 @@
+@echo off
+
+::
+::   ejabberd container installer for Windows
+::   -------------------------------------
+::                                    v0.4
+::
+:: This batch script downloads an ejabberd container image
+:: and setups a docker container to run ejabberd.
+
+::
+:: 1. Download and install Docker:
+::
+::    If you use Windows 10, download Docker Desktop from:
+::      https://www.docker.com/
+::
+::    If you use Windows 7 or 8, download Docker Toolbox from:
+::      https://github.com/docker/toolbox/releases
+::    After installation, run Docker Quickstart Installer
+::
+
+::
+:: 2. Edit those options:
+
+:: Directory where your ejabberd deployment files will be installed
+:: (configuration, database, logs, ...)
+::
+:: In Windows 10 you can configure the path:
+
+set INSTALL_DIR_WINDOWS10=C:\ejabberd
+
+:: In older Windows, not configurable, it will be installed in:
+:: C:\Users\%USERNAME%\ejabberd
+
+:: Please enter the desired ejabberd domain name.
+:: The domain is the visible attribute that is added to the username
+:: to form the Jabber Identifier (for example: user@example.net).
+:: This computer must be known on the network with this address name.
+:: You can later add more in conf/ejabberd.yml
+
+set HOST=localhost
+
+:: Please enter the administrator username for the current
+:: ejabberd installation. A Jabber account with this username
+:: will be created and granted administrative privileges.
+:: Don't use blankspaces in the username.
+
+set USER=admin
+
+:: Please provide a password for that new administrator account
+
+set PASSWORD=
+
+:: By default this downloads 'latest' ejabberd version,
+:: but you can set a specific version, for example '22.05'
+:: or the bleeding edge 'master'. See available tags in
+:: https://github.com/processone/ejabberd/pkgs/container/ejabberd
+
+set VERSION=latest
+
+:: This tells docker what ports ejabberd will use.
+:: You can later configure them in conf/ejabberd.yml
+
+set PORTS=5180 5222 5269 5443
+
+::
+:: 3. Now save this script and run it.
+::
+
+::
+:: 4. When installation is completed:
+::
+:: If using Windows 10, open Docker Desktop and you can:
+::
+:: - (>) START the ejabberd container
+:: - Enter WebAdmin: click the ([->]) OPEN IN BROWSER button
+:: - To try ejabberdctl, click the (>_) CLI button, then: ejabberdctl
+:: - ([]) STOP the ejabberd container
+::
+:: If using an old Windows, open Kitematic and you can:
+::
+:: - START the ejabberd container
+:: - Open your configuration, logs, ... in Settings > Volumes
+:: - Enter WebAdmin in Settings > Hostname/Ports > click on the 5180 port
+:: - Try ejabberdctl in EXEC, then: ejabberdctl
+:: - STOP the ejabberd container
+::
+:: You can delete the container and create it again running this script,
+:: the configuration and database are maintained.
+::
+
+::===============================================================
+:: Check Windows version
+::
+::===============================================================
+
+set INSTALL_DIR_DOCKER=c/Users/%USERNAME%/ejabberd
+
+for /f "tokens=4-5 delims=. " %%i in ('ver') do set WVERSION=%%i.%%j
+if "%wversion%" == "10.0" (
+  echo === Preparing paths to install in Windows 10...
+  set INSTALL_DIR=%INSTALL_DIR_WINDOWS10%
+  set VC=-v %INSTALL_DIR_WINDOWS10%\conf:/opt/ejabberd/conf
+  set VD=-v %INSTALL_DIR_WINDOWS10%\database:/opt/ejabberd/database
+  set VL=-v %INSTALL_DIR_WINDOWS10%\logs:/opt/ejabberd/logs
+  set VM=-v %INSTALL_DIR_WINDOWS10%\ejabberd-modules:/opt/ejabberd/.ejabberd-modules
+  set DOCKERDOWNLOAD="First download and install Docker Desktop from https://www.docker.com/"
+) else (
+  echo === Preparing paths to install in Windows older than 10...
+  set INSTALL_DIR=C:\Users\%USERNAME%\ejabberd
+  set VC=-v "/%INSTALL_DIR_DOCKER%/conf:/opt/ejabberd/conf"
+  set VD=-v "/%INSTALL_DIR_DOCKER%/database:/opt/ejabberd/database"
+  set VL=-v "/%INSTALL_DIR_DOCKER%/logs:/opt/ejabberd/logs"
+  set VM=-v "/%INSTALL_DIR_DOCKER%/ejabberd-modules:/opt/ejabberd/.ejabberd-modules"
+  set DOCKERDOWNLOAD="First download and install Docker Toolbox from https://github.com/docker/toolbox/releases"
+)
+set VOLUMES=%VC% %VD% %VL% %VM%
+
+::===============================================================
+:: Check docker is installed
+::
+::===============================================================
+
+docker version >NUL
+if %ERRORLEVEL% NEQ 0 (
+  echo.
+  echo === ERROR: It seems docker is not installed!!!
+  echo.
+  echo %DOCKERDOWNLOAD%
+  echo === Then try to run this script again.
+  echo.
+  pause
+  exit 1
+)
+
+::===============================================================
+:: Check install options are correctly set
+::
+::===============================================================
+
+if [%PASSWORD%]==[] (
+  echo.
+  echo === ERROR: PASSWORD not set!!!
+  echo.
+  echo === Please edit this script and set the PASSWORD.
+  echo === Then try to run this script again.
+  echo.
+  pause
+  exit 1
+)
+
+::===============================================================
+:: Download Docker image
+::
+::===============================================================
+
+set IMAGE=ghcr.io/processone/ejabberd:%VERSION%
+
+echo.
+echo === Checking if the '%IMAGE%' container image was already downloaded...
+docker image history %IMAGE% >NUL
+if %ERRORLEVEL% NEQ 0 (
+  echo === The '%IMAGE%' container image was not downloaded yet.
+  echo.
+  echo === Downloading the '%IMAGE%' container image, please wait...
+  docker pull %IMAGE%
+) else (
+  echo === The '%IMAGE%' container image was already downloaded.
+)
+
+::===============================================================
+:: Create preliminary container
+::
+::===============================================================
+
+echo.
+echo === Checking if the 'ejabberd' container already exists...
+docker container logs ejabberd
+if %ERRORLEVEL% EQU 0 (
+  echo.
+  echo === The 'ejabberd' container already exists.
+  echo === Nothing to do, so installation finishes now.
+  echo === You can go to Docker Desktop and start the 'ejabberd' container.
+  echo.
+  pause
+  exit 1
+) else (
+  echo === The 'ejabberd' container doesn't yet exist,
+  echo === so let's continue the installation process.
+)
+
+echo.
+if exist %INSTALL_DIR% (
+  echo === The INSTALL_DIR %INSTALL_DIR% already exists.
+  echo === No need to create the preliminary 'ejabberd-pre' image.
+) else (
+  echo === The INSTALL_DIR %INSTALL_DIR% doesn't exist.
+  echo === Let's create the preliminary 'ejabberd-pre' image.
+  CALL :create-ejabberd-pre
+)
+
+::===============================================================
+:: Create final container
+::
+::===============================================================
+
+echo.
+echo === Creating the final 'ejabberd' container using %IMAGE% image...
+
+setlocal EnableDelayedExpansion
+set PS=
+for %%a in (%PORTS%) do (
+  set PS=!PS! -p %%a:%%a
+)
+
+docker create --name ejabberd --hostname localhost %PS% %VOLUMES% %IMAGE%
+
+echo.
+echo === Installation completed.
+echo.
+pause
+
+EXIT /B %ERRORLEVEL%
+
+::===============================================================
+:: Function to create preliminary container
+::
+::===============================================================
+
+:create-ejabberd-pre
+
+echo.
+echo === Creating a preliminary 'ejabberd-pre' container using %IMAGE% image...
+docker create --name ejabberd-pre --hostname localhost %IMAGE%
+
+echo.
+echo === Now 'ejabberd-pre' will be started.
+docker container start ejabberd-pre
+
+echo.
+echo === Waiting ejabberd to be running...
+set /A timeout = 10
+set status=4
+goto :while
+
+:statusstart
+docker exec -it ejabberd-pre ejabberdctl status
+goto :statusend
+
+:while
+if %status% GTR 0 (
+   echo.
+   timeout /t 1 /nobreak >NUL
+   set /A timeout = timeout - 1
+   if %timeout% EQU 0 (
+      set status=-1
+   ) else (
+      goto :statusstart
+      :statusend
+      set status=%ERRORLEVEL%
+   )
+   goto :while
+)
+
+echo.
+echo === Setting a few options...
+docker exec -it ejabberd-pre sed -i "s!- localhost!- %HOST%!g" conf/ejabberd.yml
+docker exec -it ejabberd-pre sed -i "s!^acl:!acl:\n  admin:\n    user:\n      - \"%USER%@%HOST%\"!g" conf/ejabberd.yml
+docker exec -it ejabberd-pre sed -i "s!5280!5180!g" conf/ejabberd.yml
+docker exec -it ejabberd-pre sed -i "s!/admin!/!g" conf/ejabberd.yml
+docker exec -it ejabberd-pre ejabberdctl reload_config
+
+echo.
+echo === Registering the administrator account...
+docker exec -it ejabberd-pre ejabberdctl register %USER% %HOST% %PASSWORD%
+docker exec -it ejabberd-pre ejabberdctl stop
+
+echo.
+echo === Copying conf, database, logs...
+mkdir %INSTALL_DIR%
+mkdir %INSTALL_DIR%\conf
+mkdir %INSTALL_DIR%\database
+mkdir %INSTALL_DIR%\logs
+mkdir %INSTALL_DIR%\ejabberd-modules
+docker cp ejabberd-pre:/opt/ejabberd/conf/ %INSTALL_DIR%
+docker cp ejabberd-pre:/opt/ejabberd/database/ %INSTALL_DIR%
+docker cp ejabberd-pre:/opt/ejabberd/logs/ %INSTALL_DIR%
+
+echo.
+echo === Deleting the preliminary 'ejabberd-pre' container...
+docker stop ejabberd-pre
+docker rm ejabberd-pre
+
+EXIT /B 0

.github/container/ejabberd.yml.example

@@ -0,0 +1,289 @@
+###
+###              ejabberd configuration file
+###
+### The parameters used in this configuration file are explained at
+###
+###       https://docs.ejabberd.im/admin/configuration
+###
+### The configuration file is written in YAML.
+### *******************************************************
+### *******           !!! WARNING !!!               *******
+### *******     YAML IS INDENTATION SENSITIVE       *******
+### ******* MAKE SURE YOU INDENT SECTIONS CORRECTLY *******
+### *******************************************************
+### Refer to http://en.wikipedia.org/wiki/YAML for the brief description.
+###
+
+define_macro:
+  HOST: localhost
+  ## ADMIN: ... # set by /usr/local/bin/ejabberdctl
+  PORT_C2S: 5222
+  PORT_C2S_TLS: 5223
+  PORT_S2S: 5269
+  PORT_HTTP_TLS: 5443
+  PORT_HTTP: 5280
+  PORT_BROWSER: 1880
+  PORT_STUN: 5478
+  PORT_TURN_MIN: 50000
+  PORT_TURN_MAX: 50099
+  PORT_MQTT: 1883
+  PORT_PROXY65: 7777
+  STARTTLS_REQUIRED: true
+
+hosts:
+  - HOST
+
+loglevel: info
+
+## If you already have certificates, list them here
+# certfiles:
+#  - /etc/letsencrypt/live/domain.tld/fullchain.pem
+#  - /etc/letsencrypt/live/domain.tld/privkey.pem
+
+ca_file: /opt/ejabberd/conf/cacert.pem
+certfiles:
+  - /opt/ejabberd/conf/server.pem
+
+listen:
+  -
+    port: PORT_C2S
+    ip: "::"
+    module: ejabberd_c2s
+    max_stanza_size: 262144
+    shaper: c2s_shaper
+    access: c2s
+    starttls_required: STARTTLS_REQUIRED
+  -
+    port: PORT_C2S_TLS
+    ip: "::"
+    module: ejabberd_c2s
+    max_stanza_size: 262144
+    shaper: c2s_shaper
+    access: c2s
+    tls: true
+  -
+    port: PORT_S2S
+    ip: "::"
+    module: ejabberd_s2s_in
+    max_stanza_size: 524288
+    shaper: s2s_shaper
+  -
+    port: PORT_HTTP_TLS
+    ip: "::"
+    module: ejabberd_http
+    tls: true
+    request_handlers:
+      /admin: ejabberd_web_admin
+      /api: mod_http_api
+      /bosh: mod_bosh
+      /captcha: ejabberd_captcha
+      /upload: mod_http_upload
+      /websocket: ejabberd_http_ws
+  -
+    port: PORT_HTTP
+    ip: "::"
+    module: ejabberd_http
+    request_handlers:
+      /admin: ejabberd_web_admin
+      /.well-known/acme-challenge: ejabberd_acme
+  -
+    port: PORT_BROWSER
+    ip: "::"
+    module: ejabberd_http
+    request_handlers:
+      /: ejabberd_web_admin
+  -
+    port: "unix:../sockets/ctl_over_http.sock"
+    module: ejabberd_http
+    unix_socket:
+      mode: '0600'
+    request_handlers:
+      /ctl: ejabberd_ctl
+  -
+    port: PORT_STUN
+    ip: "::"
+    transport: udp
+    module: ejabberd_stun
+    use_turn: true
+    turn_min_port: PORT_TURN_MIN
+    turn_max_port: PORT_TURN_MAX
+    ## The server's public IPv4 address:
+    # turn_ipv4_address: "203.0.113.3"
+    ## The server's public IPv6 address:
+    # turn_ipv6_address: "2001:db8::3"
+  -
+    port: PORT_MQTT
+    ip: "::"
+    module: mod_mqtt
+    backlog: 1000
+
+s2s_use_starttls: optional
+
+acl:
+  local:
+    user_regexp: ""
+  loopback:
+    ip:
+      - 127.0.0.0/8
+      - ::1/128
+  admin:
+    user:
+      - ADMIN
+
+access_rules:
+  local:
+    allow: local
+  c2s:
+    deny: blocked
+    allow: all
+  announce:
+    allow: admin
+  configure:
+    allow: admin
+  muc_create:
+    allow: local
+  pubsub_createnode:
+    allow: local
+  trusted_network:
+    allow: loopback
+
+api_permissions:
+  "console commands":
+    from: ejabberd_ctl
+    who: all
+    what: "*"
+  "webadmin commands":
+    from: ejabberd_web_admin
+    who: admin
+    what: "*"
+  "adhoc commands":
+    from: mod_adhoc_api
+    who: admin
+    what: "*"
+  "http access":
+    from: mod_http_api
+    who:
+      access:
+        allow:
+          - acl: loopback
+          - acl: admin
+      oauth:
+        scope: "ejabberd:admin"
+        access:
+          allow:
+            - acl: loopback
+            - acl: admin
+    what:
+      - "*"
+      - "!stop"
+      - "!start"
+  "public commands":
+    who:
+      ip: 127.0.0.1/8
+    what:
+      - status
+      - connected_users_number
+
+shaper:
+  normal:
+    rate: 3000
+    burst_size: 20000
+  fast: 100000
+
+shaper_rules:
+  max_user_sessions: 10
+  max_user_offline_messages:
+    5000: admin
+    100: all
+  c2s_shaper:
+    none: admin
+    normal: all
+  s2s_shaper: fast
+
+modules:
+  mod_adhoc: {}
+  mod_adhoc_api: {}
+  mod_admin_extra: {}
+  mod_announce:
+    access: announce
+  mod_avatar: {}
+  mod_blocking: {}
+  mod_bosh: {}
+  mod_caps: {}
+  mod_carboncopy: {}
+  mod_client_state: {}
+  mod_configure: {}
+  mod_disco: {}
+  mod_fail2ban: {}
+  mod_http_api: {}
+  mod_http_upload:
+    put_url: https://@HOST_URL_ENCODE@:5443/upload
+    custom_headers:
+      "Access-Control-Allow-Origin": "https://@HOST@"
+      "Access-Control-Allow-Methods": "GET,HEAD,PUT,OPTIONS"
+      "Access-Control-Allow-Headers": "Content-Type"
+  mod_last: {}
+  mod_mam:
+    ## Mnesia is limited to 2GB, better to use an SQL backend
+    ## For small servers SQLite is a good fit and is very easy
+    ## to configure. Uncomment this when you have SQL configured:
+    ## db_type: sql
+    assume_mam_usage: true
+    default: always
+  mod_mqtt: {}
+  mod_muc:
+    access:
+      - allow
+    access_admin:
+      - allow: admin
+    access_create: muc_create
+    access_persistent: muc_create
+    access_mam:
+      - allow
+    default_room_options:
+      mam: true
+  mod_muc_admin: {}
+  mod_offline:
+    access_max_user_messages: max_user_offline_messages
+  mod_ping: {}
+  mod_privacy: {}
+  mod_private: {}
+  mod_proxy65:
+    access: local
+    max_connections: 5
+    port: PORT_PROXY65
+  mod_pubsub:
+    access_createnode: pubsub_createnode
+    plugins:
+      - flat
+      - pep
+    force_node_config:
+      ## Avoid buggy clients to make their bookmarks public
+      storage:bookmarks:
+        access_model: whitelist
+  mod_push: {}
+  mod_push_keepalive: {}
+  mod_register:
+    ## Only accept registration requests from the "trusted"
+    ## network (see access_rules section above).
+    ## Think twice before enabling registration from any
+    ## address. See the Jabber SPAM Manifesto for details:
+    ## https://github.com/ge0rg/jabber-spam-fighting-manifesto
+    ip_access: trusted_network
+  mod_roster:
+    versioning: true
+  mod_s2s_bidi: {}
+  mod_s2s_dialback: {}
+  mod_shared_roster: {}
+  mod_stream_mgmt:
+    resend_on_timeout: if_offline
+  mod_stun_disco: {}
+  mod_vcard: {}
+  mod_vcard_xupdate: {}
+  mod_version:
+    show_os: false
+
+### Local Variables:
+### mode: yaml
+### End:
+### vim: set filetype=yaml tabstop=8

.github/container/ejabberdctl.template

@@ -15,10 +15,10 @@ SCRIPT_DIR="$(cd "$(dirname "$SCRIPT")" && pwd -P)"
 # shellcheck disable=SC2034
 ERTS_VSN="{{erts_vsn}}"
 ERL="{{erl}}"
-IEX="{{bindir}}/iex"
 EPMD="{{epmd}}"
-[ -z "$ERLANG_COOKIE" ] && ERL_OPTIONS="-setcookie $(cat "${SCRIPT_DIR%/*}/releases/COOKIE")"
-[ -n "$ERLANG_COOKIE" ] && [ ! -f "$HOME"/.erlang.cookie ] && echo "$ERLANG_COOKIE" > "$HOME"/.erlang.cookie && chmod 400 "$HOME"/.erlang.cookie 
+IEX="{{iexpath}}"
+COOKIE_FILE="$HOME"/.erlang.cookie
+[ -n "$ERLANG_COOKIE" ] && [ ! -f "$COOKIE_FILE" ] && echo "$ERLANG_COOKIE" > "$COOKIE_FILE" && chmod 400 "$COOKIE_FILE"
 
 # check the proper system user is used
 case $(id -un) in
@@ -60,7 +60,6 @@ done
 # define ejabberd variables if not already defined from the command line
 : "${CONFIG_DIR:="{{config_dir}}"}"
 : "${LOGS_DIR:="{{logs_dir}}"}"
-: "${SPOOL_DIR:="{{spool_dir}}"}"
 : "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
 : "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
 # Allows passing extra Erlang command-line arguments in vm.args file
@@ -68,20 +67,30 @@ done
 # shellcheck source=ejabberdctl.cfg.example
 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
 [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
+[ "$ERLANG_NODE" = "${ERLANG_NODE%@*}" ] && ERLANG_NODE="$ERLANG_NODE@$(hostname -s)"
 [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
+: "${SPOOL_DIR:="{{spool_dir}}"}"
 : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
 
+# backward support for old mnesia spool dir path
+: "${SPOOL_DIR_OLD:="$SPOOL_DIR/$ERLANG_NODE"}"
+[ -r "$SPOOL_DIR_OLD/schema.DAT" ] && [ ! -r "$SPOOL_DIR/schema.DAT" ] && SPOOL_DIR="$SPOOL_DIR_OLD"
+
 # define erl parameters
 ERLANG_OPTS="+K $POLL +P $ERL_PROCESSES $ERL_OPTIONS"
 if [ -n "$FIREWALL_WINDOW" ] ; then
     ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
 fi
 if [ -n "$INET_DIST_INTERFACE" ] ; then
-    INET_DIST_INTERFACE2=$("$ERL" -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt)
+    INET_DIST_INTERFACE2=$("$ERL" $ERLANG_OPTS -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt)
     if [ -n "$INET_DIST_INTERFACE2" ] ; then
+        if [ "$(echo "$INET_DIST_INTERFACE2" | grep -o "," | wc -l)" -eq 7 ] ; then
+            INET_DIST_INTERFACE2="$INET_DIST_INTERFACE2 -proto_dist inet6_tcp"
+        fi
         ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
     fi
 fi
+[ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -erl_epmd_port $ERL_DIST_PORT -start_epmd false"
 # if vm.args file exists in config directory, pass it to Erlang VM
 [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS"
 ERL_LIBS='{{libdir}}'
@@ -89,9 +98,12 @@ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
 ERL_INETRC="$CONFIG_DIR"/inetrc
 
 # define ejabberd parameters
-EJABBERD_OPTS="$EJABBERD_OPTS\
-$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")"
+EJABBERD_OPTS="\
+$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_window_time/!d;s/:[ \t]*\([0-9]*[a-z]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$EJABBERD_OPTS"
 [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS"
 EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd"
 
@@ -101,6 +113,7 @@ export EJABBERD_LOG_PATH
 export EJABBERD_PID_PATH
 export ERL_CRASH_DUMP
 export ERL_EPMD_ADDRESS
+export ERL_DIST_PORT
 export ERL_INETRC
 export ERL_MAX_PORTS
 export ERL_MAX_ETS_TABLES
@@ -109,6 +122,14 @@ export CONTRIB_MODULES_CONF_DIR
 export ERL_LIBS
 export SCRIPT_DIR
 
+# Only required for Erlang/OTP 25:
+export ERL_FLAGS="$ERL_FLAGS -enable-feature maybe_expr"
+
+set_dist_client()
+{
+    [ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -dist_listen false"
+}
+
 # run command either directly or via su $INSTALLUSER
 run_cmd()
 {
@@ -119,9 +140,19 @@ run_cmd()
 }
 exec_cmd()
 {
-    case $EXEC_CMD in
-        as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
-        as_current_user) exec "$@" ;;
+    case $EXEC_CMD,$(uname -s) in
+        as_install_user,OpenBSD)
+            su -s /bin/sh "$INSTALLUSER" -c 'exec "$0" "$@"' "$@"
+            ;;
+        as_install_user,NetBSD)
+            su "$INSTALLUSER" -c 'exec "$0" "$@"' -- "$@"
+            ;;
+        as_install_user,*)
+            su -s /bin/sh -c 'exec "$0" "$@"' "$INSTALLUSER" -- "$@"
+            ;;
+        as_current_user,*)
+            "$@"
+            ;;
     esac
 }
 run_erl()
@@ -153,9 +184,11 @@ debugwarning()
         echo "Please be extremely cautious with your actions,"
         echo "and exit immediately if you are not completely sure."
         echo ""
-        echo "To detach this shell from ejabberd, press:"
-        echo "  control+c, control+c"
+        echo "To exit and detach this shell from ejabberd, press:"
+        echo "  control+g and then q"
         echo ""
+        #vt100 echo "Please do NOT use control+c in this debug shell !"
+        #vt100 echo ""
         echo "--------------------------------------------------------------------"
         echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
         echo "  EJABBERD_BYPASS_WARNINGS=true"
@@ -176,8 +209,10 @@ livewarning()
         echo "Please be extremely cautious with your actions,"
         echo "and exit immediately if you are not completely sure."
         echo ""
-        echo "To exit this LIVE mode and stop ejabberd, press:"
-        echo "  q().  and press the Enter key"
+        echo "To stop ejabberd gracefully:"
+        echo "  ejabberd:stop()."
+        echo "To quit erlang immediately, press:"
+        echo "  control+g and then q"
         echo ""
         echo "--------------------------------------------------------------------"
         echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
@@ -188,6 +223,39 @@ livewarning()
     fi
 }
 
+check_etop_result()
+{
+    result=$?
+    if [ $result -eq 1 ] ; then
+        echo ""
+        echo "It seems there was some problem running 'ejabberdctl etop'."
+        echo "Is the error message something like this?"
+        echo "  Failed to load module 'etop' because it cannot be found..."
+        echo "Then probably ejabberd was compiled with development tools disabled."
+        echo "To use 'etop', recompile ejabberd with: ./configure --enable-tools"
+        echo ""
+        exit $result
+    fi
+}
+
+check_iex_result()
+{
+    result=$?
+    if [ $result -eq 127 ] ; then
+        echo ""
+        echo "It seems there was some problem finding 'iex' binary from Elixir."
+        echo "Probably ejabberd was compiled with Rebar3 and Elixir disabled, like:"
+        echo "  ./configure"
+        echo "which is equivalent to:"
+        echo "  ./configure --with-rebar=rebar3 --disable-elixir"
+        echo "To use 'iex', recompile ejabberd enabling Elixir or using Mix:"
+        echo "  ./configure --enable-elixir"
+        echo "  ./configure --with-rebar=mix"
+        echo ""
+        exit $result
+    fi
+}
+
 help()
 {
     echo ""
@@ -216,21 +284,40 @@ help()
 }
 
 # dynamic node name helper
-uid()
-{
-    uuid=$(uuidgen 2>/dev/null)
-    random=$(awk 'BEGIN { srand(); print int(rand()*32768) }' /dev/null)
-    [ -z "$uuid" ] && [ -f /proc/sys/kernel/random/uuid ] && uuid=$(cat /proc/sys/kernel/random/uuid)
-    [ -z "$uuid" ] && uuid=$(printf "%X" "${random:-$$}$(date +%M%S)")
-    uuid=$(printf '%s' $uuid | sed 's/^\(...\).*$/\1/')
-    [ $# -eq 0 ] && echo "${uuid}-${ERLANG_NODE}"
-    [ $# -eq 1 ] && echo "${uuid}-${1}-${ERLANG_NODE}"
-    [ $# -eq 2 ] && echo "${uuid}-${1}@${2}"
+uid() {
+  ERTSVERSION="$("$ERL" -version 2>&1 | sed 's|.* \([0-9]*[0-9]\).*|\1|g')"
+  if [ $ERTSVERSION -lt 11 ] ; then # otp 23.0 includes erts 11.0
+    # Erlang/OTP lower than 23, which doesn's support dynamic node code
+    N=1
+    PF=$(( $$ % 97 ))
+    while
+      case $# in
+        0) NN="${PF}-${N}-${ERLANG_NODE}"
+          ;;
+        1) NN="${PF}-${N}-${1}-${ERLANG_NODE}"
+          ;;
+        2) NN="${PF}-${N}-${1}@${2}"
+          ;;
+      esac
+      N=$(( N + 1 + ( $$ % 5 ) ))
+      "$EPMD" -names 2>/dev/null | grep -q " ${NN%@*} "
+    do :; done
+    echo $NN
+  else
+    # Erlang/OTP 23 or higher: use native dynamic node code
+    # https://www.erlang.org/patches/otp-23.0#OTP-13812
+    if [ "$ERLANG_NODE" != "${ERLANG_NODE%.*}" ]; then
+      echo "undefined@${ERLANG_NODE#*@}"
+    else
+      echo "undefined"
+    fi
+  fi
 }
 
 # stop epmd if there is no other running node
 stop_epmd()
 {
+    [ -n "$ERL_DIST_PORT" ] && return
     "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
 }
 
@@ -238,6 +325,19 @@ stop_epmd()
 # if all ok, ensure runtime directory exists and make it current directory
 check_start()
 {
+    ECSIMAGE_DBPATH=$HOME/database/$ERLANG_NODE
+    [ ! -d "$ECSIMAGE_DBPATH" ] && ln -s $HOME/database $HOME/database/$ERLANG_NODE
+    [ -n "$ERL_DIST_PORT" ] && {
+        netstat -nl | grep ":5210" >/dev/null && {
+            echo "Error: The file ejabberdctl.cfg has configured ERL_DIST_PORT=$ERL_DIST_PORT"
+            echo "       but the port 5210 is already in use."
+            echo "       Stop that program or configure a different ERL_DIST_PORT"
+            echo ""
+            netstat -nlp | grep ":5210"
+            echo ""
+        }
+        return
+    }
     "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
         pgrep -f "$ERLANG_NODE" >/dev/null && {
             echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
@@ -270,14 +370,32 @@ post_waiter_loop()
     LIST=$@
     HEAD=${LIST%% ; *}
     TAIL=${LIST#* ; }
-    echo ":> ejabberdctl $HEAD"
-    $0 $HEAD
+    HEAD2=${HEAD#\! *}
+    echo ":> ejabberdctl $HEAD2"
+    $0 $HEAD2
+    ctlstatus=$?
+    if [ $ctlstatus -ne 0 ] ; then
+        if [ "$HEAD" != "$HEAD2" ] ; then
+            echo ":> FAILURE in command '$HEAD2' !!! Ignoring result"
+        else
+            echo ":> FAILURE in command '$HEAD' !!! Stopping ejabberd..."
+            $0 halt > /dev/null
+            exit $ctlstatus
+        fi
+    fi
     [ "$HEAD" = "$TAIL" ] || post_waiter_loop $TAIL
 }
 
 # allow sync calls
 wait_status()
 {
+    wait_status_node "$ERLANG_NODE" $1 $2 $3
+}
+
+wait_status_node()
+{
+    CONNECT_NODE=$1
+    shift
     # args: status try delay
     # return: 0 OK, 1 KO
     timeout="$2"
@@ -288,14 +406,71 @@ wait_status()
         if [ $timeout -eq 0 ] ; then
             status="$1"
         else
-            run_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
-                     -extra "$ERLANG_NODE" $NO_TIMEOUT status > /dev/null
+            run_erl "$(uid ctl)" -hidden -noinput \
+                     -eval 'net_kernel:connect_node('"'$CONNECT_NODE'"')' \
+                     -s ejabberd_ctl \
+                     -extra "$CONNECT_NODE" $NO_TIMEOUT status > /dev/null
             status="$?"
         fi
     done
     [ $timeout -gt 0 ]
 }
 
+exec_other_command()
+{
+    exec_other_command_node $ERLANG_NODE "$@"
+}
+
+exec_other_command_node()
+{
+    CONNECT_NODE=$1
+    shift
+    if [ -z "$CTL_OVER_HTTP" ] || [ ! -S "$CTL_OVER_HTTP" ] \
+        || [ ! -x "$(command -v curl)" ] || [ -z "$1" ] || [ "$1" = "help" ] \
+        || [ "$1" = "mnesia_info_ctl" ]|| [ "$1" = "print_sql_schema" ] ; then
+        run_erl "$(uid ctl)" -hidden -noinput \
+                 -eval 'net_kernel:connect_node('"'$CONNECT_NODE'"')' \
+                 -s ejabberd_ctl \
+                 -extra "$CONNECT_NODE" $NO_TIMEOUT "$@"
+        result=$?
+        case $result in
+            3) help;;
+            *) :;;
+        esac
+        return $result
+    else
+        exec_ctl_over_http_socket "$@"
+    fi
+}
+
+exec_ctl_over_http_socket()
+{
+    COMMAND=${1}
+    CARGS=""
+    while [ $# -gt 0 ]; do
+        [ -z "$CARGS" ] && CARGS="[" || CARGS="${CARGS}, "
+        CARGS="${CARGS}\"$1\""
+        shift
+    done
+    CARGS="${CARGS}]"
+    TEMPHEADERS=temp-headers.log
+    curl \
+        --unix-socket ${CTL_OVER_HTTP} \
+        --header "Content-Type: application/json" \
+        --header "Accept: application/json" \
+        --data "${CARGS}" \
+        --dump-header ${TEMPHEADERS} \
+        --no-progress-meter \
+        "http://localhost/ctl/${COMMAND}"
+    result=$(sed -n 's/.*status-code: \([0-9]*\).*/\1/p' < $TEMPHEADERS)
+    rm ${TEMPHEADERS}
+    case $result in
+        2|3) exec_other_command help ${COMMAND};;
+        *) :;;
+    esac
+    exit $result
+}
+
 # ensure we can change current directory to SPOOL_DIR
 [ -f "$SPOOL_DIR/schema.DAT" ] || FIRST_RUN=true
 [ -d "$SPOOL_DIR" ] || run_cmd mkdir -p "$SPOOL_DIR"
@@ -304,6 +479,103 @@ cd "$SPOOL_DIR" || {
     exit 6
 }
 
+printe()
+{
+    printf "\n"
+    printf "\e[1;40;32m==> %s\e[0m\n" "$1"
+}
+
+## Function copied from tools/make-installers
+user_agrees()
+{
+    question="$*"
+
+    if [ -t 0 ]
+    then
+        printe "$question (y/n) [n]"
+        read -r response
+        case "$response" in
+        [Yy]|[Yy][Ee][Ss])
+            return 0
+            ;;
+        [Nn]|[Nn][Oo]|'')
+            return 1
+            ;;
+        *)
+            echo 'Please respond with "yes" or "no".'
+            user_agrees "$question"
+            ;;
+        esac
+    else # Assume 'yes' if not running interactively.
+        return 0
+    fi
+}
+
+mnesia_change()
+{
+    ERLANG_NODE_OLD="$1"
+    [ "$ERLANG_NODE_OLD" = "" ] \
+        && echo "Error: Please provide the old erlang node name, for example:" \
+        && echo "  ejabberdctl mnesia_change ejabberd@oldmachine" \
+        && exit 1
+
+    SPOOL_DIR_BACKUP=$SPOOL_DIR/$ERLANG_NODE_OLD-backup/
+    OLDFILE=$SPOOL_DIR_BACKUP/$ERLANG_NODE_OLD.backup
+    NEWFILE=$SPOOL_DIR_BACKUP/$ERLANG_NODE.backup
+
+    printe "This changes your mnesia database from node name '$ERLANG_NODE_OLD' to '$ERLANG_NODE'"
+
+    [ -d "$SPOOL_DIR_BACKUP" ] && printe "WARNING! A backup of old node already exists in $SPOOL_DIR_BACKUP"
+
+    if ! user_agrees "Do you want to proceed?"
+    then
+        echo 'Operation aborted.'
+        exit 1
+    fi
+
+    printe "Starting ejabberd with old node name $ERLANG_NODE_OLD ..."
+    exec_erl "$ERLANG_NODE_OLD" $EJABBERD_OPTS -detached
+    wait_status_node $ERLANG_NODE_OLD 0 30 2
+    result=$?
+    case $result in
+        1) echo "There was a problem starting ejabberd with the old erlang node name. " \
+            && echo "Check for log errors in $EJABBERD_LOG_PATH" \
+            && exit $result;;
+        *) :;;
+    esac
+    exec_other_command_node $ERLANG_NODE_OLD "status"
+
+    printe "Making backup of old database to file $OLDFILE ..."
+    mkdir $SPOOL_DIR_BACKUP
+    exec_other_command_node $ERLANG_NODE_OLD backup "$OLDFILE"
+
+    printe "Changing node name in new backup file $NEWFILE ..."
+    exec_other_command_node $ERLANG_NODE_OLD mnesia_change_nodename "$ERLANG_NODE_OLD" "$ERLANG_NODE" "$OLDFILE" "$NEWFILE"
+
+    printe "Stopping old ejabberd..."
+    exec_other_command_node $ERLANG_NODE_OLD "stop"
+    wait_status_node $ERLANG_NODE_OLD 3 30 2 && stop_epmd
+
+    printe "Moving old mnesia spool files to backup subdirectory $SPOOL_DIR_BACKUP ..."
+    mv $SPOOL_DIR/*.DAT $SPOOL_DIR_BACKUP
+    mv $SPOOL_DIR/*.DCD $SPOOL_DIR_BACKUP
+    mv $SPOOL_DIR/*.LOG $SPOOL_DIR_BACKUP
+
+    printe "Starting ejabberd with new node name $ERLANG_NODE ..."
+    exec_erl "$ERLANG_NODE" $EJABBERD_OPTS -detached
+    wait_status 0 30 2
+    exec_other_command "status"
+
+    printe "Installing fallback of new mnesia..."
+    exec_other_command install_fallback "$NEWFILE"
+
+    printe "Stopping new ejabberd..."
+    exec_other_command "stop"
+    wait_status 3 30 2 && stop_epmd
+
+    printe "Finished, now you can start ejabberd normally"
+}
+
 # main
 case $1 in
     start)
@@ -326,44 +598,55 @@ case $1 in
         ;;
     debug)
         debugwarning
+        set_dist_client
         exec_erl "$(uid debug)" -hidden -remsh "$ERLANG_NODE"
         ;;
     etop)
-        exec_erl "$(uid top)" -hidden -node "$ERLANG_NODE" -s etop \
-                 -s erlang halt -output text
+        set_dist_client
+        exec_erl "$(uid top)" -hidden -remsh "$ERLANG_NODE" \
+                 -eval 'net_kernel:connect_node('"'$ERLANG_NODE'"')' \
+                 -s etop \
+                 -output text
+        check_etop_result
         ;;
     iexdebug)
         debugwarning
+        set_dist_client
         exec_iex "$(uid debug)" --remsh "$ERLANG_NODE"
+        check_iex_result
         ;;
     iexlive)
         livewarning
-        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS" --app ejabberd
+        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS"
+        check_iex_result
         ;;
     ping)
         PEER=${2:-$ERLANG_NODE}
         [ "$PEER" = "${PEER%.*}" ] && PS="-s"
+        set_dist_client
         exec_cmd "$ERL" ${PS:--}name "$(uid ping "$(hostname $PS)")" $ERLANG_OPTS \
-                 -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
-                 -s erlang halt -output text
+                 -noinput -hidden \
+                 -eval 'net_kernel:connect_node('"'$PEER'"')' \
+                 -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
+                 -eval 'halt(case net_adm:ping('"'$PEER'"') of pong -> 0; pang -> 1 end).' \
+                 -output text
         ;;
     started)
+        set_dist_client
         wait_status 0 30 2 # wait 30x2s before timeout
         ;;
     stopped)
+        set_dist_client
         wait_status 3 30 2 && stop_epmd # wait 30x2s before timeout
         ;;
+    mnesia_change)
+        mnesia_change $2
+        ;;
     post_waiter)
         post_waiter_waiting
         ;;
     *)
-        run_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
-                 -extra "$ERLANG_NODE" $NO_TIMEOUT "$@"
-        result=$?
-        case $result in
-            2|3) help;;
-            *) :;;
-        esac
-        exit $result
+        set_dist_client
+        exec_other_command "$@"
         ;;
 esac

.github/dependabot.yml

@@ -1,18 +0,0 @@
-version: 2
-
-updates:
-
-  - package-ecosystem: "docker"
-    directory: "/.github/container/"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "mix"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     paths-ignore:
     - '.devcontainer/**'
-    - 'examples/**'
     - 'lib/**'
     - 'man/**'
     - 'priv/**'
@@ -12,190 +11,237 @@ on:
   pull_request:
     paths-ignore:
     - '.devcontainer/**'
-    - 'examples/**'
     - 'lib/**'
     - 'man/**'
     - 'priv/**'
     - '**.md'
 
+env:
+  DEV: _build/dev/rel/ejabberd
+
 jobs:
 
-  tests:
-    name: Tests
+  ############################################################### Compile #####
+
+  compile:
+    runs-on: ubuntu-24.04-arm
     strategy:
-      fail-fast: false
       matrix:
-        otp: ['19.3', '24', '25.0-rc3']
-        include:
-        - otp: '19.3'
-          rebar: 2
-          os: ubuntu-18.04
-        - otp: '24'
-          rebar: 3
-          os: ubuntu-20.04
-        - otp: '25.0-rc3'
-          rebar: 3
-          os: ubuntu-20.04
-    runs-on: ${{ matrix.os }}
-    services:
-      redis:
-        image: redis
-        ports:
-        - 6379:6379
+        otp: ['28']
 
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
-    - name: Test shell scripts
-      if: matrix.otp == 24
-      run: |
-        shellcheck test/ejabberd_SUITE_data/gencerts.sh
-        shellcheck tools/captcha.sh
-        shellcheck ejabberd.init.template
-        shellcheck -x ejabberdctl.template
-
-    - name: Get specific Erlang/OTP
-      uses: ErlGang/setup-erlang@master
-      if: matrix.otp != 24
+    - uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ matrix.otp }}
 
-    - name: Get a compatible Rebar
-      if: matrix.rebar == 2
-      run: |
-        rm rebar
-        wget https://github.com/processone/ejabberd/raw/21.12/rebar
-        chmod +x rebar
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: libexpat1-dev libgd-dev libpam0g-dev
+                  libsqlite3-dev libwebp-dev libyaml-dev
 
-    - name: Prepare databases
-      run: |
-        sudo systemctl start mysql.service
-        sudo systemctl start postgresql.service
-        mysql -u root -proot -e "CREATE USER 'ejabberd_test'@'localhost'
-                                 IDENTIFIED BY 'ejabberd_test';"
-        mysql -u root -proot -e "CREATE DATABASE ejabberd_test;"
-        mysql -u root -proot -e "GRANT ALL ON ejabberd_test.*
-                                 TO 'ejabberd_test'@'localhost';"
-        mysql -u root -proot ejabberd_test < sql/mysql.sql
-        pg_isready
-        sudo -u postgres psql -c "CREATE USER ejabberd_test
-                                  WITH PASSWORD 'ejabberd_test';"
-        sudo -u postgres psql -c "CREATE DATABASE ejabberd_test;"
-        sudo -u postgres psql ejabberd_test -f sql/pg.sql
-        sudo -u postgres psql -c "GRANT ALL PRIVILEGES
-                                  ON DATABASE ejabberd_test TO ejabberd_test;"
-        sudo -u postgres psql ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL
-                                                TABLES IN SCHEMA public
-                                                TO ejabberd_test;"
-        sudo -u postgres psql ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL
-                                                SEQUENCES IN SCHEMA public
-                                                TO ejabberd_test;"
-
-    - name: Prepare libraries
-      run: |
-        sudo apt-get -qq update
-        sudo apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
-                                 libsqlite3-dev libwebp-dev libyaml-dev
-
-    - name: Prepare rebar
-      run: |
-        echo '{xref_ignores, [{eldap_filter_yecc, return_error, 2}
-                             ]}.' >>rebar.config
-        echo '{xref_checks, [deprecated_function_calls, deprecated_functions,
-              locals_not_used, undefined_function_calls, undefined_functions]}.
-              % Disabled: exports_not_used,' >>rebar.config
-        echo '{dialyzer, [{get_warnings, true}, {plt_extra_apps, [cache_tab,
-              eimp, epam, esip, ezlib, fast_tls, fast_xml, fast_yaml,
-              mqtree, p1_acme, p1_mysql, p1_oauth2, p1_pgsql, p1_utils, pkix,
-              sqlite3, stringprep, stun, xmpp, yconf]} ]}.' >>rebar.config
-        echo '{ct_extra_params, "-verbosity 20"}.' >>rebar.config
-        echo "{ct_opts, [{verbosity, 20}, {keep_logs, 20}]}." >>rebar.config
-
-    - name: Cache rebar
-      uses: actions/cache@v3
+    - name: Cache rebar3
+      uses: actions/cache@v5
       with:
         path: |
-          deps/
-          dialyzer/
-          ebin/
           ~/.cache/rebar3/
-        key: ${{matrix.otp}}-${{matrix.rebar}}-${{hashFiles('rebar.config')}}
-
-    - name: Download test logs
-      if: matrix.otp == 24 && github.repository == 'processone/ejabberd'
-      continue-on-error: true
-      run: |
-        mkdir -p _build/test
-        curl -sSL https://github.com/processone/ecil/tarball/gh-pages |
-          tar -C _build/test --strip-components=1 --wildcards -xzf -
-        rm -rf _build/test/logs/last/
+          _build/default/lib/
+        key: ci-${{ matrix.otp }}-${{hashFiles('rebar.*')}}
 
     - name: Compile
-      run: |
-        ./autogen.sh
-        [[ ${{ matrix.rebar }} = 2 ]] && REBAR=rebar || REBAR=`which rebar3`
-        ./configure --with-rebar=$REBAR \
-                    --prefix=/tmp/ejabberd \
-                    --enable-all \
-                    --disable-elixir \
-                    --disable-mssql \
-                    --disable-odbc
-        make update
-        make
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: compile
+        tool: rebar3
+        configure: --disable-elixir
+
+    - name: Compress compiled.tar
+      run: |
+        tar -cvf /tmp/compiled.tar .
+
+    - uses: actions/upload-artifact@v6
+      with:
+        name: compiled-${{ matrix.otp }}
+        path: /tmp/compiled.tar
+        retention-days: 1
+
+  ########################################################## Static Tests #####
+
+  static:
+    needs: compile
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        otp: ['28']
+
+    steps:
+
+    - uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp }}
+
+    - uses: actions/download-artifact@v7
+      with:
+        name: compiled-${{ matrix.otp }}
+    - run: tar -xf compiled.tar
+
+    - name: Test shell scripts
+      run: |
+        shellcheck ejabberd.init.template
+        shellcheck -x ejabberdctl.template
+        shellcheck .vscode/relive.sh
+        shellcheck rel/setup-dev.sh
+        shellcheck rel/setup-relive.sh
+        shellcheck test/ejabberd_SUITE_data/gencerts.sh
+        shellcheck tools/captcha.sh
+        shellcheck tools/emacs-indent.sh
+        shellcheck tools/generate-doap.sh
+        shellcheck tools/prepare-tr.sh
+        shellcheck tools/rebar3-format.sh
 
-    - run: make install -s
     - run: make hooks
     - run: make options
     - run: make xref
-    - run: |
-        make dialyzer
-        [ ${{ matrix.rebar }} = 3 ] && true \
-          || { cat dialyzer/error.log ; test ! -s dialyzer/error.log ; }
+    - run: make dialyzer
+    - run: make testeunit
+    - run: make elvis
+      if: matrix.otp > '25'
 
-    - name: Check Production Release
-      if: matrix.rebar == 3
+    - run: make install -s
+
+  ######################################################### Dynamic Tests #####
+
+  dynamic:
+    needs: compile
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        otp: ['28']
+
+    steps:
+
+    - uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp }}
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      if: matrix.otp < '28'
+      with:
+        packages: libexpat1-dev libgd-dev libpam0g-dev
+                  libsqlite3-dev libwebp-dev libyaml-dev
+
+    - uses: actions/download-artifact@v7
+      with:
+        name: compiled-${{ matrix.otp }}
+    - run: tar -xf compiled.tar
+
+    - name: Check production release
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: deploy, start, stop, check
+
+    - name: Start development release
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: deploy, no_tls, start, register
+        username: user123
+
+    - name: Run XMPP Interoperability Tests against CI server
+      if: matrix.otp == '28'
+      continue-on-error: true
+      uses: XMPP-Interop-Testing/xmpp-interop-tests-action@v1.7.2
+      with:
+        domain: 'localhost'
+        adminAccountUsername: 'user123'
+        adminAccountPassword: 's0mePass'
+        disabledSpecifications: RFC6121,XEP-0030,XEP-0045,XEP-0054,XEP-0060,
+                                XEP-0080,XEP-0115,XEP-0118,XEP-0215,XEP-0347,
+                                XEP-0363,XEP-0384,XEP-0421
+
+    - name: Stop development release
+      if: always()
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: stop, check
+
+    - name: View production logs
+      if: always()
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: logs
+
+    - name: View development logs
+      if: always()
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: logs
+
+  ##################################################### Common Test Suite #####
+
+  ct:
+    needs: compile
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        otp: ['28']
+        backend: [agnostic, extauth, ldap, mnesia, mysql, pgsql, redis, sqlite]
+        schema: [single, multi]
+        exclude:
+        - backend: agnostic
+          schema: single
+        - backend: extauth
+          schema: single
+        - backend: ldap
+          schema: single
+        - backend: mnesia
+          schema: single
+        - backend: redis
+          schema: single
+
+    steps:
+
+    - uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp }}
+
+    - uses: actions/download-artifact@v7
+      with:
+        name: compiled-${{ matrix.otp }}
+    - run: tar -xf compiled.tar
+
+    - name: Prepare database
+      uses: ./.github/actions/manage-database
+      with:
+        for: ${{ matrix.backend }}
+        do: install, start, user, create
+
+    - name: Setup multihost SQL schema
+      if: matrix.schema == 'multi'
       run: |
-        make rel
-        RE=_build/prod/rel/ejabberd
-        $RE/bin/ejabberdctl start
-        $RE/bin/ejabberdctl started
-        $RE/bin/ejabberdctl stop
-        $RE/bin/ejabberdctl stopped
-        cat $RE/logs/ejabberd.log
-        grep -q "is stopped in" $RE/logs/ejabberd.log
+        sed -i 's|multihost_schema, false|multihost_schema, true|g' \
+            test/suite.erl
 
-    - name: Check Development Release
-      if: matrix.rebar == 3
-      run: |
-        make dev
-        RE=_build/dev/rel/ejabberd
-        $RE/bin/ejabberdctl start
-        $RE/bin/ejabberdctl started
-        $RE/bin/ejabberdctl stop
-        $RE/bin/ejabberdctl stopped
-        cat $RE/logs/ejabberd.log
-        grep -q "is stopped in" $RE/logs/ejabberd.log
-
-    - name: Run tests (OTP 19.3)
-      if: matrix.otp == '19.3'
-      id: ct2
-      run: make test
     - name: Run tests
-      if: matrix.otp != '19.3'
       id: ct
+      run: CT_BACKENDS=${{ matrix.backend }} make test
+
+    - name: Send to coveralls
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        (cd priv && ln -sf ../sql)
-        COMMIT=`echo $GITHUB_SHA | cut -c 1-7`
-        DATE=`date +%s`
-        REF_NAME=`echo $GITHUB_REF_NAME | tr "/" "_"`
-        NODENAME=$DATE@$GITHUB_RUN_NUMBER-$GITHUB_ACTOR-$REF_NAME-$COMMIT
-        LABEL=`git show -s --format=%s | cut -c 1-30`
-        rebar3 ct --name $NODENAME --label "$LABEL"
-        rebar3 cover
+        DIAGNOSTIC=1 ./rebar3 as test coveralls send
 
     - name: Check results
-      if: always() && (steps.ct.outcome != 'skipped' || steps.ct2.outcome != 'skipped')
+      if: always() && (steps.ct.outcome != 'skipped')
       id: ctresults
       run: |
         [[ -d _build ]] && ln -s _build/test/logs/last/ logs || true
@@ -204,20 +250,44 @@ jobs:
         grep -q 'TEST COMPLETE,.* 0 failed' logs/suite.log
         test $(find logs/ -empty -name error.log)
 
-    - name: View logs failures
-      if: failure() && steps.ctresults.outcome == 'failure'
+    - name: View logs
+      if: always()
       run: |
+        echo "::group::ejabberd.log"
+        find logs/ -name ejabberd.log -exec cat '{}' ';'
+        echo "::endgroup::"
+        echo "::group::error.log"
+        find logs/ -name error.log -exec cat '{}' ';'
+        echo "::endgroup::"
+        echo "::group::exunit.log"
+        find logs/ -name exunit.log -exec cat '{}' ';'
+        echo "::endgroup::"
+        echo "::group::suite.log (only failures)"
         cat logs/suite.log | awk \
           'BEGIN{RS="\n=case";FS="\n"} /=result\s*failed/ {print "=case" $0}'
-        find logs/ -name error.log -exec cat '{}' ';'
-        find logs/ -name exunit.log -exec cat '{}' ';'
+        echo "::endgroup::"
+        echo "::group::suite.log (complete)"
+        cat logs/suite.log
+        echo "::endgroup::"
 
-    - name: Send to coveralls
-      if: matrix.otp == 24
+    - name: Upload CT logs
+      if: failure()
+      uses: actions/upload-artifact@v6
+      with:
+        name: ct-logs-${{ matrix.otp }}-${{ matrix.backend }}-${{ matrix.schema }}
+        path: _build/test/logs
+        retention-days: 14
+
+  ############################################################# Coveralls #####
+
+  cover:
+    needs: ct
+    runs-on: ubuntu-24.04-arm
+    steps:
+    - name: Finish parallel upload to coveralls
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        DIAGNOSTIC=1 rebar3 as test coveralls send
         curl -v -k https://coveralls.io/webhook \
              --header "Content-Type: application/json" \
              --data '{"repo_name":"$GITHUB_REPOSITORY",
@@ -225,57 +295,123 @@ jobs:
                       "payload":{"build_num":$GITHUB_RUN_ID,
                                  "status":"done"}}'
 
-    - name: Upload test logs
-      if: always() && steps.ct.outcome == 'failure' && github.repository == 'processone/ejabberd'
-      uses: peaceiris/actions-gh-pages@v3
+  ################################################################ Schema #####
+
+  schema:
+    needs: compile
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        otp: ['28']
+
+    steps:
+
+    - uses: erlef/setup-beam@v1
       with:
-        publish_dir: _build/test
-        exclude_assets: '.github,lib,plugins'
-        external_repository: processone/ecil
-        deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-        keep_files: true
+        otp-version: ${{ matrix.otp }}
 
-    - name: View ECIL address
-      if: always() && steps.ct.outcome == 'failure' && github.repository == 'processone/ejabberd'
-      run: |
-        CTRUN=`ls -la _build/test/logs/last | sed 's|.*-> ||'`
-        echo "::notice::View CT results: https://processone.github.io/ecil/logs/$CTRUN/"
+    - uses: actions/download-artifact@v7
+      with:
+        name: compiled-${{ matrix.otp }}
+    - run: tar -xf compiled.tar
 
-    - name: Prepare new schema
+    ###################################### multi-changed ##
+
+    - name: Prepare databases
+      uses: ./.github/actions/manage-database
+      with:
+        for: mysql, pgsql
+        do: install, start, user, create
+
+    - name: Prepare configuration
       run: |
-        [[ -d logs ]] && rm -rf logs
-        [[ -d _build/test/logs ]] && rm -rf _build/test/logs || true
-        mysql -u root -proot -e "DROP DATABASE ejabberd_test;"
-        sudo -u postgres psql -c "DROP DATABASE ejabberd_test;"
-        mysql -u root -proot -e "CREATE DATABASE ejabberd_test;"
-        mysql -u root -proot -e "GRANT ALL ON ejabberd_test.*
-                                 TO 'ejabberd_test'@'localhost';"
-        mysql -u root -proot ejabberd_test < sql/mysql.new.sql
-        sudo -u postgres psql -c "CREATE DATABASE ejabberd_test;"
-        sudo -u postgres psql ejabberd_test -f sql/pg.new.sql
-        sudo -u postgres psql -c "GRANT ALL PRIVILEGES
-                                  ON DATABASE ejabberd_test TO ejabberd_test;"
-        sudo -u postgres psql ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL
-                                                TABLES IN SCHEMA public
-                                                TO ejabberd_test;"
-        sudo -u postgres psql ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL
-                                                SEQUENCES IN SCHEMA public
-                                                TO ejabberd_test;"
-        sudo sed -i 's|new_schema, false|new_schema, true|g' test/suite.erl
-    - run: CT_BACKENDS=mysql,pgsql make test
-      id: ctnewschema
-    - name: Check results
-      if: always() && steps.ctnewschema.outcome != 'skipped'
+        CT_BACKENDS=mysql,pgsql ./rebar3 ct \
+            --suite=test/ejabberd_SUITE --group=configtest_single
+        make dev
+        cp test/ejabberd_SUITE_data/ejabberd.yml ${{ env.DEV }}/conf/
+        cp _build/test/logs/last/*.yml ${{ env.DEV }}/database/
+        echo "define_macro: [CONFIGTEST_CONFIG: {modules: {mod_muc: {}}}]" \
+             > ${{ env.DEV }}/database/configtest.yml
+        cp _build/test/logs/last/*.pem ${{ env.DEV }}/conf/
+        cp _build/test/logs/last/*.pem ${{ env.DEV }}/database/
+
+    - name: Run ejabberd
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: start, update_sql, stop, check, logs
+        username: user2
+
+    - name: Dump multihost databases
+      uses: ./.github/actions/manage-database
+      with:
+        for: mysql, pgsql
+        do: dump
+        dump-suffix: multi-changed
+
+    ######################################### multi-auto ##
+
+    - name: Prepare databases
+      uses: ./.github/actions/manage-database
+      with:
+        for: mysql, pgsql
+        do: drop, create
+
+    - name: Configure multihost schema
       run: |
-        [[ -d _build ]] && ln -s _build/test/logs/last/ logs || true
-        ln `find logs/ -name suite.log` logs/suite.log
-        grep 'TEST COMPLETE' logs/suite.log
-        grep -q 'TEST COMPLETE,.* 0 failed' logs/suite.log
-        test $(find logs/ -empty -name error.log)
-    - name: View logs failures
-      if: failure() && steps.ctnewschema.outcome != 'skipped'
+        sed -i 's|MULTIHOST_SCHEMA|true|g' ${{ env.DEV }}/conf/ejabberd.yml
+
+    - name: Run ejabberd for multihost
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: start, stop, check, logs
+        username: user2
+
+    - name: Dump multihost databases
+      uses: ./.github/actions/manage-database
+      with:
+        for: mysql, pgsql
+        do: dump
+        dump-suffix: multi-auto
+
+    ############################################ compare ##
+
+    - name: View SQL schemas (mysql)
       run: |
-        cat logs/suite.log | awk \
-          'BEGIN{RS="\n=case";FS="\n"} /=result\s*failed/ {print "=case" $0}'
-        find logs/ -name error.log -exec cat '{}' ';'
-        find logs/ -name exunit.log -exec cat '{}' ';'
+        perl test/ejabberd_SUITE_data/sql_sort.pl \
+             <mysql-multi-auto.sql >mysql-multi2.sql
+        perl test/ejabberd_SUITE_data/sql_sort.pl \
+             <mysql-multi-changed.sql >mysql-changed2.sql
+        echo "::group::differences multi-auto > multi-changed"
+        diff -u mysql-multi2.sql mysql-changed2.sql || echo ok
+        echo "::endgroup::"
+        echo "::group::multi-auto.sql"
+        cat mysql-multi-auto.sql
+        echo "::endgroup::"
+        echo "::group::multi-changed.sql"
+        cat mysql-multi-changed.sql
+        echo "::endgroup::"
+
+    - name: View SQL schemas (pgsql)
+      run: |
+        perl test/ejabberd_SUITE_data/sql_sort.pl \
+             <pgsql-multi-auto.sql >pgsql-multi2.sql
+        perl test/ejabberd_SUITE_data/sql_sort.pl \
+             <pgsql-multi-changed.sql >pgsql-changed2.sql
+        echo "::group::differences (multi-auto > multi-changed)"
+        diff -u pgsql-multi2.sql pgsql-changed2.sql || echo ok
+        echo "::endgroup::"
+        echo "::group::multi-auto.sql"
+        cat pgsql-multi-auto.sql
+        echo "::endgroup::"
+        echo "::group::multi-changed.sql"
+        cat pgsql-multi-changed.sql
+        echo "::endgroup::"
+
+    - name: View ejabberd logs
+      if: always()
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: logs

.github/workflows/container.yml

@@ -4,7 +4,6 @@ on:
   push:
     paths-ignore:
     - '.devcontainer/**'
-    - 'examples/**'
     - 'lib/**'
     - 'man/**'
     - 'priv/**'
@@ -15,20 +14,32 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  container:
-    name: Container
-    runs-on: ubuntu-20.04
+
+  build:
+    runs-on: ubuntu-24.04${{ matrix.suffix }}
+    strategy:
+      matrix:
+        platform: [amd64, arm64]
+        include:
+          - platform: amd64
+            suffix:
+          - platform: arm64
+            suffix: -arm
     permissions:
       packages: write
     steps:
-
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Log in to the Container registry
-        uses: docker/login-action@v1.14.1
+      - name: Checkout ejabberd-contrib
+        uses: actions/checkout@v6
+        with:
+          repository: processone/ejabberd-contrib
+          path: .ejabberd-modules/sources/ejabberd-contrib
+
+      - uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -36,33 +47,73 @@ jobs:
 
       - name: Get git describe
         id: gitdescribe
-        run: echo "::set-output name=ver::$(git describe --tags)"
+        run: echo "ver=$(git describe --tags)" >> $GITHUB_OUTPUT
 
-      - name: Extract metadata (tags, labels) for Docker
+      - uses: docker/metadata-action@v5
         id: meta
-        uses: docker/metadata-action@v3.8.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: suffix=--${{ matrix.platform }}
           labels: |
             org.opencontainers.image.revision=${{ steps.gitdescribe.outputs.ver }}
             org.opencontainers.image.licenses=GPL-2.0
             org.opencontainers.image.vendor=ProcessOne
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2.10.0
+      - uses: docker/build-push-action@v6
         with:
           build-args: |
             VERSION=${{ steps.gitdescribe.outputs.ver }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          context: .github/container
+          context: .
+          file: .github/container/Dockerfile
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/${{ matrix.platform }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
+
+  merge:
+    needs: [build]
+    runs-on: ubuntu-24.04
+    outputs:
+      image-uri: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.merge.outputs.digest }}
+    steps:
+      - uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/metadata-action@v5
+        id: meta-amd
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: suffix=--amd64
+      - uses: docker/metadata-action@v5
+        id: meta-arm
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: suffix=--arm64
+      - uses: docker/metadata-action@v5
+        id: meta-result
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - uses: int128/docker-manifest-create-action@v2
+        id: merge
+        with:
+          index-annotations: ${{ steps.metadata.outputs.labels }}
+          tags: ${{ steps.meta-result.outputs.tags }}
+          sources: |
+            ${{ steps.meta-amd.outputs.tags }}
+            ${{ steps.meta-arm.outputs.tags }}
+      #- uses: dataaxiom/ghcr-cleanup-action@v1
+      #  with:
+      #    dry-run: true
+      #    delete-tags: '*--a??64'
+      #    delete-untagged: true
+      #    delete-ghost-images: true
+      #    delete-partial-images: true
+      #    delete-orphaned-images: true

.github/workflows/installers.yml

@@ -4,7 +4,6 @@ on:
   push:
     paths-ignore:
     - '.devcontainer/**'
-    - 'examples/**'
     - 'lib/**'
     - 'man/**'
     - 'priv/**'
@@ -12,7 +11,6 @@ on:
   pull_request:
     paths-ignore:
     - '.devcontainer/**'
-    - 'examples/**'
     - 'lib/**'
     - 'man/**'
     - 'priv/**'
@@ -20,14 +18,25 @@ on:
 
 jobs:
   binaries:
-    name: Binaries
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04${{ matrix.suffix }}
+    strategy:
+      matrix:
+        platform: [amd64, arm64]
+        include:
+          - platform: amd64
+            suffix:
+          - platform: arm64
+            suffix: -arm
     steps:
+      - name: Check out repository code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
       - name: Cache build directory
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: ~/build/
-          key: ${{runner.os}}-ct-ng-1.25.0-RC2
+          key: installers-ubuntu-22.04-${{runner.arch}}-${{hashFiles('tools/make-binaries')}}
       - name: Install prerequisites
         run: |
           sudo apt-get -qq update
@@ -39,25 +48,41 @@ jobs:
       - name: Install FPM
         run: |
           gem install --no-document --user-install fpm
-          echo $HOME/.gem/ruby/*/bin >> $GITHUB_PATH
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+          echo $HOME/.local/share/gem/ruby/*/bin >> $GITHUB_PATH
       - name: Build binary archives
         run: CHECK_DEPS=false tools/make-binaries
       - name: Build DEB and RPM packages
         run: tools/make-packages
       - name: Build installers
         run: tools/make-installers
+
+      - run: echo "rel_name_vsn=$(ls *.run | sed 's/-1-linux.*//g')" >> $GITHUB_OUTPUT
+        id: vsn
+      - name: Test RUN
+        uses: ./.github/actions/manage-ejabberd
+        with:
+          for: run
+          do: deploy, no_acme, start, register, stop, check, logs
+          username: user1
+          host: $(hostname --fqdn)
+          rel_name_vsn: ${{ steps.vsn.outputs.rel_name_vsn }}
+      - name: Test DEB
+        uses: ./.github/actions/manage-ejabberd
+        with:
+          for: deb
+          do: deploy, register, stop, logs
+          username: user1
+          host: $(hostname --fqdn)
+          rel_name_vsn: ${{ steps.vsn.outputs.rel_name_vsn }}
+
       - name: Collect packages
         run: |
           mkdir ejabberd-packages
           mv ejabberd_*.deb ejabberd-*.rpm ejabberd-*.run ejabberd-packages
       - name: Upload packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v6
         with:
-          name: ejabberd-packages
+          name: ejabberd-packages-${{ matrix.platform }}
           #
           # Appending the wildcard character ("*") is a trick to make
           # "ejabberd-packages" the root directory of the uploaded ZIP file:
@@ -70,15 +95,15 @@ jobs:
   release:
     name: Release
     needs: [binaries]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.ref_type == 'tag'
     steps:
       - name: Download packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v7
         with:
-          name: ejabberd-packages
+          merge-multiple: true
       - name: Draft Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           files: ejabberd-packages/*

.github/workflows/runtime.yml

@@ -26,120 +26,184 @@ on:
 
 jobs:
 
+  ################################################################ Rebars #####
+
   rebars:
-    name: Rebars
+    runs-on: ubuntu-24.04-arm
     strategy:
-      fail-fast: false
       matrix:
-        otp: ['19.3', '21.3', '22.0', '24.3', '25.0-rc3']
+        otp: ['25', '26', '27', '28', '29']
         rebar: ['rebar', 'rebar3']
-        include:
-        - otp: '19.3'
-          os: ubuntu-18.04
-        - otp: '21.3'
-          os: ubuntu-20.04
-        - otp: '22.0'
-          os: ubuntu-20.04
-        - otp: '24.3'
-          os: ubuntu-20.04
-        - otp: '25.0-rc3'
-          os: ubuntu-20.04
-    runs-on: ${{ matrix.os }}
+        exclude:
+        - otp: '27'
+          rebar: 'rebar'
+        - otp: '28'
+          rebar: 'rebar'
+        - otp: '29'
+          rebar: 'rebar'
     container:
-      image: erlang:${{ matrix.otp }}
+      image: public.ecr.aws/docker/library/erlang:${{ matrix.otp }}
 
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
     - name: Prepare libraries
       run: |
         apt-get -qq update
-        apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
-                            libsqlite3-dev libwebp-dev libyaml-dev
+        apt-get -q -y install libexpat1-dev libgd-dev libpam0g-dev \
+                              libsqlite3-dev libwebp-dev libyaml-dev
+
+    - name: Cache rebar3
+      if: matrix.rebar == 'rebar3'
+      uses: actions/cache@v5
+      with:
+        path: |
+          ~/.cache/rebar3/
+          _build/default/lib/
+        key: runtime-${{ matrix.otp }}-${{matrix.rebar}}-${{hashFiles('rebar.*')}}
 
     - name: Compile
-      run: |
-        ./autogen.sh
-        ./configure --with-rebar=`which ${{ matrix.rebar }}` \
-                    --prefix=/tmp/ejabberd \
-                    --enable-all \
-                    --disable-elixir \
-                    --disable-odbc
-        make update
-        make
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: compile
+        tool: ${{ matrix.rebar }}
+        configure: --disable-elixir
 
+    - run: make hooks
+    - run: make options
     - run: make xref
+    - run: make dialyzer
+    - run: make elvis
+      if: matrix.otp > '25' && matrix.rebar == 'rebar3'
 
-    - name: Test rel (rebar2)
-      if: matrix.rebar == 'rebar'
-      run: |
-        make rel
-        rel/ejabberd/bin/ejabberdctl start \
-          && rel/ejabberd/bin/ejabberdctl started
-        rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        rel/ejabberd/bin/ejabberdctl registered_users localhost
-        cat rel/ejabberd/logs/*
+    - name: Production
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: deploy, start, register, stop, check, logs
+        tool: ${{ matrix.rebar }}
+        username: user1
 
-    - name: Test rel
-      if: matrix.rebar != 'rebar'
-      run: |
-        make rel
-        _build/prod/rel/ejabberd/bin/ejabberdctl start \
-          && _build/prod/rel/ejabberd/bin/ejabberdctl started
-        _build/prod/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        _build/prod/rel/ejabberd/bin/ejabberdctl registered_users localhost
-        _build/prod/rel/ejabberd/bin/ejabberdctl stop \
-          && _build/prod/rel/ejabberd/bin/ejabberdctl stopped
-        cat _build/prod/rel/ejabberd/logs/*
+    - name: Development
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: deploy, start, register, stop, check, logs
+        tool: ${{ matrix.rebar }}
+        username: user2
 
-    - name: Test dev
-      if: matrix.rebar != 'rebar'
-      run: |
-        make dev
-        _build/dev/rel/ejabberd/bin/ejabberdctl start \
-          && _build/dev/rel/ejabberd/bin/ejabberdctl started
-        _build/dev/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        _build/dev/rel/ejabberd/bin/ejabberdctl registered_users localhost
-        _build/dev/rel/ejabberd/bin/ejabberdctl stop \
-          && _build/dev/rel/ejabberd/bin/ejabberdctl stopped
-        cat _build/dev/rel/ejabberd/logs/*
+    - name: Installed
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: install
+        do: deploy, start, register, stop, check, logs
+        tool: ${{ matrix.rebar }}
+        username: user3
 
-  mix:
-    name: Mix
+  ####################################################### Rebar3 + Elixir #####
+
+  rebar3-elixir:
+    runs-on: ubuntu-24.04-arm
     strategy:
-      fail-fast: false
       matrix:
-        otp: ['21.3', '22.0', '24.3']
-        elixir: ['1.10.3', '1.11.4', '1.12.3', '1.13.0']
-        exclude:
-        - otp: '21.3'
-          elixir: '1.12.3'
-        - otp: '21.3'
-          elixir: '1.13.0'
-        - otp: '24.3'
-          elixir: '1.10.3'
-        - otp: '24.3'
-          elixir: '1.11.4'
-    runs-on: ubuntu-20.04
+        elixir: ['1.14', '1.18', '1.19']
+    container:
+      image: public.ecr.aws/docker/library/elixir:${{ matrix.elixir }}
 
     steps:
 
-    - uses: actions/checkout@v3
-
-    - name: Get specific Erlang/OTP
-      uses: erlef/setup-beam@v1
-      with:
-        otp-version: ${{matrix.otp}}
-        elixir-version: ${{matrix.elixir}}
+    - uses: actions/checkout@v6
 
     - name: Prepare libraries
       run: |
-        sudo apt-get -qq update
-        sudo apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
-                                 libsqlite3-dev libwebp-dev libyaml-dev
+        apt-get -qq update
+        apt-get -q -y install libexpat1-dev libgd-dev libpam0g-dev \
+                              libsqlite3-dev libwebp-dev libyaml-dev
 
-    - name: Remove Elixir Matchers
+    - name: Enable Module.Example and an Elixir dependency
+      run: |
+        sed -i "s|^modules:|modules:\n  'Ejabberd.Module.Example': {}|g" \
+                ejabberd.yml.example
+        cat ejabberd.yml.example
+        sed -i 's|^{deps, \[\(.*\)|{deps, [{decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}},\n \1|g' rebar.config
+        cat rebar.config
+
+    - name: Cache hex.pm
+      uses: actions/cache@v5
+      with:
+        path: |
+          ~/.cache/rebar3/
+        key: runtime-${{matrix.elixir}}-${{hashFiles('rebar.*')}}
+
+    - name: Install Hex and Rebar3 manually on older Elixir
+      if: matrix.elixir < '1.15'
+      run: |
+        mix local.hex --force
+        mix local.rebar --force
+
+    - name: Compile
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: compile
+        tool: ./rebar3
+
+    - name: Test scripts, deps, eunit
+      run: |
+        make scripts deps
+        ./rebar3 eunit --verbose
+
+    - run: make hooks
+    - run: make options
+    - run: make xref
+    #- run: make dialyzer
+    - run: make elvis
+      if: matrix.otp > '25'
+
+    - name: Production
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: deploy, start, register, stop, check, logs
+        username: user1
+
+    - name: Release
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: deploy, start, register, stop, check, logs
+        username: user2
+
+    - name: Installed
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: install
+        do: deploy, start, register, stop, check, logs
+        username: user3
+
+  ################################################################### Mix #####
+
+  mix:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        elixir: ['1.14', '1.18', '1.19']
+    container:
+      image: public.ecr.aws/docker/library/elixir:${{ matrix.elixir }}
+
+    steps:
+
+    - uses: actions/checkout@v6
+
+    - name: Prepare libraries
+      run: |
+        apt-get -qq update
+        apt-get -q -y install libexpat1-dev libgd-dev libpam0g-dev \
+                              libsqlite3-dev libwebp-dev libyaml-dev
+
+    - name: Remove Elixir matchers
       run: |
         echo "::remove-matcher owner=elixir-mixCompileWarning::"
         echo "::remove-matcher owner=elixir-credoOutputDefault::"
@@ -147,122 +211,60 @@ jobs:
         echo "::remove-matcher owner=elixir-mixTestFailure::"
         echo "::remove-matcher owner=elixir-dialyzerOutputDefault::"
 
-    - name: Compile
+    - name: Enable Module.Example and an Elixir dependency
       run: |
-        ./autogen.sh
-        ./configure --with-rebar=mix \
-                    --prefix=/tmp/ejabberd \
-                    --enable-all \
-                    --disable-elixir \
-                    --disable-odbc
-        mix deps.get
-        make
+        sed -i "s|^modules:|modules:\n  'Ejabberd.Module.Example': {}|g" \
+                ejabberd.yml.example
+        cat ejabberd.yml.example
+        sed -i 's|^{deps, \(.*\)|{deps, \1\n  {decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}}, |g' rebar.config
+        cat rebar.config
 
-    - run: make xref
-
-    - name: Run rel
-      run: |
-        make rel
-        _build/prod/rel/ejabberd/bin/ejabberdctl start \
-          && _build/prod/rel/ejabberd/bin/ejabberdctl started
-        _build/prod/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        _build/prod/rel/ejabberd/bin/ejabberdctl registered_users localhost > registered.log
-        _build/prod/rel/ejabberd/bin/ejabberdctl stop \
-          && _build/prod/rel/ejabberd/bin/ejabberdctl stopped
-
-    - name: Run dev
-      run: |
-        make dev
-        _build/dev/rel/ejabberd/bin/ejabberdctl start \
-          && _build/dev/rel/ejabberd/bin/ejabberdctl started
-        _build/dev/rel/ejabberd/bin/ejabberdctl register user2 localhost s0mePass
-        _build/dev/rel/ejabberd/bin/ejabberdctl registered_users localhost >> registered.log
-        _build/dev/rel/ejabberd/bin/ejabberdctl stop \
-          && _build/dev/rel/ejabberd/bin/ejabberdctl stopped
-
-    - name: Check rel
-      if: always()
-      run: |
-        grep -q '^user1$' registered.log
-        grep -q '^user2$' registered.log
-        grep -q 'is started' _build/prod/rel/ejabberd/logs/ejabberd.log
-        grep -q 'is stopped' _build/prod/rel/ejabberd/logs/ejabberd.log
-        test $(find _build/prod/ -empty -name error.log)
-        grep -q 'is started' _build/dev/rel/ejabberd/logs/ejabberd.log
-        grep -q 'is stopped' _build/dev/rel/ejabberd/logs/ejabberd.log
-        test $(find _build/dev/ -empty -name error.log)
-
-    - name: View logs failures
-      if: failure()
-      run: |
-        cat _build/prod/rel/ejabberd/logs/ejabberd.log
-        cat _build/prod/rel/ejabberd/logs/error.log
-        cat _build/dev/rel/ejabberd/logs/ejabberd.log
-        cat _build/dev/rel/ejabberd/logs/error.log
-
-  mix25:
-    name: Mix 25
-    strategy:
-      fail-fast: false
-      matrix:
-        otp: ['25.0-rc3']
-    runs-on: ubuntu-20.04
-
-    steps:
-
-    - uses: actions/checkout@v3
-
-    - name: Get specific Erlang/OTP
-      uses: ErlGang/setup-erlang@master
+    - name: Cache hex.pm
+      uses: actions/cache@v5
       with:
-        otp-version: ${{ matrix.otp }}
+        path: |
+          ~/.hex/
+        key: runtime-${{matrix.elixir}}-${{hashFiles('mix.*')}}
 
-    - name: Get Elixir
+    - name: Install Hex and Rebar3 manually on older Elixir
+      if: matrix.elixir < '1.15'
       run: |
-        wget https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb \
-          && sudo dpkg -i erlang-solutions_2.0_all.deb
-        sudo apt-get update
-        sudo apt-get install elixir
         mix local.hex --force
         mix local.rebar --force
 
-    - name: Prepare libraries
-      run: |
-        sudo apt-get -qq update
-        sudo apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
-                                 libsqlite3-dev libwebp-dev libyaml-dev
-
     - name: Compile
-      run: |
-        ./autogen.sh
-        ./configure --with-rebar=mix \
-                    --prefix=/tmp/ejabberd \
-                    --enable-all \
-                    --disable-elixir \
-                    --disable-odbc
-        mix deps.get
-        make
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: compile
+        tool: mix
 
+    - run: make hooks
+    - run: make options
     - run: make xref
+    - run: make dialyzer
+    - run: make elvis
+      if: matrix.otp > '25'
 
-    - name: Test rel
-      run: |
-        make rel
-        _build/prod/rel/ejabberd/bin/ejabberdctl start \
-          && _build/prod/rel/ejabberd/bin/ejabberdctl started
-        _build/prod/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        _build/prod/rel/ejabberd/bin/ejabberdctl registered_users localhost
-        _build/prod/rel/ejabberd/bin/ejabberdctl stop \
-          && _build/prod/rel/ejabberd/bin/ejabberdctl stopped
-        cat _build/prod/rel/ejabberd/logs/*
+    - run: make edoc
 
-    - name: Test dev
-      run: |
-        make dev
-        _build/dev/rel/ejabberd/bin/ejabberdctl start \
-          && _build/dev/rel/ejabberd/bin/ejabberdctl started
-        _build/dev/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        _build/dev/rel/ejabberd/bin/ejabberdctl registered_users localhost
-        _build/dev/rel/ejabberd/bin/ejabberdctl stop \
-          && _build/dev/rel/ejabberd/bin/ejabberdctl stopped
-        cat _build/dev/rel/ejabberd/logs/*
+    - name: Production
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: deploy, start, register, stop, check, logs
+        username: user1
+
+    - name: Development
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: deploy, start, register, stop, check, logs
+        username: user2
+
+    - name: Installed
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: install
+        do: deploy, start, register, stop, check, logs
+        username: user3

.github/workflows/weekly.yml

@@ -0,0 +1,177 @@
+name: Weekly
+
+on:
+  schedule:
+    - cron: '30 9 * * 0'
+
+jobs:
+
+  ############################################################### Compile #####
+
+  test:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        otp: ['25', '26', '27', '28', '29.0-rc1']
+
+    steps:
+
+    - uses: actions/checkout@v6
+
+    - uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp }}
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: libexpat1-dev libgd-dev libpam0g-dev
+                  libsqlite3-dev libwebp-dev libyaml-dev
+
+    - name: Compile
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: compile
+        tool: rebar3
+        configure: --disable-elixir --disable-mssql
+
+  ########################################################## Static Tests #####
+
+    - name: Test shell scripts
+      run: |
+        shellcheck ejabberd.init.template
+        shellcheck -x ejabberdctl.template
+        shellcheck .vscode/relive.sh
+        shellcheck rel/setup-dev.sh
+        shellcheck rel/setup-relive.sh
+        shellcheck test/ejabberd_SUITE_data/gencerts.sh
+        shellcheck tools/captcha.sh
+        shellcheck tools/emacs-indent.sh
+        shellcheck tools/generate-doap.sh
+        shellcheck tools/prepare-tr.sh
+        shellcheck tools/rebar3-format.sh
+
+    - run: make hooks
+    - run: make options
+    - run: make xref
+    - run: make dialyzer
+    - run: make testeunit
+    - run: make elvis
+      if: matrix.otp > '25'
+
+    - run: make install -s
+
+  ######################################################### Dynamic Tests #####
+
+    - name: Check production release
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: deploy, start, stop, check
+
+    - name: Start development release
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: deploy, no_tls, start, register
+        username: user123
+
+    - name: Stop development release
+      if: always()
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: stop, check
+
+    - name: View production logs
+      if: always()
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: prod
+        do: logs
+
+    - name: View development logs
+      if: always()
+      uses: ./.github/actions/manage-ejabberd
+      with:
+        for: dev
+        do: logs
+
+  ##################################################### Common Test Suite #####
+
+    - name: Prepare database
+      uses: ./.github/actions/manage-database
+      with:
+        for: mysql, pgsql, redis
+        do: install, start, user, create
+
+    - name: Setup multihost SQL schema
+      run: |
+        sed -i 's|new_schema, false|new_schema, true|g' test/suite.erl
+
+    - name: Run tests
+      id: ct
+      run: make test
+
+    - name: Send to coveralls
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        DIAGNOSTIC=1 ./rebar3 as test coveralls send
+
+    - name: Check results
+      if: always() && (steps.ct.outcome != 'skipped')
+      id: ctresults
+      run: |
+        [[ -d _build ]] && ln -s _build/test/logs/last/ logs || true
+        ln `find logs/ -name suite.log` logs/suite.log
+        grep 'TEST COMPLETE' logs/suite.log
+        grep -q 'TEST COMPLETE,.* 0 failed' logs/suite.log
+        test $(find logs/ -empty -name error.log)
+
+    - name: View logs
+      if: always()
+      run: |
+        echo "::group::ejabberd.log"
+        find logs/ -name ejabberd.log -exec cat '{}' ';'
+        echo "::endgroup::"
+        echo "::group::error.log"
+        find logs/ -name error.log -exec cat '{}' ';'
+        echo "::endgroup::"
+        echo "::group::exunit.log"
+        find logs/ -name exunit.log -exec cat '{}' ';'
+        echo "::endgroup::"
+        echo "::group::suite.log (only failures)"
+        cat logs/suite.log | awk \
+          'BEGIN{RS="\n=case";FS="\n"} /=result\s*failed/ {print "=case" $0}'
+        echo "::endgroup::"
+        echo "::group::suite.log (complete)"
+        cat logs/suite.log
+        echo "::endgroup::"
+
+    - name: Upload CT logs
+      if: failure()
+      uses: actions/upload-artifact@v6
+      with:
+        name: ct-logs-${{ matrix.otp }}
+        path: _build/test/logs
+        retention-days: 14
+
+  ############################################################# Coveralls #####
+
+  cover:
+    needs: test
+    if: always()
+    runs-on: ubuntu-24.04-arm
+    steps:
+    - name: Finish parallel upload to coveralls
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        curl -v -k https://coveralls.io/webhook \
+             --header "Content-Type: application/json" \
+             --data '{"repo_name":"$GITHUB_REPOSITORY",
+                      "repo_token":"$GITHUB_TOKEN",
+                      "payload":{"build_num":$GITHUB_RUN_ID,
+                                 "status":"done"}}'

.gitignore

@@ -5,8 +5,10 @@
 \#*#
 .#*
 .edts
+.tool-versions
 *.dump
 /Makefile
+/doc
 /config.log
 /config.status
 /config/releases.exs
@@ -15,6 +17,7 @@
 /*.cache
 /deps/
 /.deps-update/
+/.ejabberd-modules/
 /ebin/
 /ejabberd.init
 /ejabberd.service
@@ -31,14 +34,19 @@
 /priv/bin/captcha*sh
 /priv/sql
 /rel/ejabberd
+/recompile.log
 /_build
 /database/
 /.rebar
-/rebar.lock
 /log/
 Mnesia.nonode@nohost/
+/TAGS
+/tags
 # Binaries created with tools/make-{binaries,installers,packages}:
 /ejabberd_*.deb
 /ejabberd-*.rpm
 /ejabberd-*.run
 /ejabberd-*.tar.gz
+/priv/mod_invites/static/bootstrap/
+/priv/mod_invites/static/jquery/
+/node_modules/

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+        "recommendations": [
+                "erlang-ls.erlang-ls"
+        ]
+}

.vscode/launch.json

@@ -0,0 +1,66 @@
+{
+        "version": "0.2.0",
+        "configurations": [
+                {
+                        "name": "Relive (Vim)",
+                        "type": "erlang",
+                        "request": "launch",
+                        "runinterminal": [
+                                "./rebar3", "shell",
+                                "--apps", "ejabberd",
+                                "--config", "rel/relive.config",
+                                "--script", "rel/relive.escript",
+                                "--name", "ejabberd@localhost",
+                                "--setcookie", "COOKIE"
+                        ],
+                        "projectnode": "ejabberd@localhost",
+                        "cookie": "COOKIE",
+                        "timeout": 900,
+                        "cwd": "."
+                },
+                {
+                        "name": "Relive (VSCode)",
+                        "type": "erlang",
+                        "request": "launch",
+                        "runinterminal": [
+                                ".vscode/relive.sh"
+                        ],
+                        "projectnode": "ejabberd@localhost",
+                        "cookie": "COOKIE",
+                        "timeout": 300,
+                        "cwd": "${workspaceRoot}"
+                },
+                {
+                        "name": "Relive (alternate)",
+                        "type": "erlang",
+                        "request": "launch",
+                        "runinterminal": [
+                                "./rebar3", "shell",
+                                "--apps", "ejabberd",
+                                "--config", "rel/relive.config",
+                                "--script", "rel/relive.escript",
+                                "--name", "ejabberd@localhost",
+                                "--setcookie", "COOKIE"
+                        ],
+                        "projectnode": "ejabberd@localhost",
+                        "cookie": "COOKIE",
+                        "timeout": 300,
+                        "cwd": "${workspaceRoot}"
+                },
+                {
+                        "name": "Attach",
+                        "type": "erlang",
+                        "request": "attach",
+                        "runinterminal": [
+                                "./rebar3", "shell",
+                                "--sname", "clean@localhost",
+                                "--setcookie", "COOKIE",
+                                "--start-clean"
+                        ],
+                        "projectnode": "ejabberd@localhost",
+                        "cookie": "COOKIE",
+                        "timeout": 300,
+                        "cwd": "${workspaceRoot}"
+                }
+        ]
+}

.vscode/relive.sh

@@ -0,0 +1,6 @@
+[ ! -f Makefile ] \
+    && ./autogen.sh \
+    && ./configure --with-rebar=rebar3 \
+    && make
+
+make relive

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+    "editor.tabSize": 8,
+    "remote.portsAttributes": {
+        "1883": {"label": "MQTT", "onAutoForward": "silent"},
+        "4369": {"label": "EPMD", "onAutoForward": "silent"},
+        "5222": {"label": "XMPP C2S", "onAutoForward": "silent"},
+        "5223": {"label": "XMPP C2S (legacy)", "onAutoForward": "silent"},
+        "5269": {"label": "XMPP S2S", "onAutoForward": "silent"},
+        "5280": {"label": "HTTP", "onAutoForward": "silent"},
+        "5443": {"label": "HTTPS", "onAutoForward": "silent"},
+        "7777": {"label": "XMPP SOCKS5 (proxy65)", "onAutoForward": "silent"}
+    }
+}

CODE_OF_CONDUCT.md

@@ -22,6 +22,21 @@ Examples of unacceptable behavior by participants include:
 * Publishing others' private information, such as a physical or electronic address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a professional setting
 
+## Guidelines for Respectful and Efficient Communication on Issues, Discussions, and PRs
+
+To ensure that our maintainers can efficiently manage issues and provide timely updates, we kindly ask that all comments on GitHub tickets remain relevant to the topic of the issue. Please avoid posting comments solely to ping maintainers or ask for updates. If you need information on the status of an issue, consider the following:
+
+- **Check the Issue Timeline:** Review the existing comments and updates on the issue before posting.
+- **Use Reactions:** If you want to show that you are interested in an issue, use GitHub's reaction feature (e.g., thumbs up) instead of commenting.
+- **Be Patient:** Understand that maintainers may be working on multiple tasks and will provide updates as soon as possible.
+
+Additionally, please be aware that:
+
+- **User Responses:** Users who report issues may no longer be using the software, may have switched to other projects, or may simply be busy. It is their right not to respond to follow-up questions or comments.
+- **Maintainer Priorities:** Maintainers have the right to define their own priorities and schedule. They will address issues based on their availability and the project's needs.
+
+By following these guidelines, you help us maintain a productive and respectful environment for everyone involved.
+
 ## Our Responsibilities
 
 Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
@@ -34,13 +49,13 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at conduct@process-one.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at the email address: conduct AT process-one.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://www.contributor-covenant.org/
+[version]: https://www.contributor-covenant.org/version/1/4/

COMPILE.md

@@ -7,7 +7,7 @@ from source code.
 For a more detailed explanation, please check the
 ejabberd Docs: [Source Code Installation][docs-source].
 
-[docs-source]: https://docs.ejabberd.im/admin/installation/#source-code
+[docs-source]: https://docs.ejabberd.im/admin/install/source/
 
 
 Requirements
@@ -15,20 +15,20 @@ Requirements
 
 To compile ejabberd you need:
 
- - GNU Make
- - GCC
- - Libexpat ≥ 1.95
- - Libyaml ≥ 0.1.4
- - Erlang/OTP ≥ 19.3
- - OpenSSL ≥ 1.0.0
+- GNU Make
+- GCC
+- Libexpat ≥ 1.95
+- Libyaml ≥ 0.1.4
+- Erlang/OTP ≥ 25.0
+- OpenSSL ≥ 1.0.0
 
 Other optional libraries are:
 
- - Zlib ≥ 1.2.3, for Stream Compression support (XEP-0138)
- - PAM library, for Pluggable Authentication Modules (PAM)
- - ImageMagick's Convert program and Ghostscript fonts, for CAPTCHA
-   challenges
- - Elixir ≥ 1.10.3, to support Elixir, and alternative to rebar/rebar3
+- Zlib ≥ 1.2.3, for Stream Compression support (XEP-0138)
+- PAM library, for Pluggable Authentication Modules (PAM)
+- ImageMagick's Convert program and Ghostscript fonts, for CAPTCHA
+  challenges
+- Elixir ≥ 1.14.0, for Elixir support
 
 If your system splits packages in libraries and development headers,
 install the development packages too.
@@ -43,7 +43,7 @@ There are several ways to obtain the ejabberd source code:
 - Source code package from [ejabberd GitHub Releases][ghr]
 - Latest development code from [ejabberd Git repository][gitrepo]
 
-[p1dl]: https://www.process-one.net/en/ejabberd/downloads/
+[p1dl]: https://www.process-one.net/download/ejabberd/
 [ghr]: https://github.com/processone/ejabberd/releases
 [gitrepo]: https://github.com/processone/ejabberd
 
@@ -65,6 +65,11 @@ To configure the compilation, features, install paths...
 
     ./configure --help
 
+The build tool automatically downloads and compiles the
+erlang libraries that [ejabberd depends on][docs-repo].
+
+[docs-repo]: https://docs.ejabberd.im/developer/repositories/
+
 
 Install in the System
 ---------------------
@@ -89,13 +94,8 @@ Build an OTP Release
 Instead of installing ejabberd in the system, you can build an OTP release
 that includes all necessary to run ejabberd in a subdirectory:
 
-    ./configure --with-rebar=rebar3
-    make rel
-
-Or, if you have Elixir available and plan to develop Elixir code:
-
-    ./configure --with-rebar=mix
-    make dev
+    ./configure
+    make prod
 
 Check the full list of targets:
 

CONTRIBUTING.md

@@ -3,21 +3,21 @@
 We'd love for you to contribute to our source code and to make ejabberd even better than it is
 today! Here are the guidelines we'd like you to follow:
 
-* [Code of Conduct](#coc)
-* [Questions and Problems](#question)
-* [Issues and Bugs](#issue)
-* [Feature Requests](#feature)
-* [Issue Submission Guidelines](#submit)
-* [Pull Request Submission Guidelines](#submit-pr)
-* [Signing the CLA](#cla)
+* [Code of Conduct](#code-of-conduct)
+* [Questions and Problems](#questions-bugs-features)
+* [Issues and Bugs](#found-an-issue-or-bug)
+* [Feature Requests](#missing-a-feature)
+* [Issue Submission Guidelines](#issue-submission-guidelines)
+* [Pull Request Submission Guidelines](#pull-request-submission-guidelines)
+* [Signing the CLA](#signing-the-contributor-license-agreement-cla)
 
-## <a name="coc"></a> Code of Conduct
+## Code of Conduct
 
 Help us keep ejabberd community open-minded and inclusive. Please read and follow our [Code of Conduct][coc].
 
-## <a name="requests"></a> Questions, Bugs, Features
+## Questions, Bugs, Features
 
-### <a name="question"></a> Got a Question or Problem?
+### Got a Question or Problem?
 
 Do not open issues for general support questions as we want to keep GitHub issues for bug reports
 and feature requests. You've got much better chances of getting your question answered on dedicated
@@ -25,25 +25,25 @@ support platforms, the best being [Stack Overflow][stackoverflow].
 
 Stack Overflow is a much better place to ask questions since:
 
-- there are thousands of people willing to help on Stack Overflow
-- questions and answers stay available for public viewing so your question / answer might help
+* there are thousands of people willing to help on Stack Overflow
+* questions and answers stay available for public viewing so your question / answer might help
   someone else
-- Stack Overflow's voting system assures that the best answers are prominently visible.
+* Stack Overflow's voting system assures that the best answers are prominently visible.
 
 To save your and our time, we will systematically close all issues that are requests for general
 support and redirect people to the section you are reading right now.
 
 Other channels for support are:
-- [ejabberd Mailing List][list]
-- [ejabberd XMPP room][muc]: ejabberd@conference.process-one.net
-- [ejabberd XMPP room logs][logs]
 
-### <a name="issue"></a> Found an Issue or Bug?
+* ejabberd XMPP room: [ejabberd@conference.process-one.net][muc]
+* [ejabberd Mailing List][list]
+
+### Found an Issue or Bug?
 
 If you find a bug in the source code, you can help us by submitting an issue to our
 [GitHub Repository][github]. Even better, you can submit a Pull Request with a fix.
 
-### <a name="feature"></a> Missing a Feature?
+### Missing a Feature?
 
 You can request a new feature by submitting an issue to our [GitHub Repository][github-issues].
 
@@ -52,9 +52,9 @@ If you would like to implement a new feature then consider what kind of change i
 * **Major Changes** that you wish to contribute to the project should be discussed first in an
   [GitHub issue][github-issues] that clearly outlines the changes and benefits of the feature.
 * **Small Changes** can directly be crafted and submitted to the [GitHub Repository][github]
-  as a Pull Request. See the section about [Pull Request Submission Guidelines](#submit-pr).
+  as a Pull Request. See the section about [Pull Request Submission Guidelines](#pull-request-submission-guidelines).
 
-## <a name="submit"></a> Issue Submission Guidelines
+## Issue Submission Guidelines
 
 Before you submit your issue search the archive, maybe your question was already answered.
 
@@ -64,7 +64,7 @@ the effort we can spend fixing issues and adding new features, by not reporting
 The "[new issue][github-new-issue]" form contains a number of prompts that you should fill out to
 make it easier to understand and categorize the issue.
 
-## <a name="submit-pr"></a> Pull Request Submission Guidelines
+## Pull Request Submission Guidelines
 
 By submitting a pull request for a code or doc contribution, you need to have the right
 to grant your contribution's copyright license to ProcessOne. Please check [ProcessOne CLA][cla]
@@ -80,6 +80,7 @@ Before you submit your pull request consider the following guidelines:
     ```shell
     git checkout -b my-fix-branch master
     ```
+
 * Test your changes and, if relevant, expand the automated test suite.
 * Create your patch commit, including appropriate test cases.
 * If the changes affect public APIs, change or add relevant [documentation][doc-repo].
@@ -88,6 +89,7 @@ Before you submit your pull request consider the following guidelines:
     ```shell
     git commit -a
     ```
+
   Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
 
 * Push your branch to GitHub:
@@ -123,28 +125,25 @@ restarted.
 
 That's it! Thank you for your contribution!
 
-## <a name="cla"></a> Signing the Contributor License Agreement (CLA)
+## Signing the Contributor License Agreement (CLA)
 
 Upon submitting a Pull Request, we will ask you to sign our CLA if you haven't done
 so before. It's a quick process, we promise, and you will be able to do it all online
 
-You can read [ProcessOne Contribution License Agreement][cla] in PDF.
+Here's a link to the  [ProcessOne Contribution License Agreement][cla].
 
 This is part of the legal framework of the open-source ecosystem that adds some red tape,
 but protects both the contributor and the company / foundation behind the project. It also
 gives us the option to relicense the code with a more permissive license in the future.
 
-
 [coc]: https://github.com/processone/ejabberd/blob/master/CODE_OF_CONDUCT.md
 [stackoverflow]: https://stackoverflow.com/questions/tagged/ejabberd?sort=newest
-[list]: https://lists.jabber.ru/mailman/listinfo/ejabberd
+[list]: https://web.archive.org/web/20230319174915/http://lists.jabber.ru/mailman/listinfo/ejabberd
 [muc]: xmpp:ejabberd@conference.process-one.net
-[logs]: https://process-one.net/logs/ejabberd@conference.process-one.net/
 [github]: https://github.com/processone/ejabberd
 [github-issues]: https://github.com/processone/ejabberd/issues
 [github-new-issue]: https://github.com/processone/ejabberd/issues/new
 [github-pr]: https://github.com/processone/ejabberd/pulls
 [doc-repo]: https://github.com/processone/docs.ejabberd.im
 [developer-setup]: https://docs.ejabberd.im/developer/
-[cla]: https://www.process-one.net/resources/ejabberd-cla.pdf
-[license]: https://github.com/processone/ejabberd/blob/master/COPYING
+[cla]: https://cla.process-one.net/

CONTRIBUTORS.md

@@ -26,6 +26,7 @@ We would like to thanks official ejabberd source code contributors:
 - Sonny Scroggin
 - Alexey Shchepin
 - Shelley Shyan
+- Stefan Strigler
 - Radoslaw Szymczyszyn
 - Stu Tomlinson
 - Christian Ulrich

Makefile.in

@@ -1,8 +1,26 @@
-REBAR = @ESCRIPT@ @rebar@
+#.
+#' definitions
+#
+
+# Only required for Erlang/OTP 25
+MAYBE=ERL_FLAGS="-enable-feature maybe_expr"
+
+ESCRIPT = @ESCRIPT@
+REBAR = $(MAYBE) @rebar@ # rebar|rebar3|mix binary (or path to binary)
+REBAR3 = @REBAR3@ # path to rebar3 binary
 MIX = @rebar@
+AWK = @AWK@
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 SED = @SED@
 ERL = @ERL@
+EPMD = @EPMD@
+IEX = @IEX@
+
+INSTALLUSER=@INSTALLUSER@
+INSTALLGROUP=@INSTALLGROUP@
+
+REBAR_ENABLE_ELIXIR = @elixir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -10,27 +28,27 @@ exec_prefix = @exec_prefix@
 DESTDIR =
 
 # /etc/ejabberd/
-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+ETCDIR = @sysconfdir@/ejabberd
 
 # /bin/
-BINDIR = $(DESTDIR)@bindir@
+BINDIR = @bindir@
 
 # /sbin/
-SBINDIR = $(DESTDIR)@sbindir@
+SBINDIR = @sbindir@
 
 # /lib/
-LIBDIR =  $(DESTDIR)@libdir@
+LIBDIR =  @libdir@
 
 # /lib/ejabberd/
-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
+EJABBERDDIR = @libdir@/ejabberd
 
 # /share/doc/ejabberd
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 datarootdir = @datarootdir@
-DOCDIR = $(DESTDIR)@docdir@
+DOCDIR = @docdir@
 
 # /share/doc/man/man5
-MANDIR = $(DESTDIR)@mandir@/man5
+MANDIR = @mandir@/man5
 
 # /usr/lib/ejabberd/ebin/
 BEAMDIR = $(EJABBERDDIR)/ebin
@@ -66,12 +84,15 @@ SQLDIR = $(PRIVDIR)/sql
 LUADIR = $(PRIVDIR)/lua
 
 # /var/lib/ejabberd/
-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
+SPOOLDIR = @localstatedir@/lib/ejabberd
 
 # /var/log/ejabberd/
-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+LOGDIR = @localstatedir@/log/ejabberd
+
+#.
+#' install user
+#
 
-INSTALLUSER=@INSTALLUSER@
 # if no user was enabled, don't set privileges or ownership
 ifeq ($(INSTALLUSER),)
   O_USER=
@@ -86,22 +107,26 @@ else
   CHOWN_OUTPUT=&1
   INIT_USER=$(INSTALLUSER)
 endif
+
 # if no group was enabled, don't set privileges or ownership
-INSTALLGROUP=@INSTALLGROUP@
 ifneq ($(INSTALLGROUP),)
   G_USER=-g $(INSTALLGROUP)
 endif
 
-ifeq "$(MIX)" "mix"
+#.
+#' rebar / rebar3 / mix
+#
+
+ifeq "$(notdir $(MIX))" "mix"
 REBAR_VER:=6
 REBAR_VER_318:=0
 else
-REBAR_VER:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}')
-REBAR_VER_318:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print ($$2 == 3 && $$3 >= 18 ? 1 : 0)}')
+REBAR_VER:=$(shell $(REBAR) --version | $(AWK) -F '[ .]' '/rebar / {print $$2}')
+REBAR_VER_318:=$(shell $(REBAR) --version | $(AWK) -F '[ .]' '/rebar / {print ($$2 == 3 && $$3 >= 18 ? 1 : 0)}')
 endif
 
 ifeq "$(REBAR_VER)" "6"
-  REBAR=$(MIX)
+  REBAR=$(MAYBE) $(MIX)
   SKIPDEPS=
   LISTDEPS=deps.tree
   UPDATEDEPS=deps.update
@@ -109,13 +134,30 @@ ifeq "$(REBAR_VER)" "6"
   DEPSBASE=_build
   DEPSDIR=$(DEPSBASE)/dev/lib
   GET_DEPS= deps.get
-  CONFIGURE_DEPS=
+  CONFIGURE_DEPS=(cd deps/eimp; ./configure)
   EBINDIR=$(DEPSDIR)/ejabberd/ebin
   XREFOPTIONS=graph
+  EDOCPRE=MIX_ENV=edoc
+  EDOCTASK=docs --proglang erlang
+  CLEANARG=--deps
+  ELIXIR_LIBDIR_RAW=$(shell elixir -e "IO.puts(:filename.dirname(:code.lib_dir(:elixir)))" -e ":erlang.halt")
+  ELIXIR_LIBDIR=":$(ELIXIR_LIBDIR_RAW)"
   REBARREL=MIX_ENV=prod $(REBAR) release --overwrite
   REBARDEV=MIX_ENV=dev $(REBAR) release --overwrite
-  RELIVECMD=escript rel/relive.escript && MIX_ENV=dev RELIVE=true iex --name ejabberd@localhost -S mix run
+  RELIVECMD=$(ESCRIPT) rel/relive.escript && MIX_ENV=dev RELIVE=true $(MAYBE) $(IEX) --name ejabberd@localhost -S mix run
+  RELIVECTLCMD=$(ESCRIPT) rel/relive.escript ctl && _build/relivectl/ejabberdctl live
+  REL_LIB_DIR = _build/dev/rel/ejabberd/lib
+  COPY_REL_TARGET = dev
+  GET_DEPS_TRANSLATIONS=MIX_ENV=translations $(REBAR) $(GET_DEPS)
+  DEPSDIR_TRANSLATIONS=deps
 else
+ifeq ($(REBAR_ENABLE_ELIXIR),true)
+  ELIXIR_LIBDIR_RAW=$(shell elixir -e "IO.puts(:filename.dirname(:code.lib_dir(:elixir)))" -e ":erlang.halt")
+  ELIXIR_LIBDIR=":$(ELIXIR_LIBDIR_RAW)"
+  EXPLICIT_ELIXIR_COMPILE=MIX_ENV=default mix compile.elixir
+  EXPLICIT_ELIXIR_COMPILE_DEV=MIX_ENV=dev mix compile.elixir
+  PREPARE_ELIXIR_SCRIPTS=$(MKDIR_P) rel/overlays; cp $(ELIXIR_LIBDIR_RAW)/../bin/iex rel/overlays/; cp $(ELIXIR_LIBDIR_RAW)/../bin/elixir rel/overlays/; sed -i 's|ERTS_BIN=$$|ERTS_BIN=$$SCRIPT_PATH/../../erts-{{erts_vsn}}/bin/|' rel/overlays/elixir
+endif
 ifeq "$(REBAR_VER)" "3"
   SKIPDEPS=
   LISTDEPS=tree
@@ -131,9 +173,15 @@ endif
   CONFIGURE_DEPS=$(REBAR) configure-deps
   EBINDIR=$(DEPSDIR)/ejabberd/ebin
   XREFOPTIONS=
+  CLEANARG=--all
   REBARREL=$(REBAR) as prod tar
-  REBARDEV=REBAR_PROFILE=dev $(REBAR) release
-  RELIVECMD=$(REBAR) relive
+  REBARDEV=$(REBAR) as dev release
+  RELIVECMD=$(REBAR) as dev relive
+  RELIVECTLCMD=$(ESCRIPT) rel/relive.escript ctl && _build/relivectl/ejabberdctl live
+  REL_LIB_DIR = _build/dev/rel/ejabberd/lib
+  COPY_REL_TARGET = dev
+  GET_DEPS_TRANSLATIONS=$(REBAR) as translations $(GET_DEPS)
+  DEPSDIR_TRANSLATIONS=_build/translations/lib
 else
   SKIPDEPS=skip_deps=true
   LISTDEPS=-q list-deps
@@ -145,50 +193,109 @@ else
   CONFIGURE_DEPS=$(REBAR) configure-deps
   EBINDIR=ebin
   XREFOPTIONS=
+  CLEANARG=
   REBARREL=$(REBAR) generate
-  REBARDEV=
+  REBARDEV=@echo "Rebar2 detected... dev not supported.\
+	   \nTry: make prod, or: ./configure --with-rebar=rebar3 ; make dev"
   RELIVECMD=@echo "Rebar2 detected... relive not supported.\
-	 \nTry: ./configure --with-rebar=./rebar3 ; make relive"
+	   \nTry: ./configure --with-rebar=rebar3 ; make relive"
+  RELIVECTLCMD=@echo "Rebar2 detected... relivectl not supported.\
+	   \nTry: ./configure --with-rebar=rebar3 ; make relivectl"
+  REL_LIB_DIR = rel/ejabberd/lib
+  COPY_REL_TARGET = rel
 endif
 endif
 
-all: deps src
+#.
+#' main targets
+#
 
-deps: $(DEPSDIR)/.got
+all: scripts deps src
+
+deps: $(DEPSDIR)/.got invites-deps
 
 $(DEPSDIR)/.got:
 	rm -rf $(DEPSDIR)/.got
 	rm -rf $(DEPSDIR)/.built
-	mkdir -p $(DEPSDIR)
+	$(MKDIR_P) $(DEPSDIR)
 	$(REBAR) $(GET_DEPS) && :> $(DEPSDIR)/.got
+	$(CONFIGURE_DEPS)
 
 $(DEPSDIR)/.built: $(DEPSDIR)/.got
-	$(CONFIGURE_DEPS)
 	$(REBAR) compile && :> $(DEPSDIR)/.built
 
+ifeq (, $(shell which npm))
+  INSTALL_INVITES_DEPS=tools/dl_invites_page_deps.sh priv/mod_invites/static
+else
+  INSTALL_INVITES_DEPS=npm install
+endif
+
+invites-deps: priv/mod_invites/static/bootstrap/ priv/mod_invites/static/jquery/
+
+priv/mod_invites/static/bootstrap/:
+	$(INSTALL_INVITES_DEPS)
+priv/mod_invites/static/jquery/:
+	$(INSTALL_INVITES_DEPS)
+
 src: $(DEPSDIR)/.built
 	$(REBAR) $(SKIPDEPS) compile
+	$(EXPLICIT_ELIXIR_COMPILE)
 
 update:
 	rm -rf $(DEPSDIR)/.got
 	rm -rf $(DEPSDIR)/.built
 	$(REBAR) $(UPDATEDEPS) && :> $(DEPSDIR)/.got
+	$(CONFIGURE_DEPS)
 
-xref: all
+xref: src
 	$(REBAR) $(SKIPDEPS) xref $(XREFOPTIONS)
 
-hooks: all
+hooks: src
 	tools/hook_deps.sh $(EBINDIR)
 
-options: all
+options: src
 	tools/opt_types.sh ejabberd_option $(EBINDIR)
 
 translations:
-	tools/prepare-tr.sh $(DEPSDIR)
+	$(GET_DEPS_TRANSLATIONS)
+	tools/prepare-tr.sh $(DEPSDIR_TRANSLATIONS)
 
-edoc:
-	$(ERL) -noinput +B -eval \
-        'case edoc:application(ejabberd, ".", []) of ok -> halt(0); error -> halt(1) end.'
+doap:
+	tools/generate-doap.sh
+
+#.
+#' edoc
+#
+
+edoc: edoc_files edoc_compile
+	$(EDOCPRE) $(REBAR) $(EDOCTASK)
+
+edoc_compile: deps
+	$(EDOCPRE) $(REBAR) compile
+
+edoc_files: _build/edoc/docs.md _build/edoc/logo.png
+
+_build/edoc/docs.md: edoc_compile
+	echo "For much more detailed and complete ejabberd documentation, " \
+	     "go to the [ejabberd Docs](https://docs.ejabberd.im/) site." \
+	     > _build/edoc/docs.md
+
+_build/edoc/logo.png: edoc_compile
+	wget https://docs.ejabberd.im/assets/img/footer_logo_e.png -O _build/edoc/logo.png
+
+#.
+#' format / indent
+#
+
+format:
+	tools/rebar3-format.sh $(REBAR3)
+
+indent:
+	tools/emacs-indent.sh
+
+#.
+#' copy-files
+#
 
 JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(1))/$(call JOIN_PATHS,$(wordlist 2,1000,$(1))),$(1))
 
@@ -201,7 +308,7 @@ ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,
 DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
 MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
 TO_DEST_SINGLE=$(if $(subst X$(DEPSBASE)X,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word $(LIBIX),$(1))X),$(call DEPS_TO_DEST,$(wordlist $(DEPIX),1000,$(1))),$(call ELIXIR_TO_DEST,$(wordlist $(DEPIX),1000,$(1)))))
-TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
+TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(DESTDIR)$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
 
 FILTER_DIRS=$(foreach path,$(1),$(if $(wildcard $(path)/*),,$(path)))
 FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
@@ -217,8 +324,9 @@ BINARIES=$(DEPSDIR)/epam/priv/bin/epam $(DEPSDIR)/eimp/priv/bin/eimp $(DEPSDIR)/
 DEPS_FILES_FILTERED=$(filter-out $(BINARIES) $(DEPSDIR)/elixir/ebin/elixir.app,$(DEPS_FILES))
 DEPS_DIRS=$(sort $(DEPSDIR)/ $(foreach DEP,$(DEPS),$(DEPSDIR)/$(DEP)/) $(dir $(DEPS_FILES)))
 
-MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,$(EBINDIR)/*.beam $(EBINDIR)/*.app priv/msgs/*.msg priv/css/*.css priv/img/*.png priv/js/*.js priv/lib/* include/*.hrl COPYING))
-MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql priv/lua)
+MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,$(EBINDIR)/*.beam $(EBINDIR)/*.app priv/msgs/*.msg priv/css/*.css priv/img/*.png priv/js/*.js priv/lib/* priv/mod_invites/* priv/mod_invites/static/* priv/mod_invites/static/bootstrap/css/bootstrap.min.css priv/mod_invites/static/bootstrap/js/bootstrap.min.js priv/mod_invites/static/jquery/jquery.min.js \
+	priv/mod_invites/static/logos/* include/*.hrl COPYING))
+MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql priv/lua priv/mod_invites)
 
 define DEP_VERSION_template
 DEP_$(1)_VERSION:=$(shell $(SED) -e '/vsn/!d;s/.*, *"/$(1)-/;s/".*//' $(2) 2>/dev/null)
@@ -242,7 +350,7 @@ $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,
 $(foreach file,$(BINARIES),$(eval $(call COPY_BINARY_template,$(file))))
 
 $(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))):
-	$(INSTALL) -d $@
+		$(INSTALL) -d $@
 
 $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
 	$(INSTALL) -m 644 $< $@
@@ -275,169 +383,254 @@ copy-files:
 
 copy-files-sub: copy-files-sub2
 
+#.
+#' copy-files-rel
+#
+
+copy-files-rel: $(COPY_REL_TARGET)
+	#
+	# Libraries
+	(cd $(REL_LIB_DIR) && find . -follow -type f ! -executable -exec $(INSTALL) -vDm 640 $(G_USER) {} $(DESTDIR)$(LIBDIR)/{} \;)
+	#
+	# *.so:
+	(cd $(REL_LIB_DIR) && find . -follow -type f -executable -name *.so -exec $(INSTALL) -vDm 640 $(G_USER) {} $(DESTDIR)$(LIBDIR)/{} \;)
+	#
+	# Executable files
+	(cd $(REL_LIB_DIR) && find . -follow -type f -executable ! -name *.so -exec $(INSTALL) -vDm 550 $(G_USER) {} $(DESTDIR)$(LIBDIR)/{} \;)
+
+#.
+#' uninstall-librel
+#
+
+uninstall-librel:
+	(cd $(REL_LIB_DIR) && find . -follow -type f -exec rm -fv -v $(DESTDIR)$(LIBDIR)/{} \;)
+	(cd $(REL_LIB_DIR) && find . -follow -depth -type d -exec rm -dv -v $(DESTDIR)$(LIBDIR)/{} \;)
+
+#.
+#' relive
+#
+
 relive:
+	$(EXPLICIT_ELIXIR_COMPILE_DEV)
 	$(RELIVECMD)
 
+relivectl:
+	$(EXPLICIT_ELIXIR_COMPILE_DEV)
+	$(RELIVECTLCMD)
+
 relivelibdir=$(shell pwd)/$(DEPSDIR)
-relivedir=$(shell pwd)/_build/relive
-iexpath=$(shell which iex)
-CONFIG_DIR = ${relivedir}/conf
-SPOOL_DIR = ${relivedir}/database
-LOGS_DIR = ${relivedir}/logs
+relivebase=$(shell pwd)/$(DEPSBASE)
 
-ejabberdctl.relive:
-	$(SED)  -e "s*{{installuser}}*@INSTALLUSER@*g" \
-		-e "s*{{config_dir}}*${CONFIG_DIR}*g" \
-		-e "s*{{logs_dir}}*${LOGS_DIR}*g" \
-		-e "s*{{spool_dir}}*${SPOOL_DIR}*g" \
-		-e "s*{{bindir}}/iex*$(iexpath)*g" \
-		-e "s*{{bindir}}*@bindir@*g" \
-		-e "s*{{libdir}}*${relivelibdir}*g" \
-		-e "s*{{erl}}*@ERL@*g" \
-		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
-		> ejabberdctl.relive
+#.
+#' scripts
+#
 
-ejabberdctl.example: vars.config
-	$(SED)  -e "s*{{installuser}}*@INSTALLUSER@*g" \
-		-e "s*{{config_dir}}*${ETCDIR}*g" \
-		-e "s*{{logs_dir}}*${LOGDIR}*g" \
-		-e "s*{{spool_dir}}*${SPOOLDIR}*g" \
-		-e "s*{{bindir}}*@bindir@*g" \
-		-e "s*{{libdir}}*@libdir@*g" \
-		-e "s*{{erl}}*@ERL@*g" \
-		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
-		> ejabberdctl.example
+# Used for ejabberdctl.relive and ejabberdctl.relivectl
+ejabberdctl.re%:
+	$(SED)  -e "s*{{installuser}}*${INSTALLUSER}*g" \
+		-e "s*{{config_dir}}*${relivebase}/re${*}/conf*g" \
+		-e "s*{{logs_dir}}*${relivebase}/re${*}/logs*g" \
+		-e "s*{{spool_dir}}*${relivebase}/re${*}/database*g" \
+		-e "s*{{bindir}}*${BINDIR}*g" \
+		-e "s*{{libdir}}*${relivelibdir}${ELIXIR_LIBDIR}*g" \
+		-e "s*ERTS_VSN*# ERTS_VSN*g" \
+		-e "s*{{iexpath}}*${IEX}*g" \
+		-e "s*{{erl}}*${ERL}*g" \
+		-e "s*{{epmd}}*${EPMD}*g" ejabberdctl.template \
+		> ejabberdctl.re${*}
 
-install: copy-files ejabberdctl.example
-	#
-	# Configuration files
-	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
-	[ -f $(ETCDIR)/ejabberd.yml ] \
-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
-	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
-	#
-	# Administration script
-	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
-	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-	# Elixir binaries
-	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
-	[ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(BINDIR)/iex || true
-	[ -f $(DEPSDIR)/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/elixir $(BINDIR)/elixir || true
-	[ -f $(DEPSDIR)/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/mix $(BINDIR)/mix || true
-	#
-	# Init script
+ejabberd.init:
 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
 		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
 		> ejabberd.init
 	chmod 755 ejabberd.init
-	#
-	# Service script
+
+ejabberd.service:
 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
 		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.service.template \
 		> ejabberd.service
 	chmod 644 ejabberd.service
+
+ejabberdctl.example: vars.config
+	$(SED)  -e "s*{{installuser}}*${INSTALLUSER}*g" \
+		-e "s*{{config_dir}}*${ETCDIR}*g" \
+		-e "s*{{logs_dir}}*${LOGDIR}*g" \
+		-e "s*{{spool_dir}}*${SPOOLDIR}*g" \
+		-e "s*{{bindir}}*${BINDIR}*g" \
+		-e "s*{{libdir}}*${LIBDIR}${ELIXIR_LIBDIR}*g" \
+		-e "s*ERTS_VSN*# ERTS_VSN*g" \
+		-e "s*{{iexpath}}*${IEX}*g" \
+		-e "s*{{erl}}*${ERL}*g" \
+		-e "s*{{epmd}}*${EPMD}*g" ejabberdctl.template \
+		> ejabberdctl.example
+
+scripts: ejabberd.init ejabberd.service ejabberdctl.example
+
+#.
+#' install
+#
+
+install: copy-files install-main
+
+install-rel: copy-files-rel install-main
+
+install-main:
+	#
+	# Configuration files
+	$(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR)
+	[ -f $(DESTDIR)$(ETCDIR)/ejabberd.yml ] \
+		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(DESTDIR)$(ETCDIR)/ejabberd.yml-new \
+		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(DESTDIR)$(ETCDIR)/ejabberd.yml
+	[ -f $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg ] \
+		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg-new \
+		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg
+	$(INSTALL) -b -m 644 $(G_USER) inetrc $(DESTDIR)$(ETCDIR)/inetrc
+	#
+	# Administration script
+	[ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(DESTDIR)$(SBINDIR)/ejabberdctl
+	# Elixir binaries
+	[ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
+	[ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(DESTDIR)$(BINDIR)/iex || true
+	[ -f $(DEPSDIR)/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/elixir $(DESTDIR)$(BINDIR)/elixir || true
+	[ -f $(DEPSDIR)/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/mix $(DESTDIR)$(BINDIR)/mix || true
 	#
 	# Spool directory
-	$(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
-	chmod -R 750 $(SPOOLDIR)
+	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(SPOOLDIR)
+	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
+	chmod -R 750 $(DESTDIR)$(SPOOLDIR)
 	#
 	# Log directory
-	$(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
-	chmod -R 750 $(LOGDIR)
+	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(LOGDIR)
+	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
+	chmod -R 750 $(DESTDIR)$(LOGDIR)
 	#
 	# Documentation
-	$(INSTALL) -d $(MANDIR)
-	$(INSTALL) -d $(DOCDIR)
+	$(INSTALL) -d $(DESTDIR)$(MANDIR)
+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
 	[ -f man/ejabberd.yml.5 ] \
-		&& $(INSTALL) -m 644 man/ejabberd.yml.5 $(MANDIR) \
+		&& $(INSTALL) -m 644 man/ejabberd.yml.5 $(DESTDIR)$(MANDIR) \
 		|| echo "Man page not included in sources"
-	$(INSTALL) -m 644 COPYING $(DOCDIR)
+	$(INSTALL) -m 644 COPYING $(DESTDIR)$(DOCDIR)
+
+#.
+#' uninstall
+#
 
 uninstall: uninstall-binary
 
+uninstall-rel: uninstall-binary uninstall-librel
+
 uninstall-binary:
-	rm -f  $(SBINDIR)/ejabberdctl
-	rm -f  $(BINDIR)/iex
-	rm -f  $(BINDIR)/elixir
-	rm -f  $(BINDIR)/mix
-	rm -fr $(DOCDIR)
-	rm -f  $(BEAMDIR)/*.beam
-	rm -f  $(BEAMDIR)/*.app
-	rm -fr $(BEAMDIR)
-	rm -f  $(INCLUDEDIR)/*.hrl
-	rm -fr $(INCLUDEDIR)
-	rm -fr $(PBINDIR)
-	rm -f  $(SODIR)/*.so
-	rm -fr $(SODIR)
-	rm -f  $(MSGSDIR)/*.msg
-	rm -fr $(MSGSDIR)
-	rm -f  $(CSSDIR)/*.css
-	rm -fr $(CSSDIR)
-	rm -f  $(IMGDIR)/*.png
-	rm -fr $(IMGDIR)
-	rm -f  $(JSDIR)/*.js
-	rm -fr $(JSDIR)
-	rm -f  $(SQLDIR)/*.sql
-	rm -fr $(SQLDIR)
-	rm -fr $(LUADIR)/*.lua
-	rm -fr $(LUADIR)
-	rm -fr $(PRIVDIR)
-	rm -fr $(EJABBERDDIR)
+	rm -f  $(DESTDIR)$(SBINDIR)/ejabberdctl
+	rm -f  $(DESTDIR)$(BINDIR)/iex
+	rm -f  $(DESTDIR)$(BINDIR)/elixir
+	rm -f  $(DESTDIR)$(BINDIR)/mix
+	rm -fr $(DESTDIR)$(DOCDIR)
+	rm -f  $(DESTDIR)$(BEAMDIR)/*.beam
+	rm -f  $(DESTDIR)$(BEAMDIR)/*.app
+	rm -fr $(DESTDIR)$(BEAMDIR)
+	rm -f  $(DESTDIR)$(INCLUDEDIR)/*.hrl
+	rm -fr $(DESTDIR)$(INCLUDEDIR)
+	rm -fr $(DESTDIR)$(PBINDIR)
+	rm -f  $(DESTDIR)$(SODIR)/*.so
+	rm -fr $(DESTDIR)$(SODIR)
+	rm -f  $(DESTDIR)$(MSGSDIR)/*.msg
+	rm -fr $(DESTDIR)$(MSGSDIR)
+	rm -f  $(DESTDIR)$(CSSDIR)/*.css
+	rm -fr $(DESTDIR)$(CSSDIR)
+	rm -f  $(DESTDIR)$(IMGDIR)/*.png
+	rm -fr $(DESTDIR)$(IMGDIR)
+	rm -f  $(DESTDIR)$(JSDIR)/*.js
+	rm -fr $(DESTDIR)$(JSDIR)
+	rm -f  $(DESTDIR)$(SQLDIR)/*.sql
+	rm -fr $(DESTDIR)$(SQLDIR)
+	rm -fr $(DESTDIR)$(LUADIR)/*.lua
+	rm -fr $(DESTDIR)$(LUADIR)
+	rm -fr $(DESTDIR)$(PRIVDIR)
+	rm -fr $(DESTDIR)$(EJABBERDDIR)
+	rm -f  $(DESTDIR)$(MANDIR)/ejabberd.yml.5
 
 uninstall-all: uninstall-binary
-	rm -rf $(ETCDIR)
-	rm -rf $(EJABBERDDIR)
-	rm -rf $(SPOOLDIR)
-	rm -rf $(LOGDIR)
+	rm -rf $(DESTDIR)$(ETCDIR)
+	rm -rf $(DESTDIR)$(EJABBERDDIR)
+	rm -rf $(DESTDIR)$(SPOOLDIR)
+	rm -rf $(DESTDIR)$(LOGDIR)
+
+#.
+#' clean
+#
 
 clean:
 	rm -rf $(DEPSDIR)/.got
 	rm -rf $(DEPSDIR)/.built
 	rm -rf test/*.beam
-	$(REBAR) clean
+	rm -f rebar.lock
+	rm -f ejabberdctl.example ejabberd.init ejabberd.service
+	rm -rf priv/mod_invites/static/{jquery,bootstrap4}
+	$(REBAR) clean $(CLEANARG)
 
 clean-rel:
 	rm -rf rel/ejabberd
 
 distclean: clean clean-rel
+	rm -f aclocal.m4
 	rm -f config.status
 	rm -f config.log
 	rm -rf autom4te.cache
 	rm -rf $(EBINDIR)
 	rm -rf $(DEPSBASE)
+	rm -rf deps
 	rm -f Makefile
 	rm -f vars.config
-	rm -f src/ejabberd.app.src
-	rm -f ejabberdctl.example ejabberd.init ejabberd.service
-	[ ! -f ../ChangeLog ] || rm -f ../ChangeLog
 
-rel:
+#.
+#' releases
+#
+
+rel: prod
+
+prod:
+	$(PREPARE_ELIXIR_SCRIPTS)
 	$(REBARREL)
 
 DEV_CONFIG = _build/dev/rel/ejabberd/conf/ejabberd.yml
 
 dev $(DEV_CONFIG):
+	$(PREPARE_ELIXIR_SCRIPTS)
 	$(REBARDEV)
 
+#.
+#' tags
+#
+
 TAGS:
-	etags *.erl
+	etags src/*.erl
+
+#.
+#' makefile
+#
 
 Makefile: Makefile.in
 
-ifeq "$(REBAR_VER)" "3"
+#.
+#' dialyzer
+#
+
+ifeq "$(REBAR_VER)" "6" # Mix
+dialyzer:
+	MIX_ENV=test $(REBAR) dialyzer
+
+else
+ifeq "$(REBAR_VER)" "3" # Rebar3
 dialyzer:
 	$(REBAR) dialyzer
-else
+
+else # Rebar2
 deps := $(wildcard $(DEPSDIR)/*/ebin)
 
 dialyzer/erlang.plt:
-	@mkdir -p dialyzer
+	@$(MKDIR_P) dialyzer
 	@dialyzer --build_plt --output_plt dialyzer/erlang.plt \
 	-o dialyzer/erlang.log --apps kernel stdlib sasl crypto \
 	public_key ssl mnesia inets odbc compiler erts \
@@ -445,13 +638,13 @@ dialyzer/erlang.plt:
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 
 dialyzer/deps.plt:
-	@mkdir -p dialyzer
+	@$(MKDIR_P) dialyzer
 	@dialyzer --build_plt --output_plt dialyzer/deps.plt \
 	-o dialyzer/deps.log $(deps); \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 
 dialyzer/ejabberd.plt:
-	@mkdir -p dialyzer
+	@$(MKDIR_P) dialyzer
 	@dialyzer --build_plt --output_plt dialyzer/ejabberd.plt \
 	-o dialyzer/ejabberd.log ebin; \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
@@ -473,6 +666,18 @@ dialyzer: erlang_plt deps_plt ejabberd_plt
 	--get_warnings -o dialyzer/error.log ebin; \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 endif
+endif
+
+#.
+#' elvis
+#
+
+elvis:
+	$(REBAR) lint
+
+#.
+#' test
+#
 
 test:
 	@echo "************************** NOTICE ***************************************"
@@ -481,33 +686,71 @@ test:
 	@cd priv && ln -sf ../sql
 	$(REBAR) $(SKIPDEPS) ct
 
-.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
-	install uninstall uninstall-binary uninstall-all translations deps test \
-	quicktest erlang_plt deps_plt ejabberd_plt xref hooks options
+.PHONY: test-%
+define test-group-target
+test-$1:
+	$(REBAR) $(SKIPDEPS) ct --suite=test/ejabberd_SUITE --group=$1
+endef
+
+ifneq ($(filter test-%,$(MAKECMDGOALS)),)
+group_to_test := $(patsubst test-%,%,$(filter test-%,$(MAKECMDGOALS)))
+$(eval $(call test-group-target,$(group_to_test)))
+endif
+
+testeunit:
+	$(REBAR) $(SKIPDEPS) eunit --verbose
+
+#.
+#' phony
+#
+
+.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean prod rel \
+	install uninstall uninstall-binary uninstall-all translations deps test testeunit \
+	all dev doap help install-rel relive scripts uninstall-rel update \
+	erlang_plt deps_plt ejabberd_plt xref hooks options format indent
+
+#.
+#' help
+#
 
 help:
 	@echo ""
-	@echo "  [all]          Compile dependencies and ejabberd"
-	@echo "  src            Compile ejabberd"
-	@echo "  deps           Get dependencies"
-	@echo "  update         Update dependencies' source code"
+	@echo "  [all]          "
+	@echo "  scripts        Prepare ejabberd start scripts"
+	@echo "  deps           Get and configure dependencies"
+	@echo "  src            Compile dependencies and ejabberd"
+	@echo "  update         Update dependencies source code"
 	@echo "  clean          Clean binary files"
 	@echo "  distclean      Clean completely the development files"
 	@echo ""
 	@echo "  install        Install ejabberd to /usr/local"
+	@echo "  install-rel    Install ejabberd to /usr/local (using release)"
 	@echo "  uninstall      Uninstall ejabberd (buggy)"
+	@echo "  uninstall-rel  Uninstall ejabberd (using release)"
 	@echo "  uninstall-all  Uninstall also configuration, logs, mnesia... (buggy)"
 	@echo ""
-	@echo "  rel            Build a production release"
+	@echo "  prod           Build a production release"
 	@echo "  dev            Build a development release"
-	@echo "  relive         Start a live ejabberd in _build/relive/"
+	@echo "  relive         Start live using rebar3/mix tools"
+	@echo "  relivectl      Start live using ejabberdctl script"
 	@echo ""
-	@echo "  edoc           Generate edoc documentation (unused)"
+	@echo "  doap           Generate DOAP file"
+	@echo "  edoc           Generate EDoc documentation [mix]"
 	@echo "  options        Generate ejabberd_option.erl"
-	@echo "  translations   Extract translation files (requires --enable-tools)"
-	@echo "  tags           Generate tags file for text editors"
+	@echo "  translations   Extract translation files"
+	@echo "  TAGS           Generate tags file for text editors"
+	@echo ""
+	@echo "  format         Format source code using rebar3_format"
+	@echo "  indent         Indent source code using erlang-mode [emacs]"
 	@echo ""
 	@echo "  dialyzer       Run Dialyzer static analyzer"
+	@echo "  elvis          Run Elvis source code style reviewer [rebar3]"
 	@echo "  hooks          Run hooks validator"
-	@echo "  test           Run Common Tests suite"
-	@echo "  xref           Run cross reference analysis"
+	@echo "  test           Run Common Tests suite [rebar3]"
+	@echo "  testeunit      Run EUnit suite [rebar3]"
+	@echo "  test-<group>   Run Common Test suite for specific group only [rebar3]"
+	@echo "  xref           Run cross reference analysis [rebar3]"
+
+#.
+#'
+# vim: foldmarker=#',#. foldmethod=marker:

README.md

@@ -1,36 +1,36 @@
 
 <p align="center">
-    <img src="https://www.process-one.net/wp-content/uploads/2022/05/ejabberd-logo-rounded-index.png"
-        height="216">
+    <img src="https://www.process-one.net/wp-content/uploads/2022/05/ejabberd-logo-rounded-index.png">
 </p>
 <p align="center">
     <a href="https://github.com/processone/ejabberd/tags" alt="GitHub tag (latest SemVer)">
        <img src="https://img.shields.io/github/v/tag/processone/ejabberd?sort=semver&logo=embarcadero&label=&color=3fb0d2&logoWidth=20" /></a>
     <a href="https://hex.pm/packages/ejabberd" alt="Hex version">
        <img src="https://img.shields.io/hexpm/v/ejabberd.svg" /></a>
-    <a href="https://github.com/processone/ejabberd/pkgs/container/ejabberd" alt="GitHub Container">
-       <img src="https://img.shields.io/github/v/tag/processone/ejabberd?label=container&sort=semver" /></a>
-    <a href="https://hub.docker.com/r/ejabberd/ecs/" alt="Docker Image Version (latest semver)">
-       <img src="https://img.shields.io/docker/v/ejabberd/ecs?label=docker" /></a>
     <a href="https://formulae.brew.sh/formula/ejabberd" alt="homebrew version">
        <img src="https://img.shields.io/homebrew/v/ejabberd" /></a>
+    <a href="https://hub.docker.com/r/ejabberd/ecs/" alt="Docker Image Version (latest semver)">
+       <img src="https://img.shields.io/docker/v/ejabberd/ecs?label=ecs&logo=docker" /></a>
+    <a href="https://github.com/processone/ejabberd/pkgs/container/ejabberd" alt="GitHub Container">
+       <img src="https://img.shields.io/github/v/tag/processone/ejabberd?label=ejabberd&sort=semver&logo=docker" /></a>
     <br />
     <a href="https://github.com/processone/ejabberd/actions/workflows/ci.yml" alt="CI">
        <img src="https://github.com/processone/ejabberd/actions/workflows/ci.yml/badge.svg" /></a>
     <a href="https://coveralls.io/github/processone/ejabberd?branch=master" alt="Coverage Status">
-       <img src="https://coveralls.io/repos/github/processone/ejabberd/badge.svg?branch=master "Coverage in coveralls.io"" /></a>
+       <img src="https://coveralls.io/repos/github/processone/ejabberd/badge.svg?branch=master" /></a>
     <a href="https://hosted.weblate.org/projects/ejabberd/ejabberd-po/" alt="Translation status">
-       <img src="https://hosted.weblate.org/widgets/ejabberd/-/ejabberd-po/svg-badge.svg"" /></a>
+       <img src="https://hosted.weblate.org/widgets/ejabberd/-/ejabberd-po/svg-badge.svg" /></a>
+    <a href="https://docs.ejabberd.im/" alt="ejabberd Docs">
+       <img src="https://img.shields.io/github/v/tag/processone/docs.ejabberd.im?sort=semver&logo=&label=docs&logoWidth=0" /></a>
 </p>
 
-
 [ejabberd][im] is an open-source,
 robust, scalable and extensible realtime platform built using [Erlang/OTP][erlang],
 that includes [XMPP][xmpp] Server, [MQTT][mqtt] Broker and [SIP][sip] Service.
 
 Check the features in [ejabberd.im][im], [ejabberd Docs][features],
-[ejabberd at ProcessOne][p1home], and a list of [supported protocols and XEPs][xeps].
-
+[ejabberd at ProcessOne][p1home], and the list of [supported protocols in ProcessOne][xeps]
+and [XMPP.org][xmppej].
 
 Installation
 ------------
@@ -38,13 +38,16 @@ Installation
 There are several ways to install ejabberd:
 
 - Source code: compile yourself, see [COMPILE](COMPILE.md)
-- Installers from [ProcessOne Downloads][p1dl] (run/deb/rpm for x64)
-- Installers from [ejabberd GitHub Releases][releases] (run/deb/rpm for x64 and arm64)
-- Container image from [ejabberd Docker Hub][hubecs], see [ecs README][docker-ecs-readme] (for x64)
-- Container image from [ejabberd Github Packages][packages], see [CONTAINER](CONTAINER.md) (for x64 and arm64)
+- Installers:
+  - [ProcessOne Download Page][p1download] or [GitHub Releases][releases] for releases.
+  - [GitHub Actions](https://github.com/processone/ejabberd/actions/workflows/installers.yml) for master branch (`run`/`deb`/`rpm` for `x64` and `arm64`)
+- Docker Containers:
+  - `ecs` container image: [Docker Hub][hubecs] and [Github Packages][packagesecs], see [ecs README][docker-ecs-readme] (for `x64`)
+  - `ejabberd` container image: [Github Packages][packages] for releases and master branch, see [CONTAINER](CONTAINER.md) (for `x64` and `arm64`)
 - Using your [Operating System package][osp]
 - Using the [Homebrew][homebrew] package manager
 
+More info can be found in the `Installation` part of [ejabberd Docs](https://docs.ejabberd.im/admin/install/).
 
 Documentation
 -------------
@@ -61,7 +64,6 @@ Once ejabberd is installed, try:
     ejabberdctl help
     man ejabberd.yml
 
-
 Development
 -----------
 
@@ -73,31 +75,37 @@ or in your local machine as explained in [Localization][localization].
 
 Documentation for developers is available in [ejabberd docs: Developers][docs-dev].
 
+There are nightly builds of ejabberd, both for `master` branch and for Pull Requests:
+
+- Installers: go to [GitHub Actions: Installers](https://github.com/processone/ejabberd/actions/workflows/installers.yml), open the most recent commit, on the bottom of that commit page, download the `ejabberd-packages.zip` artifact.
+- `ejabberd` container image: go to [ejabberd Github Packages][packages]
+
 Security reports or concerns should preferably be reported privately,
-please send an email to the address: contact [at] process-one [dot] net
+please send an email to the address: contact at process-one dot net
 or some other method from [ProcessOne Contact][p1contact].
 
 For commercial offering and support, including [ejabberd Business Edition][p1home]
 and [Fluux (ejabberd in the Cloud)][fluux], please check [ProcessOne ejabberd page][p1home].
 
+Security
+--------
+
+For information on how to report security vulnerabilities, please refer to the [SECURITY.md](SECURITY.md) file. It contains guidelines on how to report vulnerabilities privately and securely, ensuring that any issues are addressed in a timely and confidential manner.
 
 Community
 ---------
 
 There are several places to get in touch with other ejabberd developers and administrators:
 
-- [ejabberd XMPP chatroom][muc]: ejabberd@conference.process-one.net
-- [Mailing list][list]
+- ejabberd XMPP chatroom: [ejabberd@conference.process-one.net][muc]
 - [GitHub Discussions][discussions]
 - [Stack Overflow][stackoverflow]
 
-
 License
 -------
 
-ejabberd is released under the GNU General Public License v2 (see [COPYING](COPYING.md)),
-and [ejabberd translations](https://github.com/processone/ejabberd-po/) under MIT License.
-
+- ejabberd is released under the __GNU General Public License v2__ (see [COPYING](COPYING))
+- [ejabberd translations](https://github.com/processone/ejabberd-po/) under __MIT License__.
 
 [discussions]: https://github.com/processone/ejabberd/discussions
 [docker-ecs-readme]: https://github.com/processone/docker-ejabberd/tree/master/ecs#readme
@@ -106,23 +114,23 @@ and [ejabberd translations](https://github.com/processone/ejabberd-po/) under MI
 [erlang]: https://www.erlang.org/
 [features]: https://docs.ejabberd.im/admin/introduction/
 [fluux]: https://fluux.io/
-[github]: https://github.com/processone/ejabberd
-[homebrew]: https://docs.ejabberd.im/admin/installation/#homebrew
+[homebrew]: https://docs.ejabberd.im/admin/install/homebrew/
 [hubecs]: https://hub.docker.com/r/ejabberd/ecs/
-[im]: https://ejabberd.im/
+[im]: https://www.ejabberd.im/
 [issues]: https://github.com/processone/ejabberd/issues
-[list]: https://lists.jabber.ru/mailman/listinfo/ejabberd
 [localization]: https://docs.ejabberd.im/developer/extending-ejabberd/localization/
 [mqtt]: https://mqtt.org/
 [muc]: xmpp:ejabberd@conference.process-one.net
-[osp]: https://docs.ejabberd.im/admin/installation/#operating-system-packages
-[p1contact]: https://www.process-one.net/en/company/contact/
-[p1dl]: https://www.process-one.net/en/ejabberd/downloads/
-[p1home]: https://www.process-one.net/en/ejabberd/
+[osp]: https://docs.ejabberd.im/admin/install/os-package/
+[p1contact]: https://www.process-one.net/contact/
+[p1download]: https://www.process-one.net/download/ejabberd/
+[p1home]: https://www.process-one.net/ejabberd/
 [packages]: https://github.com/processone/ejabberd/pkgs/container/ejabberd
+[packagesecs]: https://github.com/processone/docker-ejabberd/pkgs/container/ecs
 [releases]: https://github.com/processone/ejabberd/releases
 [sip]: https://en.wikipedia.org/wiki/Session_Initiation_Protocol
 [stackoverflow]: https://stackoverflow.com/questions/tagged/ejabberd?sort=newest
 [weblate]: https://hosted.weblate.org/projects/ejabberd/ejabberd-po/
-[xeps]: https://www.process-one.net/en/ejabberd/protocols/
+[xeps]: https://www.process-one.net/ejabberd-features/
 [xmpp]: https://xmpp.org/
+[xmppej]: https://xmpp.org/software/servers/ejabberd/

SECURITY.md

@@ -0,0 +1,45 @@
+# Security Policy
+
+## Supported Versions
+
+We recommend that all users always use the latest version of ejabberd.
+
+To ensure the best experience and security, upgrade to the latest version available on [this repo](https://github.com/processone/ejabberd).
+
+## Reporting a Vulnerability
+
+### Private Reporting  
+
+**Preferred Method**: Use GitHub's private vulnerability reporting system by clicking the "Report a Vulnerability" button in the [Security tab of this repository](https://github.com/processone/ejabberd/security). This ensures your report is securely transmitted and tracked.  
+
+**Alternative**: If you cannot use the GitHub system, send an email to **`contact@process-one.net`** with the following details:  
+
+- A clear description of the vulnerability.  
+- Steps to reproduce the issue.  
+- Any potential impact or exploitation scenarios.  
+
+### Response Time  
+
+We aim to acknowledge receipt of your report within 72 hours. You can expect regular updates on the status of your report.  
+
+### Resolution  
+
+If the vulnerability is confirmed, we will work on a patch or mitigation strategy.  
+We will notify you once the issue is resolved and coordinate a public disclosure if needed.  
+
+### Acknowledgements  
+
+We value and appreciate the contributions of security researchers and community members.  
+If you wish, we are happy to acknowledge your efforts publicly by listing your name (or alias) below in this document.  
+Please let us know if you would like to be recognized when reporting the vulnerability.
+
+## Public Discussion
+
+For general inquiries or discussions about the project’s security, feel free to chat with us here:
+
+- XMPP room: `ejabberd@conference.process-one.net`
+- [GitHub Discussions](https://github.com/processone/ejabberd/discussions)
+
+However, please note that if the issue is **critical** or potentially exploitable, **do not share it publicly**. Instead, we strongly recommend you contact the maintainers directly via the private reporting methods outlined above to ensure a secure and timely response.
+
+Thank you for helping us improve the security of ejabberd!

config/runtime.exs

@@ -8,6 +8,8 @@ end
 rootpath = System.get_env("RELEASE_ROOT", rootdefault)
 config :ejabberd,
   file: Path.join(rootpath, "conf/ejabberd.yml"),
-  log_path: Path.join(rootpath, 'logs/ejabberd.log')
+  log_path: Path.join(rootpath, "logs/ejabberd.log")
 config :mnesia,
-  dir: Path.join(rootpath, 'database/')
+  dir: Path.join(rootpath, "database/")
+config :exsync,
+  reload_callback: {:ejabberd_admin, :update, []}

configure.ac

@@ -2,15 +2,26 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 22.05` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
-REQUIRE_ERLANG_MIN="8.3 (Erlang/OTP 19.3)"
+AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 26.03` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
+
+AC_ARG_WITH(min-erlang,
+	AS_HELP_STRING([--with-min-erlang=version],[set minimal required erlang version, default to OTP25]),
+[if test "X$withval" = "X"; then
+    REQUIRE_ERLANG_MIN="13.0 (Erlang/OTP 25.0)"
+else
+    REQUIRE_ERLANG_MIN="$withval"
+fi
+], [REQUIRE_ERLANG_MIN="13.0 (Erlang/OTP 25.0)"])
+
 REQUIRE_ERLANG_MAX="100.0.0 (No Max)"
 
 AC_CONFIG_MACRO_DIR([m4])
 
 # Checks for programs.
 AC_PROG_MAKE_SET
+AC_PROG_AWK
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 AC_PROG_SED
 
 if test "x$GCC" = "xyes"; then
@@ -28,18 +39,42 @@ fi
 ])
 
 AC_ARG_WITH(rebar,
-	AS_HELP_STRING([--with-rebar=bin],[use the rebar/rebar3/mix binary specified]),
+	AS_HELP_STRING([--with-rebar=bin],[use as build tool the rebar/rebar3/mix binary specified]),
 [if test "$withval" = "yes" -o "$withval" = "no" -o "X$with_rebar" = "X"; then
-    rebar="rebar"
+    rebar="rebar3"
 else
     rebar="$with_rebar"
 fi
-], [rebar="rebar"])
+], [rebar="unconfigured"])
 
 AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH])
 AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH])
 AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH])
 
+AC_PATH_TOOL(REBAR, rebar, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(REBAR3, rebar3, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(ELIXIR, elixir, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(IEX, iex, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(MIX, mix, , [${extra_erl_path}$PATH])
+
+if test "$rebar" = unconfigured; then
+    if test "x$ELIXIR" = "x" -o "x$IEX" = "x" -o "x$MIX" = "x"; then
+        if test "x$REBAR3" = "x"; then
+            rebar="rebar3"
+        else
+            rebar=$REBAR3
+        fi
+    else
+        rebar=$MIX
+    fi
+fi
+if test "x$rebar" = "xrebar" -a "x$REBAR" = "x" ; then
+    rebar="./rebar"
+fi
+if test "x$rebar" = "xrebar3" -a "x$REBAR3" = "x" ; then
+    rebar="./rebar3"
+fi
+
 AC_ERLANG_NEED_ERL
 AC_ERLANG_NEED_ERLC
 
@@ -84,7 +119,7 @@ AC_ARG_ENABLE(debug,
 esac],[if test "x$debug" = "x"; then debug=true; fi])
 
 AC_ARG_ENABLE(elixir,
-[AS_HELP_STRING([--enable-elixir],[enable Elixir support (default: no)])],
+[AS_HELP_STRING([--enable-elixir],[enable Elixir support in Rebar3 (default: no)])],
 [case "${enableval}" in
   yes) elixir=true ;;
   no)  elixir=false ;;
@@ -112,7 +147,7 @@ esac],[full_xml=false])
 
 ENABLEGROUP=""
 AC_ARG_ENABLE(group,
-  [AS_HELP_STRING([--enable-group[[[[=GROUP]]]]], [allow this system group to start ejabberd (default: no)])],
+  [AS_HELP_STRING([--enable-group[[=GROUP]]], [specify the group of the account defined in --enable-user (default: no)])],
   [case "${enableval}" in
      yes) ENABLEGROUP=`groups |head -n 1` ;;
      no) ENABLEGROUP="" ;;
@@ -157,12 +192,20 @@ AC_ARG_ENABLE(mysql,
 esac],[if test "x$mysql" = "x"; then mysql=false; fi])
 
 AC_ARG_ENABLE(new_sql_schema,
-[AS_HELP_STRING([--enable-new-sql-schema],[use new SQL schema by default (default: no)])],
+[AS_HELP_STRING([--enable-new-sql-schema],[obsolete, use --enable-multihost-sql-schema instead (default: no)])],
 [case "${enableval}" in
-  yes) new_sql_schema=true ;;
-  no)  new_sql_schema=false ;;
+  yes) multihost_sql_schema=true ;;
+  no)  multihost_sql_schema=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-new-sql-schema) ;;
-esac],[new_sql_schema=false])
+esac],[multihost_sql_schema=false])
+
+AC_ARG_ENABLE(multihost_sql_schema,
+[AS_HELP_STRING([--enable-multihost-sql-schema],[use multihost SQL schema by default (default: no)])],
+[case "${enableval}" in
+  yes) multihost_sql_schema=true ;;
+  no)  multihost_sql_schema=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-multihost-sql-schema) ;;
+esac],[multihost_sql_schema=false])
 
 AC_ARG_ENABLE(odbc,
 [AS_HELP_STRING([--enable-odbc],[enable pure ODBC support (default: no)])],
@@ -237,7 +280,7 @@ AC_ARG_ENABLE(system_deps,
 esac],[if test "x$system_deps" = "x"; then system_deps=false; fi])
 
 AC_ARG_ENABLE(tools,
-[AS_HELP_STRING([--enable-tools],[build development tools (default: no)])],
+[AS_HELP_STRING([--enable-tools],[include debugging/development tools (default: no)])],
 [case "${enableval}" in
   yes) tools=true ;;
   no)  tools=false ;;
@@ -246,7 +289,7 @@ esac],[if test "x$tools" = "x"; then tools=false; fi])
 
 ENABLEUSER=""
 AC_ARG_ENABLE(user,
-  [AS_HELP_STRING([--enable-user[[[[=USER]]]]], [allow this system user to start ejabberd (default: no)])],
+  [AS_HELP_STRING([--enable-user[[=USER]]], [allow this system user to start ejabberd (default: no)])],
   [case "${enableval}" in
      yes) ENABLEUSER=`whoami` ;;
      no) ENABLEUSER="" ;;
@@ -280,8 +323,10 @@ case "`uname`" in
   ;;
 esac
 
+AC_MSG_RESULT([build tool to use (change using --with-rebar): $rebar])
+
 AC_SUBST(roster_gateway_workaround)
-AC_SUBST(new_sql_schema)
+AC_SUBST(multihost_sql_schema)
 AC_SUBST(full_xml)
 AC_SUBST(odbc)
 AC_SUBST(mssql)
@@ -305,3 +350,26 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
 AC_OUTPUT
+
+AS_CASE([$rebar],
+ [*rebar3], [
+  deps=""
+  AS_IF([test "x$stun" = "xfalse"], [deps="stun,$deps"])
+  AS_IF([test "x$sqlite" = "xfalse"], [deps="sqlite3,$deps"])
+  AS_IF([test "x$pgsql" = "xfalse"], [deps="p1_pgsql,$deps"])
+  AS_IF([test "x$mysql" = "xfalse"], [deps="p1_mysql,$deps"])
+  AS_IF([test "x$zlib" = "xfalse"], [deps="ezlib,$deps"])
+  AS_IF([test "x$sip" = "xfalse"], [deps="esip,$deps"])
+  AS_IF([test "x$redis" = "xfalse"], [deps="eredis,$deps"])
+  AS_IF([test "x$pam" = "xfalse"], [deps="epam,$deps"])
+  AS_IF([test "x$deps" = "x"], [],
+   [AC_MSG_NOTICE([unlocking disabled rebar3 dependencies: $deps])
+    $rebar unlock "$deps"])
+  deps=""
+  ERLANG_VERSION=m4_esyscmd([erl -noinput -noshell -eval 'erlang:display(list_to_integer(erlang:system_info(otp_release))), halt().'])
+  AS_IF([test "$ERLANG_VERSION" -le "26"], [deps="jose,$deps"])
+  AS_IF([test "$ERLANG_VERSION" -ge "27"], [deps="jiffy,$deps"])
+  AS_IF([test "x$deps" = "x"], [],
+   [AC_MSG_NOTICE([unlocking rebar3 dependencies for old Erlang/OTP: $deps])
+    $rebar unlock "$deps"])
+ ])

ejabberd.doap

@@ -0,0 +1,876 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://usefulinc.com/ns/doap#"
+         xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#"
+         xmlns:schema="https://schema.org/">
+  <Project>
+    <name>ejabberd</name>
+    <shortdesc>XMPP Server with MQTT Broker and SIP Service</shortdesc>
+    <description>Robust, Ubiquitous and Massively Scalable Messaging Platform (XMPP Server, MQTT Broker, SIP Service)</description>
+    <created>2002-11-16</created>
+    <os>BSD</os>
+    <os>Linux</os>
+    <os>macOS</os>
+    <os>Windows</os>
+    <programming-langauge>Erlang</programming-langauge>
+    <programming-langauge>C</programming-langauge>
+    <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-jabber"/>
+    <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-server"/>
+    <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-xmpp"/>
+
+    <homepage rdf:resource="https://www.ejabberd.im"/>
+    <download-page rdf:resource="https://www.process-one.net/download/ejabberd/"/>
+    <download-mirror rdf:resource="https://github.com/processone/ejabberd/tags"/>
+    <license rdf:resource="https://raw.githubusercontent.com/processone/ejabberd/master/COPYING"/>
+    <schema:logo rdf:resource="https://docs.ejabberd.im/assets/img/footer_logo_e@2x.png"/>
+    <bug-database rdf:resource="https://github.com/processone/ejabberd/issues"/>
+    <support-forum rdf:resource="xmpp:ejabberd@conference.process-one.net?join"/>
+    <repository>
+      <GitRepository>
+        <location rdf:resource="https://github.com/processone/ejabberd.git"/>
+        <browse rdf:resource="https://github.com/processone/ejabberd"/>
+      </GitRepository>
+    </repository>
+
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc3261"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc3920"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc3921"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc5766"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc5802"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc6120"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc6121"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc6122"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc6455"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc7395"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc7590"/>
+
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html"/>
+        <xmpp:version>2.13.2</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0012.html"/>
+        <xmpp:version>2.0</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_last</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0013.html"/>
+        <xmpp:version>1.3</xmpp:version>
+        <xmpp:since>16.02</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_offline</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0016.html"/>
+        <xmpp:version>1.7</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_privacy</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0022.html"/>
+        <xmpp:version>1.4</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_offline</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0023.html"/>
+        <xmpp:version>1.3</xmpp:version>
+        <xmpp:since>0.7.5</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_offline</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html"/>
+        <xmpp:version>2.5.0</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_disco</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0033.html"/>
+        <xmpp:version>1.1</xmpp:version>
+        <xmpp:since>15.04</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_multicast</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0039.html"/>
+        <xmpp:version>0.6.0</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_stats</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html"/>
+        <xmpp:version>1.35.3</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_muc</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html"/>
+        <xmpp:version>1.2</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_pubsub</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0049.html"/>
+        <xmpp:version>1.2</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_private</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0050.html"/>
+        <xmpp:version>1.3.0</xmpp:version>
+        <xmpp:since>1.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_adhoc</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html"/>
+        <xmpp:version>1.3.0</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_vcard</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0055.html"/>
+        <xmpp:version>1.3</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_vcard</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html"/>
+        <xmpp:version>1.0</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0060.html"/>
+        <xmpp:version>1.14</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>partial</xmpp:status>
+        <xmpp:note>mod_pubsub</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0065.html"/>
+        <xmpp:version>1.8.2</xmpp:version>
+        <xmpp:since>2.0.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_proxy65</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0077.html"/>
+        <xmpp:version>2.4</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_register</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0078.html"/>
+        <xmpp:version>2.5</xmpp:version>
+        <xmpp:since>17.03</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_legacy_auth</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0082.html"/>
+        <xmpp:version>1.1.1</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html"/>
+        <xmpp:version>2.1</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_client_state</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0086.html"/>
+        <xmpp:version>1.0</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0092.html"/>
+        <xmpp:version>1.1</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_version</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0106.html"/>
+        <xmpp:version>1.1.1</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0114.html"/>
+        <xmpp:version>1.6</xmpp:version>
+        <xmpp:since>0.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>ejabberd_service</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html"/>
+        <xmpp:version>1.6.0</xmpp:version>
+        <xmpp:since>2.1.4</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_caps</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0124.html"/>
+        <xmpp:version>1.11.2</xmpp:version>
+        <xmpp:since>16.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>ejabberd_bosh</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0133.html"/>
+        <xmpp:version>1.3.1</xmpp:version>
+        <xmpp:since>13.10</xmpp:since>
+        <xmpp:status>partial</xmpp:status>
+        <xmpp:note>mod_configure</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0138.html"/>
+        <xmpp:version>2.1</xmpp:version>
+        <xmpp:since>1.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>ejabberd_c2s</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0153.html"/>
+        <xmpp:version>1.1.1</xmpp:version>
+        <xmpp:since>17.09</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_vcard</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0156.html"/>
+        <xmpp:version>1.4.0</xmpp:version>
+        <xmpp:since>22.05</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_host_meta</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html"/>
+        <xmpp:version>1.1.1</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_disco</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0158.html"/>
+        <xmpp:version>1.0.1</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>ejabberd_captcha</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0160.html"/>
+        <xmpp:version>1.0.1</xmpp:version>
+        <xmpp:since>16.01</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_offline</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0163.html"/>
+        <xmpp:version>1.2.2</xmpp:version>
+        <xmpp:since>2.0.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_pubsub</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0170.html"/>
+        <xmpp:version>1.0</xmpp:version>
+        <xmpp:since>17.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0175.html"/>
+        <xmpp:version>1.2</xmpp:version>
+        <xmpp:since>1.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>ejabberd_auth_anonymous</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0178.html"/>
+        <xmpp:version>1.2</xmpp:version>
+        <xmpp:since>17.03</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0185.html"/>
+        <xmpp:version>1.0</xmpp:version>
+        <xmpp:since>17.03</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_s2s_dialback</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0191.html"/>
+        <xmpp:version>1.3</xmpp:version>
+        <xmpp:since>2.1.7</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_blocking</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html"/>
+        <xmpp:version>1.5.2</xmpp:version>
+        <xmpp:since>14.05</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_stream_mgmt</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0199.html"/>
+        <xmpp:version>2.0.1</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_ping</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0202.html"/>
+        <xmpp:version>2.0</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_time</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0203.html"/>
+        <xmpp:version>2.0</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_offline</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0205.html"/>
+        <xmpp:version>1.0.2</xmpp:version>
+        <xmpp:since>1.1.2</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0206.html"/>
+        <xmpp:version>1.4</xmpp:version>
+        <xmpp:since>16.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>ejabberd_bosh</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0215.html"/>
+        <xmpp:version>1.0.0</xmpp:version>
+        <xmpp:since>20.04</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_stun_disco</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0220.html"/>
+        <xmpp:version>1.1.1</xmpp:version>
+        <xmpp:since>17.03</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_s2s_dialback</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0223.html"/>
+        <xmpp:version>1.1.1</xmpp:version>
+        <xmpp:since>2.0.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_pubsub</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0227.html"/>
+        <xmpp:version>1.1</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>partial</xmpp:status>
+        <xmpp:note>ejabberd_piefxis</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0231.html"/>
+        <xmpp:version>1.1</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>ejabberd_captcha</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0237.html"/>
+        <xmpp:version>1.3</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_roster</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0248.html"/>
+        <xmpp:version>0.2</xmpp:version>
+        <xmpp:since>2.1.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_pubsub</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0249.html"/>
+        <xmpp:version>1.2</xmpp:version>
+        <xmpp:since>0.5.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_muc</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0279.html"/>
+        <xmpp:version>0.2</xmpp:version>
+        <xmpp:since>2.1.3</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_sic</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html"/>
+        <xmpp:version>1.0.1</xmpp:version>
+        <xmpp:since>13.06</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_carboncopy</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0288.html"/>
+        <xmpp:version>1.0.1</xmpp:version>
+        <xmpp:since>24.10</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_s2s_bidi</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html"/>
+        <xmpp:version>0.6.1</xmpp:version>
+        <xmpp:since>15.06</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mam</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0317.html"/>
+        <xmpp:version>0.3.1</xmpp:version>
+        <xmpp:since>21.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_muc_room, 0.3.1 since 25.10</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0328.html"/>
+        <xmpp:version>0.1</xmpp:version>
+        <xmpp:since>19.09</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_jidprep</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0334.html"/>
+        <xmpp:version>1.0.0</xmpp:version>
+        <xmpp:since>16.01</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mam, mod_muc_log, mod_offline</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0352.html"/>
+        <xmpp:version>0.1</xmpp:version>
+        <xmpp:since>14.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_client_state</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0355.html"/>
+        <xmpp:version>0.4.1</xmpp:version>
+        <xmpp:since>16.09</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_delegation</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0356.html"/>
+        <xmpp:version>0.4.1</xmpp:version>
+        <xmpp:since>24.10</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_privilege</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0357.html"/>
+        <xmpp:version>0.4.1</xmpp:version>
+        <xmpp:since>17.08</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_push</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0359.html"/>
+        <xmpp:version>0.7.0</xmpp:version>
+        <xmpp:since>15.09</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mam</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html"/>
+        <xmpp:version>0.3.0</xmpp:version>
+        <xmpp:since>15.10</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_http_upload</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html"/>
+        <xmpp:version>1.1.0</xmpp:version>
+        <xmpp:since>17.09</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0369.html"/>
+        <xmpp:version>0.14.1</xmpp:version>
+        <xmpp:since>16.03</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mix</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0379.html"/>
+        <xmpp:version>0.3.3</xmpp:version>
+        <xmpp:since>26.01</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_invites</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html"/>
+        <xmpp:version>0.9.0</xmpp:version>
+        <xmpp:since>21.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>node_pep</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0386.html"/>
+        <xmpp:version>0.3.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0388.html"/>
+        <xmpp:version>1.0.4</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0398.html"/>
+        <xmpp:version>1.0.0</xmpp:version>
+        <xmpp:since>18.03</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_avatar</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0401.html"/>
+        <xmpp:version>0.5.0</xmpp:version>
+        <xmpp:since>26.01</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_invites</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0402.html"/>
+        <xmpp:version>1.2.0</xmpp:version>
+        <xmpp:since>23.10</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_private</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0405.html"/>
+        <xmpp:version>0.3.0</xmpp:version>
+        <xmpp:since>19.02</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mix_pam</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0410.html"/>
+        <xmpp:version>1.1.0</xmpp:version>
+        <xmpp:since>18.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_muc_room</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0411.html"/>
+        <xmpp:version>1.1.0</xmpp:version>
+        <xmpp:since>18.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_private</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0421.html"/>
+        <xmpp:version>1.0.1</xmpp:version>
+        <xmpp:since>23.10</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_muc</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0424.html"/>
+        <xmpp:version>0.4.2</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status>partial</xmpp:status>
+        <xmpp:note>mod_mam, Tombstones not implemented</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html"/>
+        <xmpp:version>0.3.0</xmpp:version>
+        <xmpp:since>24.06</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mam</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0431.html"/>
+        <xmpp:version>0.2.0</xmpp:version>
+        <xmpp:since>24.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mam</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0440.html"/>
+        <xmpp:version>1.0.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html"/>
+        <xmpp:version>0.2.0</xmpp:version>
+        <xmpp:since>15.06</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_mam</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0445.html"/>
+        <xmpp:version>0.2.0</xmpp:version>
+        <xmpp:since>26.01</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_invites</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0474.html"/>
+        <xmpp:version>0.5.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>, 0.4.0 since 25.03</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0480.html"/>
+        <xmpp:version>0.2.0</xmpp:version>
+        <xmpp:since>24.10</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_scram_upgrade</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0484.html"/>
+        <xmpp:version>0.2.0</xmpp:version>
+        <xmpp:since>24.12</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_auth_fast</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0485.html"/>
+        <xmpp:version>1.0.0</xmpp:version>
+        <xmpp:since>25.07</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_pubsub_serverinfo</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0486.html"/>
+        <xmpp:version>0.1.0</xmpp:version>
+        <xmpp:since>24.07</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_muc</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+  </Project>
+</rdf:RDF>

ejabberd.service.template

@@ -9,7 +9,6 @@ Group=@installuser@
 LimitNOFILE=65536
 Restart=on-failure
 RestartSec=5
-WatchdogSec=30
 ExecStart=@ctlscriptpath@/ejabberdctl foreground
 ExecStop=/bin/sh -c '@ctlscriptpath@/ejabberdctl stop && @ctlscriptpath@/ejabberdctl stopped'
 ExecReload=@ctlscriptpath@/ejabberdctl reload_config

ejabberd.yml.example

@@ -36,17 +36,17 @@ listen:
   -
     port: 5223
     ip: "::"
-    tls: true
     module: ejabberd_c2s
     max_stanza_size: 262144
     shaper: c2s_shaper
     access: c2s
-    starttls_required: true
+    tls: true
   -
     port: 5269
     ip: "::"
     module: ejabberd_s2s_in
     max_stanza_size: 524288
+    shaper: s2s_shaper
   -
     port: 5443
     ip: "::"
@@ -67,7 +67,7 @@ listen:
       /admin: ejabberd_web_admin
       /.well-known/acme-challenge: ejabberd_acme
   -
-    port: 3478
+    port: 5478
     ip: "::"
     transport: udp
     module: ejabberd_stun
@@ -111,11 +111,19 @@ access_rules:
 
 api_permissions:
   "console commands":
-    from:
-      - ejabberd_ctl
+    from: ejabberd_ctl
     who: all
     what: "*"
-  "admin access":
+  "webadmin commands":
+    from: ejabberd_web_admin
+    who: admin
+    what: "*"
+  "adhoc commands":
+    from: mod_adhoc_api
+    who: admin
+    what: "*"
+  "http access":
+    from: mod_http_api
     who:
       access:
         allow:
@@ -156,6 +164,7 @@ shaper_rules:
 
 modules:
   mod_adhoc: {}
+  mod_adhoc_api: {}
   mod_admin_extra: {}
   mod_announce:
     access: announce
@@ -170,7 +179,7 @@ modules:
   mod_fail2ban: {}
   mod_http_api: {}
   mod_http_upload:
-    put_url: https://@HOST@:5443/upload
+    put_url: https://@HOST_URL_ENCODE@:5443/upload
     custom_headers:
       "Access-Control-Allow-Origin": "https://@HOST@"
       "Access-Control-Allow-Methods": "GET,HEAD,PUT,OPTIONS"
@@ -224,6 +233,7 @@ modules:
     ip_access: trusted_network
   mod_roster:
     versioning: true
+  mod_s2s_bidi: {}
   mod_s2s_dialback: {}
   mod_shared_roster: {}
   mod_stream_mgmt:

ejabberdctl.cfg.example

@@ -24,6 +24,34 @@
 #
 #ERL_MAX_PORTS=65536
 
+#.
+#' INET_DIST_INTERFACE: IP address where this Erlang node listens other nodes
+#
+# This communication is used by ejabberdctl command line tool,
+# and in a cluster of several ejabberd nodes.
+#
+# Default: 0.0.0.0
+#
+#INET_DIST_INTERFACE=127.0.0.1
+
+#.
+#' ERL_DIST_PORT: Port number for Erlang distribution
+#
+# For Erlang distribution, clustering and ejabberdctl usage, the
+# Erlang VM listens in a random TCP port number, and the Erlang Port
+# Mapper Daemon (EPMD) is spawned and used to determine this port
+# number.
+#
+# ERL_DIST_PORT can define this port number.  In that case, EPMD is
+# not spawned during ejabberd startup, and ERL_EPMD_ADDRESS is
+# ignored. ERL_DIST_PORT must be set to the same port number during
+# ejabberd startup and when calling ejabberdctl.  This feature
+# requires at least Erlang/OTP 23.1.
+#
+# Default: not defined
+#
+#ERL_DIST_PORT=5210
+
 #.
 #' FIREWALL_WINDOW: Range of allowed ports to pass through a firewall
 #
@@ -37,20 +65,10 @@
 #FIREWALL_WINDOW=
 
 #.
-#' INET_DIST_INTERFACE: IP address where this Erlang node listens other nodes
-#
-# This communication is used by ejabberdctl command line tool,
-# and in a cluster of several ejabberd nodes.
-#
-# Default: 0.0.0.0
-#
-#INET_DIST_INTERFACE=127.0.0.1
-
-#.
-#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
+#' ERL_EPMD_ADDRESS: IP addresses where EPMD listens for connections
 #
 # This environment variable may be set to a comma-separated
-# list of IP addresses, in which case the epmd daemon
+# list of IP addresses, in which case the EPMD daemon
 # will listen only on the specified address(es) and on the
 # loopback address (which is implicitly added to the list if it
 # has not been specified). The default behaviour is to listen on
@@ -90,10 +108,11 @@
 #.
 #' ERL_OPTIONS: Additional Erlang options
 #
-# The next variable allows to specify additional options passed to erlang while
-# starting ejabberd. Some useful options are -noshell, -detached, -heart. When
-# ejabberd is started from an init.d script options -noshell and -detached are
-# added implicitly. See erl(1) for more info.
+# The next variable allows to specify additional options passed to
+# all commands using erlang interpreter. This applies to starting
+# ejabberd server itself but also auxiliary commands like for example
+# starting debug shell. See erl(1) for list of commands that can be
+# used here.
 #
 # It might be useful to add "-pa /usr/local/lib/ejabberd/ebin" if you
 # want to add local modules in this path.
@@ -102,6 +121,20 @@
 #
 #ERL_OPTIONS=""
 
+#.
+#' EJABBERD_OPTS: Additional Erlang options to start ejabberd
+#
+# The next variable allows to specify additional options passed to erlang while
+# starting ejabberd. Some useful options are -noshell, -detached, -heart. When
+# ejabberd is started from an init.d script options -noshell and -detached are
+# added implicitly. See erl(1) for more info.
+#
+# For example you can use value "-heart -env HEART_BEAT_TIMEOUT 120 -env ERL_CRASH_DUMP_SECONDS 60"
+#
+# Default: ""
+#
+#EJABBERD_OPTS=""
+
 #.
 #' ERLANG_NODE: Erlang node name
 #
@@ -165,6 +198,17 @@
 #
 #CONTRIB_MODULES_CONF_DIR=/etc/ejabberd/modules
 
+#.
+#' CTL_OVER_HTTP: Path to ejabberdctl HTTP listener socket
+#
+# To speedup ejabberdctl execution time for ejabberd commands,
+# you can setup an ejabberd_http listener with ejabberd_ctl handling requests,
+# listening in a unix domain socket.
+#
+# Default: disabled
+#
+#CTL_OVER_HTTP=sockets/ctl_over_http.sock
+
 #.
 #'
 # vim: foldmarker=#',#. foldmethod=marker:

ejabberdctl.template

@@ -15,8 +15,8 @@ SCRIPT_DIR="$(cd "$(dirname "$SCRIPT")" && pwd -P)"
 # shellcheck disable=SC2034
 ERTS_VSN="{{erts_vsn}}"
 ERL="{{erl}}"
-IEX="{{bindir}}/iex"
 EPMD="{{epmd}}"
+IEX="{{iexpath}}"
 INSTALLUSER="{{installuser}}"
 
 # check the proper system user is used
@@ -59,7 +59,6 @@ done
 # define ejabberd variables if not already defined from the command line
 : "${CONFIG_DIR:="{{config_dir}}"}"
 : "${LOGS_DIR:="{{logs_dir}}"}"
-: "${SPOOL_DIR:="{{spool_dir}}"}"
 : "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
 : "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
 # Allows passing extra Erlang command-line arguments in vm.args file
@@ -67,20 +66,30 @@ done
 # shellcheck source=ejabberdctl.cfg.example
 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
 [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
+[ "$ERLANG_NODE" = "${ERLANG_NODE%@*}" ] && ERLANG_NODE="$ERLANG_NODE@$(hostname -s)"
 [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
+: "${SPOOL_DIR:="{{spool_dir}}"}"
 : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
 
+# backward support for old mnesia spool dir path
+: "${SPOOL_DIR_OLD:="$SPOOL_DIR/$ERLANG_NODE"}"
+[ -r "$SPOOL_DIR_OLD/schema.DAT" ] && [ ! -r "$SPOOL_DIR/schema.DAT" ] && SPOOL_DIR="$SPOOL_DIR_OLD"
+
 # define erl parameters
 ERLANG_OPTS="+K $POLL +P $ERL_PROCESSES $ERL_OPTIONS"
 if [ -n "$FIREWALL_WINDOW" ] ; then
     ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
 fi
 if [ -n "$INET_DIST_INTERFACE" ] ; then
-    INET_DIST_INTERFACE2=$("$ERL" -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt)
+    INET_DIST_INTERFACE2=$("$ERL" $ERLANG_OPTS -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt)
     if [ -n "$INET_DIST_INTERFACE2" ] ; then
+        if [ "$(echo "$INET_DIST_INTERFACE2" | grep -o "," | wc -l)" -eq 7 ] ; then
+            INET_DIST_INTERFACE2="$INET_DIST_INTERFACE2 -proto_dist inet6_tcp"
+        fi
         ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
     fi
 fi
+[ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -erl_epmd_port $ERL_DIST_PORT -start_epmd false"
 # if vm.args file exists in config directory, pass it to Erlang VM
 [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS"
 ERL_LIBS='{{libdir}}'
@@ -88,9 +97,12 @@ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
 ERL_INETRC="$CONFIG_DIR"/inetrc
 
 # define ejabberd parameters
-EJABBERD_OPTS="$EJABBERD_OPTS\
-$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")"
+EJABBERD_OPTS="\
+$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_window_time/!d;s/:[ \t]*\([0-9]*[a-z]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$EJABBERD_OPTS"
 [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS"
 EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd"
 
@@ -100,6 +112,7 @@ export EJABBERD_LOG_PATH
 export EJABBERD_PID_PATH
 export ERL_CRASH_DUMP
 export ERL_EPMD_ADDRESS
+export ERL_DIST_PORT
 export ERL_INETRC
 export ERL_MAX_PORTS
 export ERL_MAX_ETS_TABLES
@@ -108,12 +121,30 @@ export CONTRIB_MODULES_CONF_DIR
 export ERL_LIBS
 export SCRIPT_DIR
 
+# Only required for Erlang/OTP 25:
+export ERL_FLAGS="$ERL_FLAGS -enable-feature maybe_expr"
+
+set_dist_client()
+{
+    [ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -dist_listen false"
+}
+
 # run command either directly or via su $INSTALLUSER
 exec_cmd()
 {
-    case $EXEC_CMD in
-        as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
-        as_current_user) "$@" ;;
+    case $EXEC_CMD,$(uname -s) in
+        as_install_user,OpenBSD)
+            su -s /bin/sh "$INSTALLUSER" -c 'exec "$0" "$@"' "$@"
+            ;;
+        as_install_user,NetBSD)
+            su "$INSTALLUSER" -c 'exec "$0" "$@"' -- "$@"
+            ;;
+        as_install_user,*)
+            su -s /bin/sh -c 'exec "$0" "$@"' "$INSTALLUSER" -- "$@"
+            ;;
+        as_current_user,*)
+            "$@"
+            ;;
     esac
 }
 exec_erl()
@@ -140,9 +171,11 @@ debugwarning()
         echo "Please be extremely cautious with your actions,"
         echo "and exit immediately if you are not completely sure."
         echo ""
-        echo "To detach this shell from ejabberd, press:"
-        echo "  control+c, control+c"
+        echo "To exit and detach this shell from ejabberd, press:"
+        echo "  control+g and then q"
         echo ""
+        #vt100 echo "Please do NOT use control+c in this debug shell !"
+        #vt100 echo ""
         echo "--------------------------------------------------------------------"
         echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
         echo "  EJABBERD_BYPASS_WARNINGS=true"
@@ -163,8 +196,10 @@ livewarning()
         echo "Please be extremely cautious with your actions,"
         echo "and exit immediately if you are not completely sure."
         echo ""
-        echo "To exit this LIVE mode and stop ejabberd, press:"
-        echo "  q().  and press the Enter key"
+        echo "To stop ejabberd gracefully:"
+        echo "  ejabberd:stop()."
+        echo "To quit erlang immediately, press:"
+        echo "  control+g and then q"
         echo ""
         echo "--------------------------------------------------------------------"
         echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
@@ -175,6 +210,39 @@ livewarning()
     fi
 }
 
+check_etop_result()
+{
+    result=$?
+    if [ $result -eq 1 ] ; then
+        echo ""
+        echo "It seems there was some problem running 'ejabberdctl etop'."
+        echo "Is the error message something like this?"
+        echo "  Failed to load module 'etop' because it cannot be found..."
+        echo "Then probably ejabberd was compiled with development tools disabled."
+        echo "To use 'etop', recompile ejabberd with: ./configure --enable-tools"
+        echo ""
+        exit $result
+    fi
+}
+
+check_iex_result()
+{
+    result=$?
+    if [ $result -eq 127 ] ; then
+        echo ""
+        echo "It seems there was some problem finding 'iex' binary from Elixir."
+        echo "Probably ejabberd was compiled with Rebar3 and Elixir disabled, like:"
+        echo "  ./configure"
+        echo "which is equivalent to:"
+        echo "  ./configure --with-rebar=rebar3 --disable-elixir"
+        echo "To use 'iex', recompile ejabberd enabling Elixir or using Mix:"
+        echo "  ./configure --enable-elixir"
+        echo "  ./configure --with-rebar=mix"
+        echo ""
+        exit $result
+    fi
+}
+
 help()
 {
     echo ""
@@ -203,21 +271,40 @@ help()
 }
 
 # dynamic node name helper
-uid()
-{
-    uuid=$(uuidgen 2>/dev/null)
-    random=$(awk 'BEGIN { srand(); print int(rand()*32768) }' /dev/null)
-    [ -z "$uuid" ] && [ -f /proc/sys/kernel/random/uuid ] && uuid=$(cat /proc/sys/kernel/random/uuid)
-    [ -z "$uuid" ] && uuid=$(printf "%X" "${random:-$$}$(date +%M%S)")
-    uuid=$(printf '%s' $uuid | sed 's/^\(...\).*$/\1/')
-    [ $# -eq 0 ] && echo "${uuid}-${ERLANG_NODE}"
-    [ $# -eq 1 ] && echo "${uuid}-${1}-${ERLANG_NODE}"
-    [ $# -eq 2 ] && echo "${uuid}-${1}@${2}"
+uid() {
+  ERTSVERSION="$("$ERL" -version 2>&1 | sed 's|.* \([0-9]*[0-9]\).*|\1|g')"
+  if [ $ERTSVERSION -lt 11 ] ; then # otp 23.0 includes erts 11.0
+    # Erlang/OTP lower than 23, which doesn's support dynamic node code
+    N=1
+    PF=$(( $$ % 97 ))
+    while
+      case $# in
+        0) NN="${PF}-${N}-${ERLANG_NODE}"
+          ;;
+        1) NN="${PF}-${N}-${1}-${ERLANG_NODE}"
+          ;;
+        2) NN="${PF}-${N}-${1}@${2}"
+          ;;
+      esac
+      N=$(( N + 1 + ( $$ % 5 ) ))
+      "$EPMD" -names 2>/dev/null | grep -q " ${NN%@*} "
+    do :; done
+    echo $NN
+  else
+    # Erlang/OTP 23 or higher: use native dynamic node code
+    # https://www.erlang.org/patches/otp-23.0#OTP-13812
+    if [ "$ERLANG_NODE" != "${ERLANG_NODE%.*}" ]; then
+      echo "undefined@${ERLANG_NODE#*@}"
+    else
+      echo "undefined"
+    fi
+  fi
 }
 
 # stop epmd if there is no other running node
 stop_epmd()
 {
+    [ -n "$ERL_DIST_PORT" ] && return
     "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
 }
 
@@ -225,6 +312,20 @@ stop_epmd()
 # if all ok, ensure runtime directory exists and make it current directory
 check_start()
 {
+    [ -n "$ERL_DIST_PORT" ] && {
+        netstat -nl | grep ":$ERL_DIST_PORT" >/dev/null && {
+            echo ""
+            echo "NOTE:  The file ejabberdctl.cfg has configured ERL_DIST_PORT=$ERL_DIST_PORT"
+            echo "       and the port 5210 is already in use."
+            echo "       If ejabberd fails to start with listen error eaddrinsuse,"
+            echo "       try configuring in ejabberdctl.cfg a different"
+            echo "       INET_DIST_INTERFACE, or different ERL_DIST_PORT"
+            echo ""
+            netstat -nlp 2>/dev/null | grep ":5210"
+            echo ""
+        }
+        return
+    }
     "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
         pgrep -f "$ERLANG_NODE" >/dev/null && {
             echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
@@ -243,6 +344,13 @@ check_start()
 # allow sync calls
 wait_status()
 {
+    wait_status_node "$ERLANG_NODE" $1 $2 $3
+}
+
+wait_status_node()
+{
+    CONNECT_NODE=$1
+    shift
     # args: status try delay
     # return: 0 OK, 1 KO
     timeout="$2"
@@ -253,14 +361,71 @@ wait_status()
         if [ $timeout -eq 0 ] ; then
             status="$1"
         else
-            exec_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
-                     -extra "$ERLANG_NODE" $NO_TIMEOUT status > /dev/null
+            exec_erl "$(uid ctl)" -hidden -noinput \
+                     -eval 'net_kernel:connect_node('"'$CONNECT_NODE'"')' \
+                     -s ejabberd_ctl \
+                     -extra "$CONNECT_NODE" $NO_TIMEOUT status > /dev/null
             status="$?"
         fi
     done
     [ $timeout -gt 0 ]
 }
 
+exec_other_command()
+{
+    exec_other_command_node $ERLANG_NODE "$@"
+}
+
+exec_other_command_node()
+{
+    CONNECT_NODE=$1
+    shift
+    if [ -z "$CTL_OVER_HTTP" ] || [ ! -S "$CTL_OVER_HTTP" ] \
+        || [ ! -x "$(command -v curl)" ] || [ -z "$1" ] || [ "$1" = "help" ] \
+        || [ "$1" = "mnesia_info_ctl" ]|| [ "$1" = "print_sql_schema" ] ; then
+        exec_erl "$(uid ctl)" -hidden -noinput \
+                 -eval 'net_kernel:connect_node('"'$CONNECT_NODE'"')' \
+                 -s ejabberd_ctl \
+                 -extra "$CONNECT_NODE" $NO_TIMEOUT "$@"
+        result=$?
+        case $result in
+            3) help;;
+            *) :;;
+        esac
+        return $result
+    else
+        exec_ctl_over_http_socket "$@"
+    fi
+}
+
+exec_ctl_over_http_socket()
+{
+    COMMAND=${1}
+    CARGS=""
+    while [ $# -gt 0 ]; do
+        [ -z "$CARGS" ] && CARGS="[" || CARGS="${CARGS}, "
+        CARGS="${CARGS}\"$1\""
+        shift
+    done
+    CARGS="${CARGS}]"
+    TEMPHEADERS=temp-headers.log
+    curl \
+        --unix-socket ${CTL_OVER_HTTP} \
+        --header "Content-Type: application/json" \
+        --header "Accept: application/json" \
+        --data "${CARGS}" \
+        --dump-header ${TEMPHEADERS} \
+        --no-progress-meter \
+        "http://localhost/ctl/${COMMAND}"
+    result=$(sed -n 's/.*status-code: \([0-9]*\).*/\1/p' < $TEMPHEADERS)
+    rm ${TEMPHEADERS}
+    case $result in
+        2|3) exec_other_command help ${COMMAND};;
+        *) :;;
+    esac
+    exit $result
+}
+
 # ensure we can change current directory to SPOOL_DIR
 [ -d "$SPOOL_DIR" ] || exec_cmd mkdir -p "$SPOOL_DIR"
 cd "$SPOOL_DIR" || {
@@ -268,6 +433,103 @@ cd "$SPOOL_DIR" || {
     exit 6
 }
 
+printe()
+{
+    printf "\n"
+    printf "\e[1;40;32m==> %s\e[0m\n" "$1"
+}
+
+## Function copied from tools/make-installers
+user_agrees()
+{
+    question="$*"
+
+    if [ -t 0 ]
+    then
+        printe "$question (y/n) [n]"
+        read -r response
+        case "$response" in
+        [Yy]|[Yy][Ee][Ss])
+            return 0
+            ;;
+        [Nn]|[Nn][Oo]|'')
+            return 1
+            ;;
+        *)
+            echo 'Please respond with "yes" or "no".'
+            user_agrees "$question"
+            ;;
+        esac
+    else # Assume 'yes' if not running interactively.
+        return 0
+    fi
+}
+
+mnesia_change()
+{
+    ERLANG_NODE_OLD="$1"
+    [ "$ERLANG_NODE_OLD" = "" ] \
+        && echo "Error: Please provide the old erlang node name, for example:" \
+        && echo "  ejabberdctl mnesia_change ejabberd@oldmachine" \
+        && exit 1
+
+    SPOOL_DIR_BACKUP=$SPOOL_DIR/$ERLANG_NODE_OLD-backup/
+    OLDFILE=$SPOOL_DIR_BACKUP/$ERLANG_NODE_OLD.backup
+    NEWFILE=$SPOOL_DIR_BACKUP/$ERLANG_NODE.backup
+
+    printe "This changes your mnesia database from node name '$ERLANG_NODE_OLD' to '$ERLANG_NODE'"
+
+    [ -d "$SPOOL_DIR_BACKUP" ] && printe "WARNING! A backup of old node already exists in $SPOOL_DIR_BACKUP"
+
+    if ! user_agrees "Do you want to proceed?"
+    then
+        echo 'Operation aborted.'
+        exit 1
+    fi
+
+    printe "Starting ejabberd with old node name $ERLANG_NODE_OLD ..."
+    exec_erl "$ERLANG_NODE_OLD" $EJABBERD_OPTS -detached
+    wait_status_node $ERLANG_NODE_OLD 0 30 2
+    result=$?
+    case $result in
+        1) echo "There was a problem starting ejabberd with the old erlang node name. " \
+            && echo "Check for log errors in $EJABBERD_LOG_PATH" \
+            && exit $result;;
+        *) :;;
+    esac
+    exec_other_command_node $ERLANG_NODE_OLD "status"
+
+    printe "Making backup of old database to file $OLDFILE ..."
+    mkdir $SPOOL_DIR_BACKUP
+    exec_other_command_node $ERLANG_NODE_OLD backup "$OLDFILE"
+
+    printe "Changing node name in new backup file $NEWFILE ..."
+    exec_other_command_node $ERLANG_NODE_OLD mnesia_change_nodename "$ERLANG_NODE_OLD" "$ERLANG_NODE" "$OLDFILE" "$NEWFILE"
+
+    printe "Stopping old ejabberd..."
+    exec_other_command_node $ERLANG_NODE_OLD "stop"
+    wait_status_node $ERLANG_NODE_OLD 3 30 2 && stop_epmd
+
+    printe "Moving old mnesia spool files to backup subdirectory $SPOOL_DIR_BACKUP ..."
+    mv $SPOOL_DIR/*.DAT $SPOOL_DIR_BACKUP
+    mv $SPOOL_DIR/*.DCD $SPOOL_DIR_BACKUP
+    mv $SPOOL_DIR/*.LOG $SPOOL_DIR_BACKUP
+
+    printe "Starting ejabberd with new node name $ERLANG_NODE ..."
+    exec_erl "$ERLANG_NODE" $EJABBERD_OPTS -detached
+    wait_status 0 30 2
+    exec_other_command "status"
+
+    printe "Installing fallback of new mnesia..."
+    exec_other_command install_fallback "$NEWFILE"
+
+    printe "Stopping new ejabberd..."
+    exec_other_command "stop"
+    wait_status 3 30 2 && stop_epmd
+
+    printe "Finished, now you can start ejabberd normally"
+}
+
 # main
 case $1 in
     start)
@@ -289,41 +551,50 @@ case $1 in
         ;;
     debug)
         debugwarning
+        set_dist_client
         exec_erl "$(uid debug)" -hidden -remsh "$ERLANG_NODE"
         ;;
     etop)
-        exec_erl "$(uid top)" -hidden -node "$ERLANG_NODE" -s etop \
-                 -s erlang halt -output text
+        set_dist_client
+        exec_erl "$(uid top)" -hidden -remsh "$ERLANG_NODE" -s etop \
+                 -output text
+        check_etop_result
         ;;
     iexdebug)
         debugwarning
+        set_dist_client
         exec_iex "$(uid debug)" --remsh "$ERLANG_NODE"
+        check_iex_result
         ;;
     iexlive)
         livewarning
-        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS" --app ejabberd
+        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS"
+        check_iex_result
         ;;
     ping)
         PEER=${2:-$ERLANG_NODE}
         [ "$PEER" = "${PEER%.*}" ] && PS="-s"
+        set_dist_client
         exec_cmd "$ERL" ${PS:--}name "$(uid ping "$(hostname $PS)")" $ERLANG_OPTS \
-                 -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
-                 -s erlang halt -output text
+                 -noinput -hidden \
+                 -eval 'net_kernel:connect_node('"'$PEER'"')' \
+                 -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
+                 -eval 'halt(case net_adm:ping('"'$PEER'"') of pong -> 0; pang -> 1 end).' \
+                 -output text
         ;;
     started)
+        set_dist_client
         wait_status 0 30 2 # wait 30x2s before timeout
         ;;
     stopped)
+        set_dist_client
         wait_status 3 30 2 && stop_epmd # wait 30x2s before timeout
         ;;
+    mnesia_change)
+        mnesia_change $2
+        ;;
     *)
-        exec_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
-                 -extra "$ERLANG_NODE" $NO_TIMEOUT "$@"
-        result=$?
-        case $result in
-            2|3) help;;
-            *) :;;
-        esac
-        exit $result
+        set_dist_client
+        exec_other_command "$@"
         ;;
 esac

elvis.config

@@ -0,0 +1,59 @@
+[
+ {
+  elvis,
+  [
+   {config,
+    [#{dirs => ["src"],
+       filter => "*.erl",
+       ignore => ['ELDAPv3', eldap_filter_yecc],
+       ruleset => erl_files,
+       rules => [{elvis_text_style, line_length, #{limit => 1000, skip_comments => false}},
+                 {elvis_text_style, no_tabs, disable},
+                 {elvis_style, atom_naming_convention, disable},
+                 {elvis_style, consistent_variable_casing, disable},
+                 {elvis_style, dont_repeat_yourself, #{min_complexity => 70}},
+                 {elvis_style, export_used_types, disable},
+                 {elvis_style, function_naming_convention, disable},
+                 {elvis_style, god_modules, #{limit => 300}},
+                 {elvis_style, invalid_dynamic_call, disable},
+                 {elvis_style, macro_names, disable},
+                 {elvis_style, max_function_arity, disable}, % #{max_arity => 15}},
+                 {elvis_style, nesting_level, disable},
+                 {elvis_style, no_author, disable},
+                 {elvis_style, no_boolean_in_comparison, disable},
+                 {elvis_style, no_catch_expressions, disable},
+                 {elvis_style, no_debug_call, disable},
+                 {elvis_style, no_if_expression, disable},
+                 {elvis_style, no_import, disable},
+                 {elvis_style, no_nested_try_catch, disable},
+                 {elvis_style, no_operation_on_same_value, disable},
+                 {elvis_style, no_receive_without_timeout, disable},
+                 {elvis_style, no_single_clause_case, disable},
+                 {elvis_style, no_spec_with_records, disable},
+                 {elvis_style, no_throw, disable},
+                 {elvis_style, operator_spaces, disable},
+                 {elvis_style, param_pattern_matching, disable},
+                 {elvis_style, private_data_types, disable},
+                 {elvis_style, variable_naming_convention, disable}
+                ]
+      },
+
+     %#{dirs    => ["include"],
+     %  filter  => "*.hrl",
+     %  ruleset => hrl_files},
+
+     #{dirs => ["."],
+       filter => "Makefile.in",
+       ruleset => makefiles,
+       rules => [{elvis_text_style, line_length, #{limit => 400,
+                                              skip_comments => false}},
+                 {elvis_style, dont_repeat_yourself, #{min_complexity => 20}}
+                ]
+      }
+    ]
+   }
+  ]
+ }
+].
+
+%% vim: set filetype=erlang tabstop=8:

erlang_ls.config

@@ -0,0 +1,29 @@
+#otp_path: "/usr/lib/erlang"
+#plt_path: "_build/default/rebar3_24.3.3_plt"
+#code_reload:
+#  node: ejabberd@localhost
+apps_dirs:
+  - "_build/default/lib/*"
+deps_dirs:
+  - "_build/default/lib/*"
+include_dirs:
+  - "_build/default/lib"
+  - "_build/default/lib/*/include"
+  - "include"
+macros:
+  - name: OTP_BELOW_27
+  - name: SIP
+  - name: STUN
+diagnostics:
+  enabled:
+    - crossref
+  disabled:
+#    - dialyzer
+    - unused_includes # Otherwise it complains about unused logger.hrl
+lenses:
+  disabled:
+    - ct-run-test
+    - function-references
+    - server-info
+    - show-behaviour-usages
+    - suggest-spec

examples/extauth/check_pass_null.pl

@@ -1,66 +0,0 @@
-#!/usr/bin/perl
-
-use Unix::Syslog qw(:macros :subs);
-
-my $domain = $ARGV[0] || "example.com";
-
-while(1)
-  {
-   # my $rin = '',$rout;
-   # vec($rin,fileno(STDIN),1) = 1;
-   # $ein = $rin;
-   # my $nfound = select($rout=$rin,undef,undef,undef);
-
-    my $buf = "";
-    syslog LOG_INFO,"waiting for packet";
-    my $nread = sysread STDIN,$buf,2;
-    do { syslog LOG_INFO,"port closed"; exit; } unless $nread == 2;
-    my $len = unpack "n",$buf;
-    my $nread = sysread STDIN,$buf,$len;
-
-    my ($op,$user,$host,$password) = split /:/,$buf;
-    #$user =~ s/\./\//og;
-    my $jid = "$user\@$domain";
-    my $result;
-
-    syslog(LOG_INFO,"request (%s)", $op);
-
-  SWITCH:
-      {
-	$op eq 'auth' and do
-	  {
-             $result = 1;
-	  },last SWITCH;
-
-	$op eq 'setpass' and do
-	  {
-             $result = 1;
-	  },last SWITCH;
-
-        $op eq 'isuser' and do
-          {
-             # password is null. Return 1 if the user $user\@$domain exitst.
-             $result = 1;
-          },last SWITCH;
-
-        $op eq 'tryregister' and do
-          {
-             $result = 1;
-          },last SWITCH;
-
-        $op eq 'removeuser' and do
-          {
-             # password is null. Return 1 if the user $user\@$domain exitst.
-             $result = 1;
-          },last SWITCH;
-
-        $op eq 'removeuser3' and do
-          {
-             $result = 1;
-          },last SWITCH;
-      };
-    my $out = pack "nn",2,$result ? 1 : 0;
-    syswrite STDOUT,$out;
-  }
-
-closelog;

examples/mtr/ejabberd

@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: ejabberd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-
-HOME=/usr/pkg/jabber D=/usr/pkg/jabber/ejabberd export HOME
-
-name="ejabberd"
-rcvar=$name
-
-if [ -r /etc/rc.conf ]
-then
-        . /etc/rc.conf
-else
-        eval ${rcvar}=YES
-fi
-
-# $flags from environment overrides ${rcvar}_flags
-if [ -n "${flags}" ]
-then
-        eval ${rcvar}_flags="${flags}"
-fi
-
-checkyesno()
-{
-        eval _value=\$${1}
-        case $_value in
-        [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)       return 0 ;;
-        [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)   return 1 ;;
-        *)
-                echo "\$${1} is not set properly."
-                return 1
-                ;;
-        esac
-}
-
-cmd=${1:-start}
-case ${cmd} in
-force*)
-        cmd=${cmd#force}
-        eval ${rcvar}=YES
-        ;;
-esac
-
-if checkyesno ${rcvar}
-then
-else
-    exit 0
-fi
-
-case ${cmd} in
-start)
-        if [ -x $D/src ]; then
-            echo "Starting ${name}."
-            cd $D/src
-            ERL_MAX_PORTS=32000 export ERL_MAX_PORTS
-            ulimit -n $ERL_MAX_PORTS
-            su jabber -c "/usr/pkg/bin/erl -sname ejabberd -s ejabberd -heart -detached -sasl sasl_error_logger '{file, \"ejabberd-sasl.log\"}' &" \
-                      1>/dev/null 2>&1
-        fi
-        ;;
-stop)
-        echo "rpc:call('ejabberd@`hostname -s`', init, stop, [])." | \
-             su jabber -c "/usr/pkg/bin/erl -sname ejabberdstop"
-        ;;
-restart)
-        echo "rpc:call('ejabberd@`hostname -s`', init, restart, [])." | \
-             su jabber -c "/usr/pkg/bin/erl -sname ejabberdrestart"
-        ;;
-*)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-esac

examples/mtr/ejabberd-netbsd.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-echo '1. fetch, compile, and install erlang'
-
-if [ ! pkg_info erlang 1>/dev/null 2>&1 ]; then
-    cd /usr/pkgsrc/lang/erlang
-    make fetch-list|sh
-    make
-    make install
-fi
-if pkg_info erlang | grep -q erlang-9.1nb1; then
-else
-    echo "erlang-9.1nb1 not installed" 1>&2
-    exit 1
-fi
-
-
-echo '2. install crypt_drv.so'
-    
-if [ ! -d    /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib ] ; then
-    mkdir -p /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib
-fi
-if [ ! -f /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib/crypto_drv.so ]; then
-    cp work/otp*/lib/crypto/priv/*/*/crypto_drv.so \
-          /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib
-fi
-
-
-echo '3. compile and install elibcrypto.so'
-
-if [ ! -f /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib/elibcrypto.so ]; then
-cd /usr/pkgsrc/lang/erlang/work/otp_src_R9B-1/lib/crypto/c_src
-ld -r -u CRYPTO_set_mem_functions -u MD5 -u MD5_Init -u MD5_Update \
-   -u MD5_Final -u SHA1 -u SHA1_Init -u SHA1_Update -u SHA1_Final \
-   -u des_set_key -u des_ncbc_encrypt -u des_ede3_cbc_encrypt \
-   -L/usr/lib -lcrypto -o ../priv/obj/i386--netbsdelf/elibcrypto.o
-cc -shared \
-   -L/usr/pkgsrc/lang/erlang/work/otp_src_R9B-1/lib/erl_interface/obj/i386--netbsdelf \
-    -o ../priv/obj/i386--netbsdelf/elibcrypto.so \
-    ../priv/obj/i386--netbsdelf/elibcrypto.o -L/usr/lib -lcrypto
-cp ../priv/obj/i386--netbsdelf/elibcrypto.so \
-           /usr/pkg/lib/erlang/lib/crypto-1.1.2.1/priv/lib
-fi
-    
-
-echo '4. compile and install ssl_esock'
-
-if [ ! -f  /usr/pkg/lib/erlang/lib/ssl-2.3.5/priv/bin/ssl_esock ]; then
-    cd     /usr/pkg/lib/erlang/lib/ssl-2.3.5/priv/obj/
-    make
-fi
-    
-
-echo '5. initial ejabberd configuration'
-    
-cd /usr/pkg/jabber/ejabberd/src
-./configure
-
-
-echo '6. edit ejabberd Makefiles'
-
-for M in Makefile mod_*/Makefile; do
-    if [ ! -f $M.orig ]; then
-        mv $M $M.orig
-        sed -e s%/usr/local%/usr/pkg%g < $M.orig > $M
-    fi
-done
-
-
-echo '7. compile ejabberd'
-
-gmake
-for A in mod_muc mod_pubsub; do
-    (cd $A; gmake)
-done
-
-
-echo ''
-echo 'now edit ejabberd.cfg'
-echo ''
-echo 'to start ejabberd: erl -sname ejabberd -s ejabberd'

examples/mtr/ejabberd.cfg

@@ -1,65 +0,0 @@
-% jabber.dbc.mtview.ca.us
-
-override_acls.
-
-{acl, admin, {user, "mrose", "jabber.dbc.mtview.ca.us"}}.
-
-
-{access, announce,    [{allow,  admin},
-                       {deny,   all}]}.
-{access, c2s,         [{deny,   blocked},
-                       {allow,  all}]}.
-{access, c2s_shaper,  [{none,   admin},
-                       {normal, all}]}.
-{access, configure,   [{allow,  admin},
-                       {deny,   all}]}.
-{access, disco_admin, [{allow,  admin},
-                       {deny,   all}]}.
-{access, muc_admin,   [{allow,  admin},
-                       {deny,   all}]}.
-{access, register,    [{deny,   all}]}.
-{access, s2s_shaper,  [{fast,   all}]}.
-
-
-{auth_method,           internal}.
-{host,                 "jabber.dbc.mtview.ca.us"}.
-{outgoing_s2s_port,     5269}.
-{shaper, normal,       {maxrate, 1000}}.
-{shaper, fast,         {maxrate, 50000}}.
-{welcome_message,       none}.
-
-
-{listen, [{5222, ejabberd_c2s,
-                      [{access,   c2s},
-                       {shaper,   c2s_shaper}]},
-          {5223, ejabberd_c2s,
-                      [{access,   c2s},
-                       {shaper,   c2s_shaper},
-                       {ssl,    [{certfile, "/etc/openssl/certs/ejabberd.pem"}]}]},
-          {5269, ejabberd_s2s_in,
-                      [{shaper,   s2s_shaper}]}]}.
-
-
-{modules, [
-           {mod_register,  []},
-           {mod_roster,    []},
-           {mod_privacy,   []},
-           {mod_configure, []},
-           {mod_disco,     []},
-           {mod_stats,     []},
-           {mod_vcard,     []},
-           {mod_offline,   []},
-           {mod_echo,      [{host, "echo.jabber.dbc.mtview.ca.us"}]},
-           {mod_private,   []},
-           {mod_muc,       []},
-           {mod_pubsub,    []},
-           {mod_time,      []},
-           {mod_last,      []},
-           {mod_version,   []}
-          ]}.
-
-
-
-% Local Variables:
-% mode: erlang
-% End:

include/bosh.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_auth.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,5 +18,5 @@
 %%%
 %%%----------------------------------------------------------------------
 
--record(passwd, {us = {<<"">>, <<"">>} :: {binary(), binary()} | '$1',
+-record(passwd, {us = {<<"">>, <<"">>} :: {binary(), binary()} | {binary(), binary(), atom()} | '$1',
                  password = <<"">> :: binary() | scram() | '_'}).

include/ejabberd_commands.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -19,13 +19,34 @@
 %%%----------------------------------------------------------------------
 
 -type aterm() :: {atom(), atype()}.
--type atype() :: integer | string | binary |
+-type atype() :: integer | string | binary | any | atom |
                  {tuple, [aterm()]} | {list, aterm()}.
 -type rterm() :: {atom(), rtype()}.
--type rtype() :: integer | string | atom |
+-type rtype() :: integer | string | atom | any |
                  {tuple, [rterm()]} | {list, rterm()} |
                  rescode | restuple.
 
+%% The 'any' and 'atom' argument types and 'any' result type
+%% should only be used by commands with tag 'internal',
+%% which are meant to be used only internally in ejabberd,
+%% and not called using external frontends.
+
+%% When a command with tag 'async' is called by mod_adhoc_api,
+%% it is spawned in a new process for the command execution,
+%% and the command immediately returns success.
+
+%% The purpose of a command can either be:
+%% - informative: its purpose is to obtain information
+%% - modifier: its purpose is to produce some change in the server
+%%
+%% A modifier command should be designed just to produce its desired side-effect,
+%% and its result term should just be success or failure: rescode or restuple.
+%%
+%% ejabberd_web_admin:make_command/2 considers that commands
+%% with result type different than rescode or restuple
+%% are commands that can be safely executed automatically
+%% to get information and build the web page.
+
 -type oauth_scope() :: atom().
 
 %% ejabberd_commands OAuth ReST ACL definition:
@@ -67,42 +88,24 @@
          args_example = none     :: none | [any()] | '_',
          result_example = none   :: any()}).
 
-%% TODO Fix me: Type is not up to date
--type ejabberd_commands() :: #ejabberd_commands{name :: atom(),
-                                                tags :: [atom()],
-                                                desc :: string(),
-                                                longdesc :: string(),
-                                                version :: integer(),
-                                                module :: atom(),
-                                                function :: atom(),
-                                                args :: [aterm()],
-                                                policy :: open | restricted | admin | user,
-                                                access :: [{atom(),atom(),atom()}|atom()],
-                                                result :: rterm()}.
+-type ejabberd_commands() :: #ejabberd_commands{name                    :: atom(),
+                                                tags                    :: [atom()],
+                                                desc                    :: string(),
+                                                longdesc                :: string(),
+                                                version                 :: integer(),
+                                                note                    :: string(),
+                                                weight                  :: integer(),
+                                                module                  :: atom(),
+                                                function                :: atom(),
+                                                args                    :: [aterm()],
+                                                policy                  :: open | restricted | admin | user,
+                                                access                  :: [{atom(),atom(),atom()}|atom()],
+                                                definer                 :: atom(),
+                                                result                  :: rterm(),
+                                                args_rename             :: [{atom(),atom()}],
+                                                args_desc               :: none | [string()] | '_',
+                                                result_desc             :: none | string() | '_',
+                                                args_example            :: none | [any()] | '_',
+                                                result_example          :: any()
+                                               }.
 
-%% @type ejabberd_commands() = #ejabberd_commands{
-%%    name = atom(),
-%%    tags = [atom()],
-%%    desc = string(),
-%%    longdesc = string(),
-%%    module = atom(),
-%%    function = atom(),
-%%    args = [aterm()],
-%%    result = rterm()
-%%    }.
-%% desc: Description of the command
-%% args: Describe the accepted arguments.
-%% This way the function that calls the command can format the
-%% arguments before calling.
-
-%% @type atype() = integer | string | {tuple, [aterm()]} | {list, aterm()}.
-%% Allowed types for arguments are integer, string, tuple and list.
-
-%% @type rtype() = integer | string | atom | {tuple, [rterm()]} | {list, rterm()} | rescode | restuple.
-%% A rtype is either an atom or a tuple with two elements.
-
-%% @type aterm() = {Name::atom(), Type::atype()}.
-%% An argument term is a tuple with the term name and the term type.
-
-%% @type rterm() = {Name::atom(), Type::rtype()}.
-%% A result term is a tuple with the term name and the term type.

include/ejabberd_ctl.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_db_serialize.hrl

@@ -0,0 +1,70 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(serialize_mam_v1, {
+    serverhost :: binary(),
+    username :: binary(),
+    timestamp :: integer(),
+    peer :: binary(),
+    type :: chat | groupchat,
+    nick :: binary(),
+    origin_id :: binary(),
+    packet :: binary()
+}).
+-record(serialize_mam_prefs_v1, {
+    serverhost :: binary(),
+    username :: binary(),
+    default :: atom(),
+    always :: term(),
+    never :: term()
+}).
+
+-record(serialize_roster_v1, {
+    serverhost :: binary(),
+    username :: binary(),
+    version :: binary() | undefined,
+    entries :: [{binary(),
+		 binary(),
+		 [binary()],
+		 both | from | to | none,
+		 boolean(),
+		 subscribe | unsubscribe | both | in | out | none,
+		 binary()}]
+}).
+
+-record(serialize_auth_v1, {
+    serverhost :: binary(),
+    username :: binary(),
+    passwords :: [binary() | {sha | sha256 | sha512, binary(), binary(), binary(), integer()}]
+}).
+
+-record(serialize_muc_room_v1, {
+    serverhost :: binary(),
+    name :: binary(),
+    host :: binary(),
+    options:: [{atom(), term()}]
+}).
+
+-record(serialize_muc_registrations_v1, {
+    serverhost :: binary(),
+    host :: binary(),
+    jid :: binary(),
+    nick :: binary()
+}).

include/ejabberd_http.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_oauth.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_sm.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_sql.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -29,22 +29,42 @@
 -define(SQL_INSERT_MARK, sql_insert__mark_).
 -define(SQL_INSERT(Table, Fields), ?SQL_INSERT_MARK(Table, Fields)).
 
--ifdef(COMPILER_REPORTS_ONLY_LINES).
--record(sql_query, {hash :: binary(),
-		    format_query :: fun(),
-		    format_res :: fun(),
-		    args :: fun(),
-		    loc :: {module(), pos_integer()}}).
--else.
 -record(sql_query, {hash :: binary(),
 		    format_query :: fun(),
 		    format_res :: fun(),
 		    args :: fun(),
+		    flags :: non_neg_integer(),
 		    loc :: {module(), {pos_integer(), pos_integer()}}}).
--endif.
 
--record(sql_escape, {string :: fun((binary()) -> binary()),
-		     integer :: fun((integer()) -> binary()),
-		     boolean :: fun((boolean()) -> binary()),
-		     in_array_string :: fun((binary()) -> binary()),
-		     like_escape :: fun(() -> binary())}).
+-record(sql_escape, {
+          string :: fun((binary()) -> binary() | atom()),
+          integer :: fun((integer()) -> binary() | atom()),
+          boolean :: fun((boolean()) -> binary() | atom()),
+          timestamp :: fun((calendar:datetime()) -> binary() | atom()),
+          in_array_string :: fun((binary()) -> binary() | atom()),
+          like_escape :: fun(() -> binary() | atom())
+         }).
+
+
+-record(sql_index, {columns,
+                    unique = false :: boolean(),
+                    meta = #{}}).
+-record(sql_column, {name :: binary(),
+                     type,
+                     nullable = false,
+                     default = false,
+                     opts = []}).
+-record(sql_table, {name :: binary(),
+                    columns :: [#sql_column{}],
+                    indices = [] :: [#sql_index{}],
+                    post_create}).
+-record(sql_schema, {version :: integer(),
+                     tables :: [#sql_table{}],
+                     update = []}).
+-record(sql_references, {table :: binary(),
+                         column :: binary()}).
+
+-record(sql_schema_info,
+        {db_type :: pgsql | mysql | sqlite,
+         db_version :: any(),
+         multihost_schema = true :: boolean()}).

include/ejabberd_sql_pt.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_stacktrace.hrl

@@ -1,27 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
-%%%
-%%% This program is free software; you can redistribute it and/or
-%%% modify it under the terms of the GNU General Public License as
-%%% published by the Free Software Foundation; either version 2 of the
-%%% License, or (at your option) any later version.
-%%%
-%%% This program is distributed in the hope that it will be useful,
-%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%%% General Public License for more details.
-%%%
-%%% You should have received a copy of the GNU General Public License along
-%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%%
-%%%----------------------------------------------------------------------
-
--ifdef(DEPRECATED_GET_STACKTRACE).
--define(EX_RULE(Class, Reason, Stack), Class:Reason:Stack).
--define(EX_STACK(Stack), Stack).
--else.
--define(EX_RULE(Class, Reason, _), Class:Reason).
--define(EX_STACK(_), erlang:get_stacktrace()).
--endif.

include/ejabberd_web_admin.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -62,6 +62,11 @@
 	    [{<<"type">>, Type}, {<<"name">>, Name},
 	     {<<"value">>, Value}])).
 
+-define(INPUTPH(Type, Name, Value, PlaceHolder),
+	?XA(<<"input">>,
+	    [{<<"type">>, Type}, {<<"name">>, Name},
+	     {<<"value">>, Value}, {<<"placeholder">>, PlaceHolder}])).
+
 -define(INPUTT(Type, Name, Value),
 	?INPUT(Type, Name, (translate:translate(Lang, Value)))).
 
@@ -95,16 +100,27 @@
 -define(XRES(Text),
 	?XAC(<<"p">>, [{<<"class">>, <<"result">>}], Text)).
 
+-define(DIVRES(Elements),
+	?XAE(<<"div">>, [{<<"class">>, <<"result">>}], Elements)).
+
 %% Guide Link
 -define(XREST(Text), ?XRES((translate:translate(Lang, Text)))).
 
 -define(GL(Ref, Title),
 	?XAE(<<"div">>, [{<<"class">>, <<"guidelink">>}],
 	     [?XAE(<<"a">>,
-		   [{<<"href">>, <<"https://docs.ejabberd.im/admin/configuration/", Ref/binary>>},
+		   [{<<"href">>, <<"https://docs.ejabberd.im/", Ref/binary>>},
 		    {<<"target">>, <<"_blank">>}],
 		   [?C(<<"docs: ", Title/binary>>)])])).
 
 %% h1 with a Guide Link
--define(H1GL(Name, Ref, Title),
-	[?XC(<<"h1">>, Name), ?GL(Ref, Title)]).
+-define(H1GLraw(Name, Ref, Title),
+	[?XC(<<"h1">>, Name), ?GL(Ref, Title), ?BR, ?BR]).
+-define(H1GL(Name, RefConf, Title),
+	?H1GLraw(Name, <<"admin/configuration/", RefConf/binary>>, Title)).
+
+-define(ANCHORL(Ref),
+	?XAE(<<"div">>, [{<<"class">>, <<"anchorlink">>}],
+	     [?XAE(<<"a">>,
+		   [{<<"href">>, <<"#", Ref/binary>>}],
+		   [?C(unicode:characters_to_binary("¶"))])])).

include/eldap.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/http_bind.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/logger.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -19,41 +19,48 @@
 %%%----------------------------------------------------------------------
 -define(PRINT(Format, Args), io:format(Format, Args)).
 
--ifdef(LAGER).
--compile([{parse_transform, lager_transform}]).
-
--define(DEBUG(Format, Args),
-	begin lager:debug(Format, Args), ok end).
-
--define(INFO_MSG(Format, Args),
-	begin lager:info(Format, Args), ok end).
-
--define(WARNING_MSG(Format, Args),
-	begin lager:warning(Format, Args), ok end).
-
--define(ERROR_MSG(Format, Args),
-	begin lager:error(Format, Args), ok end).
-
--define(CRITICAL_MSG(Format, Args),
-	begin lager:critical(Format, Args), ok end).
--else.
 -include_lib("kernel/include/logger.hrl").
 
+-define(CLEAD,    "\e[1").    % bold
+-define(CMID,     "\e[0").    % normal
+-define(CCLEAN,   "\e[0m").   % clean
+
+-define(CDEFAULT, ";49;95m"). % light magenta
+-define(CDEBUG,   ";49;90m"). % dark gray
+-define(CINFO,    ";49;92m"). % green
+-define(CWARNING, ";49;93m"). % light yellow
+-define(CERROR,   ";49;91m"). % light magenta
+-define(CCRITICAL,";49;31m"). % light red
+
 -define(DEBUG(Format, Args),
-	begin ?LOG_DEBUG(Format, Args), ok end).
+	begin ?LOG_DEBUG(Format, Args,
+                        #{clevel => ?CLEAD ++ ?CDEBUG,
+                          ctext => ?CMID ++ ?CDEBUG}),
+              ok end).
 
 -define(INFO_MSG(Format, Args),
-	begin ?LOG_INFO(Format, Args), ok end).
+	begin ?LOG_INFO(Format, Args,
+                        #{clevel => ?CLEAD ++ ?CINFO,
+                          ctext => ?CCLEAN}),
+              ok end).
 
 -define(WARNING_MSG(Format, Args),
-	begin ?LOG_WARNING(Format, Args), ok end).
+	begin ?LOG_WARNING(Format, Args,
+                        #{clevel => ?CLEAD ++ ?CWARNING,
+                          ctext => ?CMID ++ ?CWARNING}),
+              ok end).
 
 -define(ERROR_MSG(Format, Args),
-	begin ?LOG_ERROR(Format, Args), ok end).
+	begin ?LOG_ERROR(Format, Args,
+                        #{clevel => ?CLEAD ++ ?CERROR,
+                          ctext => ?CMID ++ ?CERROR}),
+              ok end).
 
 -define(CRITICAL_MSG(Format, Args),
-	begin ?LOG_CRITICAL(Format, Args), ok end).
--endif.
+	begin ?LOG_CRITICAL(Format, Args,
+                        #{clevel => ?CLEAD++ ?CCRITICAL,
+                          ctext => ?CMID ++ ?CCRITICAL}),
+              ok end).
 
 %% Use only when trying to troubleshoot test problem with ExUnit
 -define(EXUNIT_LOG(Format, Args),

include/mod_announce.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_antispam.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,13 +18,19 @@
 %%%
 %%%----------------------------------------------------------------------
 
--record(local_config, {key :: any(), value :: any()}).
+-define(MODULE_ANTISPAM, mod_antispam).
 
--type local_config() :: #local_config{}.
+-type url() :: binary().
+-type filename() :: binary() | none | false.
+-type jid_set() :: sets:set(ljid()).
+-type url_set() :: sets:set(url()).
 
--record(state,
-	{opts = []               :: [acl:acl() | local_config()],
-         hosts = []              :: [binary()],
-         override_local = false  :: boolean(),
-	 override_global = false :: boolean(),
-         override_acls = false   :: boolean()}).
+-define(DEFAULT_RTBL_DOMAINS_NODE, <<"spam_source_domains">>).
+
+-record(rtbl_service,
+        {host = none                       :: binary() | none,
+         node = ?DEFAULT_RTBL_DOMAINS_NODE :: binary(),
+         subscribed = false                :: boolean(),
+         retry_timer = undefined           :: reference() | undefined}).
+
+-type rtbl_service() :: #rtbl_service{}.

include/mod_caps.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_invites.hrl

@@ -0,0 +1,23 @@
+-define(INVITE_TOKEN_EXPIRE_SECONDS_DEFAULT, 5*86400).
+-define(INVITE_TOKEN_LENGTH_DEFAULT, 24).
+
+-define(NS_INVITE_INVITE, <<"urn:xmpp:invite#invite">>).
+-define(NS_INVITE_CREATE_ACCOUNT, <<"urn:xmpp:invite#create-account">>).
+
+-define(OVERUSE_LIMIT, 1000).
+
+-define(SPEEDY_GOAT_LEVELS, 2).
+-define(SPEEDY_GOAT_SECONDS, 300).
+
+-record(invite_token, {token :: binary(),
+                       inviter :: {binary(), binary()},
+                       %% A non-empty value if `invitee` indicates the invite has been used.
+                       invitee = <<>> :: binary(),
+                       created_at = calendar:now_to_datetime(erlang:timestamp()) :: calendar:datetime(),
+                       expires = calendar:gregorian_seconds_to_datetime(calendar:datetime_to_gregorian_seconds(calendar:now_to_datetime(erlang:timestamp())) + ?INVITE_TOKEN_EXPIRE_SECONDS_DEFAULT) :: calendar:datetime(),
+                       type = roster_only :: roster_only | account_only | account_subscription,
+                       %% If type is 'roster_only' then we indicate a token has been used to create
+                       %% an account (if allowed) by setting `account_name` to the name of the user
+                       %% (which should match `invitee`).
+                       account_name = <<>> :: binary()
+                      }).

include/mod_last.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_mam.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -26,7 +26,8 @@
 	 bare_peer = {<<"">>, <<"">>, <<"">>} :: ljid(),
 	 packet = #xmlel{}                    :: xmlel() | message(),
 	 nick = <<"">>                        :: binary(),
-	 type = chat                          :: chat | groupchat}).
+	 type = chat                          :: chat | groupchat,
+         origin_id = <<"">>                   :: binary()}).
 
 -record(archive_prefs,
 	{us = {<<"">>, <<"">>} :: {binary(), binary()},

include/mod_matrix_gw.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,5 +18,19 @@
 %%%
 %%%----------------------------------------------------------------------
 
--record(vcard_xupdate, {us = {<<>>, <<>>} :: {binary(), binary()},
-                        hash = <<>>       :: binary()}).
+-record(room_version,
+        {id :: binary(),
+         %% use the same field names as in Synapse
+         enforce_key_validity :: boolean(),
+         special_case_aliases_auth :: boolean(),
+         strict_canonicaljson :: boolean(),
+         limit_notifications_power_levels :: boolean(),
+         knock_join_rule :: boolean(),
+         restricted_join_rule :: boolean(),
+         restricted_join_rule_fix :: boolean(),
+         knock_restricted_join_rule :: boolean(),
+         enforce_int_power_levels :: boolean(),
+         implicit_room_creator :: boolean(),
+         updated_redaction_rules :: boolean(),
+         hydra :: boolean()
+        }).

include/mod_muc.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -23,8 +23,9 @@
                    opts = [] :: list() | '_'}).
 
 -record(muc_registered,
-        {us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()}, binary()} | '$1',
-         nick = <<"">> :: binary()}).
+        {us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary() | '$1', binary() | '$2'},
+                                                  binary() | '_'} | '$1',
+         nick = <<"">> :: binary() | '$3'}).
 
 -record(muc_online_room,
         {name_host :: {binary(), binary()} | '$1' | {'_', binary()} | '_',

include/mod_muc_room.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -38,13 +38,13 @@
     description                          = <<"">> :: binary(),
     allow_change_subj                    = true :: boolean(),
     allow_query_users                    = true :: boolean(),
-    allow_private_messages               = true :: boolean(),
+    allowpm                              = anyone :: anyone | participants | moderators | none,
     allow_private_messages_from_visitors = anyone :: anyone | moderators | nobody ,
     allow_visitor_status                 = true :: boolean(),
     allow_visitor_nickchange             = true :: boolean(),
     public                               = true :: boolean(),
     public_list                          = true :: boolean(),
-    persistent                           = false :: boolean(),
+    persistent                           = false :: boolean() | {destroying, boolean()},
     moderated                            = true :: boolean(),
     captcha_protected                    = false :: boolean(),
     members_by_default                   = true :: boolean(),
@@ -65,7 +65,7 @@
     captcha_whitelist                    = (?SETS):empty() :: gb_sets:set(),
     mam                                  = false :: boolean(),
     pubsub                               = <<"">> :: binary(),
-    enable_hats                          = false :: boolean(),
+    enable_hats                          = true :: boolean(),
     lang                                 = ejabberd_option:language() :: binary()
 }).
 
@@ -81,7 +81,8 @@
     role :: role(),
     %%is_subscriber = false :: boolean(),
     %%subscriptions = [] :: [binary()],
-    last_presence :: presence() | undefined
+    last_presence :: presence() | undefined,
+    occupant_id :: binary()
 }).
 
 -record(subscriber, {jid :: jid(),
@@ -122,18 +123,22 @@
     robots                  = #{} :: robots(),
     nicks                   = #{} :: nicks(),
     affiliations            = #{} :: affiliations(),
+    roles                   = #{} :: roles(),
     history                 = #lqueue{} :: lqueue(),
     subject                 = [] :: [text()],
-    subject_author          = <<"">> :: binary(),
-    hats_users              = #{} :: map(), % FIXME on OTP 21+: #{ljid() => #{binary() => binary()}},
+    subject_author          = {<<"">>, #jid{}} :: {binary(), jid()},
+    hats_defs               = #{} :: #{binary() => {binary(), binary()}},
+    hats_users              = #{} :: #{ljid() => [binary()]},
     just_created            = erlang:system_time(microsecond) :: true | integer(),
     activity                = treap:empty() :: treap:treap(),
     room_shaper             = none :: ejabberd_shaper:shaper(),
     room_queue              :: p1_queue:queue({message | presence, jid()}) | undefined,
-    hibernate_timer         = none :: reference() | none | hibernating
+    hibernate_timer         = none :: reference() | none | hibernating,
+    salt                    = <<>> :: binary()
 }).
 
 -type users() :: #{ljid() => #user{}}.
 -type robots() :: #{jid() => {binary(), stanza()}}.
 -type nicks() :: #{binary() => [ljid()]}.
 -type affiliations() :: #{ljid() => affiliation() | {affiliation(), binary()}}.
+-type roles() :: #{ljid() => role() | {role(), binary()}}.

include/mod_offline.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_privacy.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_private.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -19,6 +19,6 @@
 %%%----------------------------------------------------------------------
 
 -record(private_storage,
-        {usns = {<<"">>, <<"">>, <<"">>} :: {binary(), binary(), binary() |
+        {usns = {<<"">>, <<"">>, <<"">>} :: {binary() | '$1' | '_', binary(), binary() |
                                              '$1' | '_'},
          xml = #xmlel{} :: xmlel() | '_' | '$1'}).

include/mod_proxy65.hrl

@@ -2,7 +2,7 @@
 %%% RFC 1928 constants.
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_push.hrl

@@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% ejabberd, Copyright (C) 2017-2022 ProcessOne
+%%% ejabberd, Copyright (C) 2017-2026 ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_roster.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -25,6 +25,7 @@
     jid = {<<>>, <<>>, <<>>}               :: jid:ljid(),
     name = <<>>                            :: binary() | '_',
     subscription = none                    :: subscription() | '_',
+    approved = false                       :: boolean() | '_',
     ask = none                             :: ask() | '_',
     groups = []                            :: [binary()] | '_',
     askmessage = <<"">>                    :: binary() | '_',

include/mod_shared_roster.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_vcard.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mqtt.hrl

@@ -1,6 +1,6 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeny Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2002-2022 ProcessOne, SARL. All Rights Reserved.
+%%% @copyright (C) 2002-2026 ProcessOne, SARL. All Rights Reserved.
 %%%
 %%% Licensed under the Apache License, Version 2.0 (the "License");
 %%% you may not use this file except in compliance with the License.

include/pubsub.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2022   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2026   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

lib/ejabberd/config/attr.ex

@@ -41,7 +41,7 @@ defmodule Ejabberd.Config.Attr do
   """
   @spec validate([attr]) :: [{:ok, attr}] | [{:error, attr, atom()}]
   def validate(attrs) when is_list(attrs), do: Enum.map(attrs, &valid_attr?/1)
-  def validate(attr), do: validate([attr]) |> List.first
+  def validate(attr), do: validate([attr])
 
   @doc """
   Returns the type of an attribute, given its name.

lib/ejabberd/config/config.ex

@@ -36,8 +36,8 @@ defmodule Ejabberd.Config do
 
     case force do
       true ->
-        Ejabberd.Config.Store.stop
-        Ejabberd.Config.Store.start_link
+        Ejabberd.Config.Store.stop()
+        Ejabberd.Config.Store.start_link()
         do_init(file_path)
       false ->
         if not init_already_executed, do: do_init(file_path)
@@ -105,11 +105,8 @@ defmodule Ejabberd.Config do
     Code.eval_file(file_path) |> extract_and_store_module_name()
 
     # Getting start/0 config
-    Ejabberd.Config.Store.get(:module_name)
-    |> case do
-      nil -> IO.puts "[ ERR ] Configuration module not found."
-      [module] -> call_start_func_and_store_data(module)
-    end
+    [module] = Ejabberd.Config.Store.get(:module_name)
+    call_start_func_and_store_data(module)
 
     # Fetching git modules and install them
     get_modules_parsed_in_order()

lib/ejabberd/config/ejabberd_hook.ex

@@ -13,7 +13,6 @@ defmodule Ejabberd.Config.EjabberdHook do
   @doc """
   Register a hook to ejabberd.
   """
-  @spec start(EjabberdHook.t) :: none
   def start(%EjabberdHook{hook: hook, opts: opts, fun: fun}) do
     host = Keyword.get(opts, :host, :global)
     priority = Keyword.get(opts, :priority, 50)

lib/ejabberd/config/ejabberd_module.ex

@@ -7,12 +7,13 @@ defmodule Ejabberd.Config.EjabberdModule do
   the already existing Elixir.Module.
   """
 
-  @type t :: %{module: atom, attrs: [Attr.t]}
-
-  defstruct [:module, :attrs]
-
   alias Ejabberd.Config.EjabberdModule
   alias Ejabberd.Config.Validation
+  alias Ejabberd.Config.Attr
+
+  @type t :: %{module: atom, attrs: [Attr.attr]}
+
+  defstruct [:module, :attrs]
 
   @doc """
   Given a list of modules / single module
@@ -29,7 +30,6 @@ defmodule Ejabberd.Config.EjabberdModule do
   a git attribute and tries to fetch the repo,
   then, it install them through :ext_mod.install/1
   """
-  @spec fetch_git_repos([EjabberdModule.t]) :: none()
   def fetch_git_repos(modules) do
     modules
     |> Enum.filter(&is_git_module?/1)
@@ -60,7 +60,7 @@ defmodule Ejabberd.Config.EjabberdModule do
   defp fetch_and_store_repo_source_if_not_exists(path, repo) do
     unless File.exists?(path) do
       IO.puts "[info] Fetching: #{repo}"
-      :os.cmd('git clone #{repo} #{path}')
+      :os.cmd(~c"git clone #{repo} #{path}")
     end
   end
 

lib/ejabberd/config/logger/ejabberd_logger.ex

@@ -17,9 +17,9 @@ defmodule Ejabberd.Config.EjabberdLogger do
   end
 
   defp do_log_errors({:ok, _mod}), do: nil
-  defp do_log_errors({:error, _mod, errors}), do: Enum.each errors, &do_log_errors/1
-  defp do_log_errors({:attribute, errors}), do: Enum.each errors, &log_attribute_error/1
-  defp do_log_errors({:dependency, errors}), do: Enum.each errors, &log_dependency_error/1
+  defp do_log_errors({:error, _mod, errors}), do: (Enum.each errors, &do_log_errors/1)
+  defp do_log_errors({:attribute, errors}), do: (Enum.each errors, &log_attribute_error/1)
+  defp do_log_errors({:dependency, errors}), do: (Enum.each errors, &log_dependency_error/1)
 
   defp log_attribute_error({{attr_name, _val}, :attr_not_supported}), do:
     IO.puts "[ WARN ] Annotation @#{attr_name} is not supported."

lib/ejabberd/config/opts_formatter.ex

@@ -14,15 +14,12 @@ defmodule Ejabberd.Config.OptsFormatter do
   Look at how Config.get_ejabberd_opts/0 is constructed for
   more informations.
   """
-  @spec format_opts_for_ejabberd([{atom(), any()}]) :: list()
+  @spec format_opts_for_ejabberd(map) :: list()
   def format_opts_for_ejabberd(opts) do
     opts
     |> format_attrs_for_ejabberd
   end
 
-  defp format_attrs_for_ejabberd(opts) when is_list(opts),
-    do: Enum.map opts, &format_attrs_for_ejabberd/1
-
   defp format_attrs_for_ejabberd({:listeners, mods}),
     do: {:listen, format_listeners_for_ejabberd(mods)}
 
@@ -32,6 +29,9 @@ defmodule Ejabberd.Config.OptsFormatter do
   defp format_attrs_for_ejabberd({key, opts}) when is_atom(key),
     do: {key, opts}
 
+  defp format_attrs_for_ejabberd(opts),
+    do: (Enum.map opts, &format_attrs_for_ejabberd/1)
+
   defp format_mods_for_ejabberd(mods) do
     Enum.map mods, fn %EjabberdModule{module: mod, attrs: attrs} ->
       {mod, attrs[:opts]}

lib/ejabberd/config/validator/validation.ex

@@ -3,12 +3,12 @@ defmodule Ejabberd.Config.Validation do
   Module used to validate a list of modules.
   """
 
-  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
-  @type mod_validation_result :: {:ok, EjabberdModule.t} | {:error, EjabberdModule.t, map}
-
   alias Ejabberd.Config.EjabberdModule
   alias Ejabberd.Config.Validator
 
+  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
+  @type mod_validation_result :: {:ok, EjabberdModule.t} | {:error, EjabberdModule.t, map}
+
   @doc """
   Given a module or a list of modules it runs validators on them
   and returns {:ok, mod} or {:error, mod, errors}, for each

lib/ejabberd/config/validator/validator_attrs.ex

@@ -3,11 +3,12 @@ defmodule Ejabberd.Config.Validator.Attrs do
   Validator module used to validate attributes.
   """
 
-  # TODO: Duplicated from validator.ex !!!
-  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
-
   import Ejabberd.Config.ValidatorUtility
   alias Ejabberd.Config.Attr
+  alias Ejabberd.Config.EjabberdModule
+
+  # TODO: Duplicated from validator.ex !!!
+  @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
 
   @doc """
   Given a module (with the form used for validation)
@@ -17,9 +18,9 @@ defmodule Ejabberd.Config.Validator.Attrs do
   @spec validate(mod_validation) :: mod_validation
   def validate({modules, mod, errors}) do
     errors = Enum.reduce mod.attrs, errors, fn(attr, err) ->
-      case Attr.validate(attr) do
-        {:ok, _attr} -> err
-        {:error, attr, cause} -> put_error(err, :attribute, {attr, cause})
+      case Attr.validate([attr]) do
+        [{:ok, _attr}] -> err
+        [{:error, attr, cause}] -> put_error(err, :attribute, {attr, cause})
       end
     end
 

lib/ejabberd/config/validator/validator_dependencies.ex

@@ -4,6 +4,8 @@ defmodule Ejabberd.Config.Validator.Dependencies do
   with the @dependency annotation.
   """
 
+  alias Ejabberd.Config.EjabberdModule
+
   # TODO: Duplicated from validator.ex !!!
   @type mod_validation :: {[EjabberdModule.t], EjabberdModule.t, map}
   import Ejabberd.Config.ValidatorUtility

lib/ejabberd/config/validator/validator_utility.ex

@@ -4,8 +4,6 @@ defmodule Ejabberd.Config.ValidatorUtility do
   Imports utility functions for working with validation structures.
   """
 
-  alias Ejabberd.Config.EjabberdModule
-
   @doc """
   Inserts an error inside the errors collection, for the given key.
   If the key doesn't exists then it creates an empty collection
@@ -22,7 +20,6 @@ defmodule Ejabberd.Config.ValidatorUtility do
   Given a list of modules it extracts and returns a list
   of the module names (which are Elixir.Module).
   """
-  @spec extract_module_names(EjabberdModule.t) :: [atom]
   def extract_module_names(modules) when is_list(modules) do
     modules
     |> Enum.map(&Map.get(&1, :module))

lib/ejabberd/config_util.ex

@@ -7,7 +7,7 @@ defmodule Ejabberd.ConfigUtil do
   @doc """
   Returns true when the config file is based on elixir.
   """
-  @spec is_elixir_config(list) :: boolean
+  @spec is_elixir_config(binary) :: boolean
   def is_elixir_config(filename) when is_list(filename) do
     is_elixir_config(to_string(filename))
   end

lib/ejabberd/module.ex

@@ -1,19 +0,0 @@
-defmodule Ejabberd.Module do
-
-  defmacro __using__(opts) do
-    logger_enabled = Keyword.get(opts, :logger, true)
-
-    quote do
-      @behaviour :gen_mod
-      import Ejabberd.Module
-
-      unquote(if logger_enabled do
-        quote do: import Ejabberd.Logger
-      end)
-    end
-  end
-
-  # gen_mod callbacks
-  def depends(_host, _opts), do: []
-  def mod_opt_type(_), do: []
-end

lib/ejabberd_auth_example.ex

@@ -0,0 +1,44 @@
+defmodule Ejabberd.Auth.Example do
+
+  @moduledoc """
+  Example ejabberd auth method written in Elixir.
+
+  This is an example to demonstrate the usage of Elixir to
+  create ejabberd auth methods.
+
+  Example configuration:
+      auth_method: 'Ejabberd.Auth.Example'
+  """
+
+  @behaviour :ejabberd_auth
+  import Ejabberd.Logger
+
+  @impl true
+  def start(host) do
+    info("Starting Ejabberd.Auth.Example to authenticate '#{host}' users")
+    nil
+  end
+
+  @impl true
+  def stop(host) do
+    info("Stopping Ejabberd.Auth.Example to authenticate '#{host}' users")
+    nil
+  end
+
+  @impl true
+  def check_password("alice", _authz_id, _host, "secret"), do: {:nocache, true}
+  def check_password(_username, _authz_id, _host, _secret), do: {:nocache, false}
+
+  @impl true
+  def user_exists("alice", _host), do: {:nocache, true}
+  def user_exists(_username, _host), do: {:nocache, false}
+
+  @impl true
+  def plain_password_required(_binary), do: true
+
+  @impl true
+  def store_type(_host), do: :external
+
+  @impl true
+  def use_cache(_host), do: false
+end

lib/mix/tasks/deps.tree.ex

@@ -14,15 +14,15 @@ defmodule Mix.Tasks.Ejabberd.Deps.Tree do
   def run(_argv) do
     # First we need to start manually the store to be available
     # during the compilation of the config file.
-    Ejabberd.Config.Store.start_link
+    Ejabberd.Config.Store.start_link()
     Ejabberd.Config.init(:ejabberd_config.path())
 
-    Mix.shell.info "ejabberd modules"
+    Mix.shell().info "ejabberd modules"
 
     Ejabberd.Config.Store.get(:modules)
     |> Enum.reverse # Because of how mods are stored inside the store
     |> format_mods
-    |> Mix.shell.info
+    |> Mix.shell().info
   end
 
   defp format_mods(mods) when is_list(mods) do

lib/mod_example.ex

@@ -0,0 +1,46 @@
+defmodule Ejabberd.Module.Example do
+
+  @moduledoc """
+  Example ejabberd module written in Elixir.
+
+  This is an example to demonstrate the usage of Elixir to
+  create ejabberd modules.
+
+  Example configuration:
+      modules:
+        'Ejabberd.Module.Example': {}
+  """
+
+  @behaviour :gen_mod
+  import Ejabberd.Logger
+
+  def start(host, _opts) do
+    info("Starting Ejabberd.Module.Example for host '#{host}'")
+    Ejabberd.Hooks.add(:set_presence_hook, host, __MODULE__, :on_presence, 50)
+    :ok
+  end
+
+  def stop(host) do
+    info("Stopping Ejabberd.Module.Example for host '#{host}'")
+    Ejabberd.Hooks.delete(:set_presence_hook, host, __MODULE__, :on_presence, 50)
+    :ok
+  end
+
+  def on_presence(user, _server, _resource, _packet) do
+    info("Receive presence for #{user}")
+    :none
+  end
+
+  def depends(_host, _opts) do
+    []
+  end
+
+  def mod_options(_host) do
+    []
+  end
+
+  def mod_doc() do
+    %{:desc => "This is just a demonstration."}
+  end
+
+end

lib/mod_presence_demo.ex

@@ -1,33 +0,0 @@
-defmodule ModPresenceDemo do
-  use Ejabberd.Module
-
-  def start(host, _opts) do
-    info('Starting ejabberd module Presence Demo')
-    Ejabberd.Hooks.add(:set_presence_hook, host, __MODULE__, :on_presence, 50)
-    :ok
-  end
-
-  def stop(host) do
-    info('Stopping ejabberd module Presence Demo')
-    Ejabberd.Hooks.delete(:set_presence_hook, host, __MODULE__, :on_presence, 50)
-    :ok
-  end
-
-  def on_presence(user, _server, _resource, _packet) do
-    info('Receive presence for #{user}')
-    :none
-  end
-
-  def depends(_host, _opts) do
-    []
-  end
-
-  def mod_options(_host) do
-    []
-  end
-
-  def mod_doc() do
-    %{:desc => 'This is just a demonstration.'}
-  end
-
-end

m4/erlang-extra.m4

@@ -75,7 +75,7 @@ EOF
 	if test "x`cat conftest.out`" != "xok"; then
 	   AC_MSG_RESULT([failed])
 	   X="`cat conftest.out`"
-	   if test "[$3]" == "warn"; then
+	   if test "[$3]" = "warn"; then
 	      AC_MSG_WARN([$X])
 	   else
 	      AC_MSG_FAILURE([$X])

mix.exs

@@ -3,31 +3,34 @@ defmodule Ejabberd.MixProject do
 
   def project do
     [app: :ejabberd,
+     source_url: "https://github.com/processone/ejabberd",
      version: version(),
      description: description(),
-     elixir: elixir_required_version(),
+     elixir: "~> 1.14",
      elixirc_paths: ["lib"],
      compile_path: ".",
-     compilers: [:asn1] ++ Mix.compilers,
+     compilers: [:asn1, :yecc] ++ Mix.compilers(),
      erlc_options: erlc_options(),
      erlc_paths: ["asn1", "src"],
      # Elixir tests are starting the part of ejabberd they need
      aliases: [test: "test --no-start"],
      start_permanent: Mix.env() == :prod,
      language: :erlang,
+     dialyzer: dialyzer(),
      releases: releases(),
      package: package(),
+     docs: docs(),
      deps: deps()]
   end
 
   def version do
     case config(:vsn) do
       :false -> "0.0.0" # ./configure wasn't run: vars.config not created
-      '0.0' -> "0.0.0" # the full git repository wasn't downloaded
-      'latest.0' -> "0.0.0" # running 'docker-ejabberd/ecs/build.sh latest'
+      ~c"0.0" -> "0.0.0" # the full git repository wasn't downloaded
+      ~c"latest.0" -> "0.0.0" # running 'docker-ejabberd/ecs/build.sh latest'
       [_, _, ?., _, _] = x ->
         head = String.replace(:erlang.list_to_binary(x), ~r/\.0+([0-9])/, ".\\1")
-        <<head::binary, ".0">>
+        "#{head}.0"
       vsn -> String.replace(:erlang.list_to_binary(vsn), ~r/\.0+([0-9])/, ".\\1")
     end
   end
@@ -40,14 +43,24 @@ defmodule Ejabberd.MixProject do
 
   def application do
     [mod: {:ejabberd_app, []},
-     extra_applications: [:mix],
-     applications: [:idna, :inets, :kernel, :sasl, :ssl, :stdlib,
-                    :base64url, :fast_tls, :fast_xml, :fast_yaml, :jiffy, :jose,
-                    :p1_utils, :stringprep, :yconf],
+     extra_applications: [:inets, :kernel, :sasl, :ssl, :stdlib, :syntax_tools,
+                          :logger, :mix]
+     ++ cond_apps(),
      included_applications: [:mnesia, :os_mon,
                              :cache_tab, :eimp, :mqtree, :p1_acme,
-                             :p1_oauth2, :pkix, :xmpp]
-     ++ cond_apps()]
+                             :p1_oauth2, :pkix]
+     ++ cond_included_apps()]
+  end
+
+  defp dialyzer do
+    [
+      plt_add_apps: [
+        :mnesia, :odbc, :os_mon, :stdlib,
+        :eredis, :luerl,
+        :cache_tab, :eimp, :epam, :esip, :ezlib, :mqtree,
+        :p1_acme, :p1_mysql, :p1_oauth2, :p1_pgsql, :pkix,
+        :sqlite3, :stun, :xmpp],
+    ]
   end
 
   defp if_version_above(ver, okResult) do
@@ -68,20 +81,15 @@ defmodule Ejabberd.MixProject do
 
   defp erlc_options do
     # Use our own includes + includes from all dependencies
-    includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"])
+    includes = ["include", deps_include()]
     result = [{:d, :ELIXIR_ENABLED}] ++
              cond_options() ++
+             if Mix.env == :test do [{:d, :TEST}] else [] end ++
              Enum.map(includes, fn (path) -> {:i, path} end) ++
-             if_version_above('20', [{:d, :DEPRECATED_GET_STACKTRACE}]) ++
-             if_version_above('20', [{:d, :HAVE_URI_STRING}]) ++
-             if_version_above('20', [{:d, :HAVE_ERL_ERROR}]) ++
-             if_version_below('21', [{:d, :USE_OLD_HTTP_URI}]) ++
-             if_version_below('22', [{:d, :LAGER}]) ++
-             if_version_below('21', [{:d, :NO_CUSTOMIZE_HOSTNAME_CHECK}]) ++
-             if_version_below('23', [{:d, :USE_OLD_CRYPTO_HMAC}]) ++
-             if_version_below('23', [{:d, :USE_OLD_PG2}]) ++
-             if_version_below('24', [{:d, :COMPILER_REPORTS_ONLY_LINES}]) ++
-             if_version_below('24', [{:d, :SYSTOOLS_APP_DEF_WITHOUT_OPTIONAL}])
+             if_version_below(~c"26", [{:d, :OTP_BELOW_26}]) ++
+             if_version_below(~c"27", [{:d, :OTP_BELOW_27}]) ++
+             if_version_below(~c"27", [{:feature, :maybe_expr, :enable}]) ++
+             if_version_below(~c"28", [{:d, :OTP_BELOW_28}])
     defines = for {:d, value} <- result, do: {:d, value}
     result ++ [{:d, :ALL_DEFS, defines}]
   end
@@ -92,34 +100,34 @@ defmodule Ejabberd.MixProject do
                             {config(:debug), :debug_info},
                             {not config(:debug), {:debug_info, false}},
                             {config(:roster_gateway_workaround), {:d, :ROSTER_GATEWAY_WORKAROUND}},
-                            {config(:new_sql_schema), {:d, :NEW_SQL_SCHEMA}}
+                            {config(:multihost_sql_schema), {:d, :MULTIHOST_SQL_SCHEMA}}
                            ], do:
     option
   end
 
   defp deps do
-    [{:base64url, "~> 1.0"},
-     {:cache_tab, "~> 1.0"},
+    [{:cache_tab, "~> 1.0"},
+     {:dialyxir, "~> 1.2", only: [:test], runtime: false},
      {:eimp, "~> 1.0"},
-     {:fast_tls, "~> 1.1"},
-     {:fast_xml, "~> 1.1"},
+     {:erlydtl, "~> 0.14.0"},
+     {:ex_doc, "~> 0.31", only: [:edoc], runtime: false},
+     {:fast_tls, "~> 1.1.24"},
+     {:fast_xml, "~> 1.1.56"},
      {:fast_yaml, "~> 1.0"},
-     {:idna, "~> 6.0"},
-     {:jiffy, "~> 1.1.1"},
-     {:jose, "~> 1.11.1"},
+     {:idna, "~> 7.1"},
      {:mqtree, "~> 1.0"},
-     {:p1_acme, "~> 1.0"},
+     {:p1_acme, ">= 1.0.28"},
      {:p1_oauth2, "~> 0.6"},
      {:p1_utils, "~> 1.0"},
      {:pkix, "~> 1.0"},
      {:stringprep, ">= 1.0.26"},
-     {:xmpp, "~> 1.5"},
-     {:yconf, "~> 1.0"}]
+     {:xmpp, ">= 1.13.1"},
+     {:yconf, ">= 1.0.22"}]
     ++ cond_deps()
   end
 
-  defp deps_include(deps) do
-    base = if Mix.Project.umbrella?() do
+  defp deps_include() do
+    if Mix.Project.umbrella?() do
       "../../deps"
     else
       case Mix.Project.deps_paths()[:ejabberd] do
@@ -127,28 +135,43 @@ defmodule Ejabberd.MixProject do
         _ -> ".."
       end
     end
-    Enum.map(deps, fn dep -> base<>"/#{dep}/include" end)
   end
 
   defp cond_deps do
     for {:true, dep} <- [{config(:pam), {:epam, "~> 1.0"}},
-                         {config(:redis), {:eredis, "~> 1.2.0"}},
+                         {Mix.env() == :translations,
+                          {:ejabberd_po, git: "https://github.com/processone/ejabberd-po.git"}},
+                         {Mix.env() == :dev,
+                          {:exsync, "~> 0.2", optional: true, runtime: false}},
+                         {config(:redis), {:eredis, "~> 1.7.1"}},
                          {config(:sip), {:esip, "~> 1.0"}},
                          {config(:zlib), {:ezlib, "~> 1.0"}},
-                         {if_version_below('22', true), {:lager, "~> 3.9.1"}},
-                         {config(:lua), {:luerl, "~> 1.0"}},
-                         {config(:mysql), {:p1_mysql, "~> 1.0"}},
-                         {config(:pgsql), {:p1_pgsql, "~> 1.1"}},
+                         {if_version_below(~c"27", true), {:jiffy, "~> 1.1.1"}},
+                         {if_version_below(~c"26", true), {:jose, "1.11.10", override: true}},
+                         {if_version_above(~c"25", true), {:jose, "~> 1.11.12"}},
+                         {config(:lua), {:luerl, "~> 1.2.0"}},
+                         {config(:mysql), {:p1_mysql, ">= 1.0.28"}},
+                         {config(:pgsql), {:p1_pgsql, ">= 1.1.38"}},
                          {config(:sqlite), {:sqlite3, "~> 1.1"}},
                          {config(:stun), {:stun, "~> 1.0"}}], do:
       dep
   end
 
   defp cond_apps do
+    for {:true, app} <- [{config(:stun), :stun},
+                         {if_version_below(~c"27", true), :jiffy},
+                         {config(:tools), :debugger},
+                         {config(:tools), :observer},
+                         {config(:tools), :wx}], do:
+      app
+  end
+
+  defp cond_included_apps do
     for {:true, app} <- [{config(:pam), :epam},
                          {config(:lua), :luerl},
                          {config(:redis), :eredis},
-                         {if_version_below('22', true), :lager},
+                         {Mix.env() == :edoc, :ex_doc},
+                         {Mix.env() == :test, :dialyxir},
                          {config(:mysql), :p1_mysql},
                          {config(:sip), :esip},
                          {config(:odbc), :odbc},
@@ -161,19 +184,30 @@ defmodule Ejabberd.MixProject do
     [# These are the default files included in the package
       files: ["include", "lib", "priv", "sql", "src",
               "COPYING", "README.md",
+              "ejabberd.yml.example", "config/runtime.exs",
               "mix.exs", "rebar.config", "rebar.config.script", "vars.config"],
       maintainers: ["ProcessOne"],
-      licenses: ["GPLv2"],
-      links: %{"Site" => "https://www.ejabberd.im",
-               "Documentation" => "http://docs.ejabberd.im",
-               "Source" => "https://github.com/processone/ejabberd",
-               "ProcessOne" => "http://www.process-one.net/"}]
+      licenses: ["GPL-2.0-or-later"],
+      links: %{"ejabberd.im" => "https://www.ejabberd.im",
+               "ejabberd Docs" => "https://docs.ejabberd.im",
+               "GitHub" => "https://github.com/processone/ejabberd",
+               "ProcessOne" => "https://www.process-one.net/"}]
   end
 
   defp vars do
-    case :file.consult("vars.config") do
+    filepath = case Application.fetch_env(:ejabberd, :vars_config_path) do
+      :error ->
+        "vars.config"
+      {:ok, path} ->
+        path
+    end
+    config2 = case :file.consult(filepath) do
       {:ok,config} -> config
-      _ -> [zlib: true]
+      _ -> [stun: true, zlib: true]
+    end
+    case Mix.env() do
+      :dev -> List.keystore(config2, :tools, 0, {:tools, true})
+      _ -> config2
     end
   end
 
@@ -184,35 +218,6 @@ defmodule Ejabberd.MixProject do
     end
   end
 
-  defp elixir_required_version do
-    case {Map.get(System.get_env(), "RELIVE", "false"),
-          MapSet.member?(MapSet.new(System.argv()), "release")}
-      do
-      {"true", _} ->
-        case Version.match?(System.version(), "~> 1.11") do
-          false ->
-            IO.puts("ERROR: To use 'make relive', Elixir 1.11.0 or higher is required.")
-          _ -> :ok
-        end
-        "~> 1.11"
-      {_, true} ->
-        case Version.match?(System.version(), "~> 1.10") do
-          false ->
-            IO.puts("ERROR: To build releases, Elixir 1.10.0 or higher is required.")
-          _ -> :ok
-        end
-        case Version.match?(System.version(), "< 1.11.4")
-          and :erlang.system_info(:otp_release) > '23' do
-          true ->
-            IO.puts("ERROR: To build releases with Elixir lower than 1.11.4, Erlang/OTP lower than 24 is required.")
-          _ -> :ok
-        end
-        "~> 1.10"
-      _ ->
-        "~> 1.4"
-    end
-  end
-
   defp releases do
     maybe_tar = case Mix.env() do
       :prod -> [:tar]
@@ -222,6 +227,7 @@ defmodule Ejabberd.MixProject do
       ejabberd: [
         include_executables_for: [:unix],
         # applications: [runtime_tools: :permanent]
+        strip_beams: Mix.env() != :dev,
         steps: [&copy_extra_files/1, :assemble | maybe_tar]
       ]
     ]
@@ -238,6 +244,8 @@ defmodule Ejabberd.MixProject do
       config_dir: config(:config_dir),
       logs_dir: config(:logs_dir),
       spool_dir: config(:spool_dir),
+      vsn: version(),
+      iexpath: config(:iexpath),
       erl: config(:erl),
       epmd: config(:epmd),
       bindir: Path.join([config(:release_dir), "releases", version()]),
@@ -248,30 +256,15 @@ defmodule Ejabberd.MixProject do
     ro = "rel/overlays"
     File.rm_rf(ro)
 
-    # Elixir lower than 1.12.0 don't have System.shell
     execute = fn(command) ->
-      case function_exported?(System, :shell, 1) do
-        true ->
-          System.shell(command)
-        false ->
-          :os.cmd(to_charlist(command))
-      end
-    end
-
-    # Mix/Elixir lower than 1.11.0 use config/releases.exs instead of runtime.exs
-    case Version.match?(System.version, "~> 1.11") do
-      true ->
-        :ok
-      false ->
-        execute.("cp config/runtime.exs config/releases.exs")
+      System.shell(command, into: IO.stream())
     end
 
     execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.template > ejabberdctl.example1")
     Mix.Generator.copy_template("ejabberdctl.example1", "ejabberdctl.example2", assigns)
     execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.example2> ejabberdctl.example2a")
     Mix.Generator.copy_template("ejabberdctl.example2a", "ejabberdctl.example2b", assigns)
-    execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.example2b > ejabberdctl.example3")
-    execute.("sed -e 's|^ERLANG_NODE=ejabberd@localhost|ERLANG_NODE=ejabberd|g' ejabberdctl.example3 > ejabberdctl.example4")
+    execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.example2b > ejabberdctl.example4")
     execute.("sed -e 's|^ERLANG_OPTS=\"|ERLANG_OPTS=\"-boot ../releases/#{release.version}/start_clean -boot_var RELEASE_LIB ../lib |' ejabberdctl.example4 > ejabberdctl.example5")
     execute.("sed -e 's|^INSTALLUSER=|ERL_OPTIONS=\"-setcookie \\$\\(cat \"\\${SCRIPT_DIR%/*}/releases/COOKIE\")\"\\nINSTALLUSER=|g' ejabberdctl.example5 > ejabberdctl.example6")
     Mix.Generator.copy_template("ejabberdctl.example6", "#{ro}/bin/ejabberdctl", assigns)
@@ -319,13 +312,39 @@ defmodule Ejabberd.MixProject do
     end
 
     case Mix.env() do
-      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh")
+      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh mix")
       _ -> :ok
     end
 
     release
   end
 
+  defp docs do
+    [
+      main: "readme",
+      logo: "_build/edoc/logo.png",
+      source_ref: "master",
+      extra_section: "", # No need for Pages section name, it's the only one
+      api_reference: false, # API section has just Elixir, hide it
+      filter_modules: "aaaaa", # Module section has just Elixir modules, hide them
+      extras: [
+        "README.md": [title: "Readme"],
+        "COMPILE.md": [title: "Compile and Install"],
+        "CONTAINER.md": [title: "Container Image"],
+        "CONTRIBUTING.md": [title: "Contributing"],
+        "CONTRIBUTORS.md": [title: "Contributors"],
+        "CODE_OF_CONDUCT.md": [title: "Code of Conduct"],
+        "CHANGELOG.md": [title: "ChangeLog"],
+        "SECURITY.md": [title: "Security Policy"],
+        "COPYING": [title: "Copying License"],
+        "_build/edoc/docs.md": [title: "&xrArr; ejabberd Docs"]
+      ],
+      groups_for_extras: [
+        "": Path.wildcard("*.md") ++ ["COPYING"],
+        "For more documentation": "_build/edoc/docs.md"
+      ]
+    ]
+  end
 end
 
 defmodule Mix.Tasks.Compile.Asn1 do
@@ -338,7 +357,7 @@ defmodule Mix.Tasks.Compile.Asn1 do
   def run(args) do
     {opts, _, _} = OptionParser.parse(args, switches: [force: :boolean])
 
-    project      = Mix.Project.config
+    project      = Mix.Project.config()
     source_paths = project[:asn1_paths] || ["asn1"]
     dest_paths    = project[:asn1_target] || ["src"]
     mappings     = Enum.zip(source_paths, dest_paths)
@@ -360,7 +379,7 @@ defmodule Mix.Tasks.Compile.Asn1 do
   end
 
   def manifests, do: [manifest()]
-  defp manifest, do: Path.join(Mix.Project.manifest_path, @manifest)
+  defp manifest, do: Path.join(Mix.Project.manifest_path(), @manifest)
 
   def clean, do: Erlang.clean(manifest())
 end