2025-10-05 19:42:11 +02:00
473 changed files with 11759 additions and 40430 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@ -1 +1,4 @@
-FROM ghcr.io/processone/devcontainer:latest
+# Update the VARIANT arg to pick an Elixir version: latest, 1.11.4, etc.
+ARG VARIANT=latest
+
+FROM ghcr.io/processone/elixir:${VARIANT}
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -1,7 +1,48 @@
 {
 	"name": "ejabberd",
-	"build": {"dockerfile": "Dockerfile"},
-	"extensions": ["erlang-ls.erlang-ls"],
-	"postCreateCommand": ".devcontainer/prepare-container.sh",
-	"remoteUser": "vscode"
+	// "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"
+		}
+	}
 }
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@ -0,0 +1,8 @@
+ejabberd:
+  image: ejabberd/ecs
+  ports:
+    - 5222:5222
+    - 5223:5223
+    - 5269:5269
+    - 5280:5280
+    - 1883:1883
--- a/.devcontainer/prepare-container.sh
+++ b/.devcontainer/prepare-container.sh
@ -1,3 +0,0 @@
-echo "export PATH=/workspaces/ejabberd/_build/relive:$PATH" >>$HOME/.bashrc
-echo "COOKIE" >$HOME/.erlang.cookie
-chmod 400 $HOME/.erlang.cookie
--- a/.dockerignore
+++ b/.dockerignore
@ -43,4 +43,4 @@ Mnesia.nonode@nohost/
 /ejabberd-*.rpm
 /ejabberd-*.run
 /ejabberd-*.tar.gz
-/.github/container/Dockerfile
+
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -6,7 +6,8 @@ assignees: ''

 ---

-Before creating a ticket, please consider if this should fit the [discussion forum](https://github.com/processone/ejabberd/discussions) better.
+Before creating a ticket, please consider if this should fit the discussion forum better:
+https://github.com/processone/ejabberd/discussions

 ## Environment

--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -7,20 +7,17 @@ assignees: ''

 ---

-Before creating a ticket, please consider if this should fit the [discussion forum](https://github.com/processone/ejabberd/discussions) better.
+Before creating a ticket, please consider if this should fit the discussion forum better:
+https://github.com/processone/ejabberd/discussions

 **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.
--- a/.github/container/Dockerfile
+++ b/.github/container/Dockerfile
@ -1,98 +1,55 @@
-#' Define default build variables
-ARG OTP_VSN='27.3.4.3'
-ARG ELIXIR_VSN='1.18.4'
-ARG UID='9000'
-ARG USER='ejabberd'
-ARG HOME="opt/$USER"
-ARG BUILD_DIR="/$USER"
-ARG VERSION='master'
+FROM alpine:3.15.4 AS build
+ARG VERSION=master

-################################################################################
-#' 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 \
-        autoconf \
-        automake \
-        bash \
-        build-base \
-        curl \
-        expat-dev \
-        file \
-        gd-dev \
-        git \
-        jpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        linux-pam-dev \
-        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 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

 RUN mix local.hex --force \
    && mix local.rebar --force

-ARG BUILD_DIR
-COPY / $BUILD_DIR/
+COPY . ./ejabberd
+
+WORKDIR ejabberd

-WORKDIR $BUILD_DIR
 RUN mv .github/container/ejabberdctl.template . \
-    && mv .github/container/ejabberd.yml.example . \
    && ./autogen.sh \
    && ./configure --with-rebar=mix --enable-all \
    && make deps \
    && make rel

-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 cp -r _build/prod/rel/ejabberd/ /opt/ejabberd-$VERSION \
+    && mkdir -p /opt/ejabberd \
+    && mv /opt/ejabberd-$VERSION/conf /opt/ejabberd/conf

-RUN cp -p $BUILD_DIR/tools/captcha*.sh $HOME-$VERSION/lib
+RUN BINPATH=$(dirname $(find /opt -name msgs))/bin/ \
+    && mkdir -p $BINPATH \
+    && cp tools/captcha*.sh $BINPATH

-RUN find "$HOME-$VERSION/bin" -name 'ejabberd' -delete \
-    && find "$HOME-$VERSION/releases" -name 'COOKIE' -delete
+RUN [ ! -d .ejabberd-modules ] || cp -r .ejabberd-modules /opt/ejabberd/

-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 \
+RUN export PEM=/opt/ejabberd/conf/server.pem \
+    && curl -o "/opt/ejabberd/conf/cacert.pem" 'https://curl.se/ca/cacert.pem' \
    && openssl req -x509 \
            -batch \
            -nodes \
@ -100,107 +57,63 @@ RUN export PEM=$HOME/conf/server.pem \
            -keyout $PEM \
            -out $PEM \
            -days 3650 \
-            -subj "/CN=localhost"
+            -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"

-RUN sed -i 's|^#CTL_OVER_HTTP=|CTL_OVER_HTTP=../|' "$HOME/conf/ejabberdctl.cfg"
+FROM alpine:3.15.4
+ENV HOME=/opt/ejabberd
+ARG VERSION=master

-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
+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/*

-ARG UID
-RUN chown -R $UID:$UID $HOME
+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 /opt/ejabberd-$VERSION/bin/ejabberdctl \"\$@\"" > /usr/local/bin/ejabberdctl \
+    && chmod +x /usr/local/bin/ejabberdctl

-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.0 \
-        curl \
-        tini \
-    && rm /tmp/runDeps \
-    && ln -fs /usr/lib/libtdsodbc.so.0 /usr/lib/libtdsodbc.so
-
-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 /
+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

 HEALTHCHECK \
    --interval=1m \
    --timeout=5s \
    --start-period=5s \
    --retries=10 \
-    CMD ejabberdctl status
+    CMD /usr/local/bin/ejabberdctl status

-WORKDIR /$HOME
-USER $USER
-VOLUME ["/$HOME"]
-EXPOSE 1880 1883 4369-4399 5210 5222 5269 5280 5443
+WORKDIR $HOME
+USER ejabberd
+VOLUME ["$HOME/conf", "$HOME/database", "$HOME/logs", "$HOME/upload"]
+EXPOSE 1883 4369-4399 5210 5222 5269 5280 5443

-ENTRYPOINT ["/sbin/tini","--","ejabberdctl"]
+ENTRYPOINT ["/usr/local/bin/ejabberdctl"]
 CMD ["foreground"]
--- a/.github/container/ejabberd.yml.example
+++ b/.github/container/ejabberd.yml.example
@ -1,278 +0,0 @@
-###
-###              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_MQTT: 1883
-  PORT_PROXY65: 7777
-
-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: true
-  -
-    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
-      /ws: 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
-    ## 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: "*"
-  "admin access":
-    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_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
--- a/.github/container/ejabberdctl.template
+++ b/.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}}"
-IEX="{{iexpath}}"
-COOKIE_FILE="$HOME"/.erlang.cookie
-[ -n "$ERLANG_COOKIE" ] && [ ! -f "$COOKIE_FILE" ] && echo "$ERLANG_COOKIE" > "$COOKIE_FILE" && chmod 400 "$COOKIE_FILE"
+[ -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 

 # check the proper system user is used
 case $(id -un) in
@ -60,6 +60,7 @@ 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,24 +69,16 @@ done
 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
 [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
 [ "$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" $ERLANG_OPTS -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" -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
@ -97,12 +90,11 @@ 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="\
-$(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"
+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")\
+$(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")"
 [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS"
 EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd"

@ -137,8 +129,8 @@ run_cmd()
 exec_cmd()
 {
    case $EXEC_CMD in
+        as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
        as_current_user) exec "$@" ;;
-        as_install_user) su -s /bin/sh -c 'exec "$0" "$@"' "$INSTALLUSER" -- "$@" ;;
    esac
 }
 run_erl()
@ -170,11 +162,9 @@ debugwarning()
        echo "Please be extremely cautious with your actions,"
        echo "and exit immediately if you are not completely sure."
        echo ""
-        echo "To exit and detach this shell from ejabberd, press:"
-        echo "  control+g and then q"
+        echo "To detach this shell from ejabberd, press:"
+        echo "  control+c, control+c"
        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"
@ -195,10 +185,8 @@ livewarning()
        echo "Please be extremely cautious with your actions,"
        echo "and exit immediately if you are not completely sure."
        echo ""
-        echo "To stop ejabberd gracefully:"
-        echo "  ejabberd:stop()."
-        echo "To quit erlang immediately, press:"
-        echo "  control+g and then q"
+        echo "To exit this LIVE mode and stop ejabberd, press:"
+        echo "  q().  and press the Enter key"
        echo ""
        echo "--------------------------------------------------------------------"
        echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
@ -209,39 +197,6 @@ 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 ""
@ -270,34 +225,16 @@ help()
 }

 # dynamic node name helper
-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
+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}"
 }

 # stop epmd if there is no other running node
@ -311,8 +248,6 @@ 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" ] && return
    "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
        pgrep -f "$ERLANG_NODE" >/dev/null && {
@ -346,32 +281,14 @@ post_waiter_loop()
    LIST=$@
    HEAD=${LIST%% ; *}
    TAIL=${LIST#* ; }
-    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
+    echo ":> ejabberdctl $HEAD"
+    $0 $HEAD
    [ "$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"
@ -382,71 +299,14 @@ wait_status_node()
        if [ $timeout -eq 0 ] ; then
            status="$1"
        else
-            run_erl "$(uid ctl)" -hidden -noinput \
-                     -eval 'net_kernel:connect_node('"'$CONNECT_NODE'"')' \
-                     -s ejabberd_ctl \
-                     -extra "$CONNECT_NODE" $NO_TIMEOUT status > /dev/null
+            run_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+                     -extra "$ERLANG_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"
@ -455,103 +315,6 @@ 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)
@ -579,31 +342,24 @@ case $1 in
        ;;
    etop)
        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
+        exec_erl "$(uid top)" -hidden -node "$ERLANG_NODE" -s etop \
+                 -s erlang halt -output text
        ;;
    iexdebug)
        debugwarning
        set_dist_client
        exec_iex "$(uid debug)" --remsh "$ERLANG_NODE"
-        check_iex_result
        ;;
    iexlive)
        livewarning
-        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS"
-        check_iex_result
+        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS" --app ejabberd
        ;;
    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 'net_kernel:connect_node('"'$PEER'"')' \
-                 -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
+                 -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
                 -s erlang halt -output text
        ;;
    started)
@ -614,14 +370,18 @@ case $1 in
        set_dist_client
        wait_status 3 30 2 && stop_epmd # wait 30x2s before timeout
        ;;
-    mnesia_change)
-        mnesia_change $2
-        ;;
    post_waiter)
        post_waiter_waiting
        ;;
    *)
        set_dist_client
-        exec_other_command "$@"
+        run_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+                 -extra "$ERLANG_NODE" $NO_TIMEOUT "$@"
+        result=$?
+        case $result in
+            2|3) help;;
+            *) :;;
+        esac
+        exit $result
        ;;
 esac
--- a/.github/workflows/ci-19.3.yml
+++ b/.github/workflows/ci-19.3.yml
@ -0,0 +1,229 @@
+name: CI (19.3)
+
+on:
+  push:
+    paths-ignore:
+    - '.devcontainer/**'
+    - 'examples/**'
+    - 'lib/**'
+    - 'man/**'
+    - 'priv/**'
+    - '**.md'
+  pull_request:
+    paths-ignore:
+    - '.devcontainer/**'
+    - 'examples/**'
+    - 'lib/**'
+    - 'man/**'
+    - 'priv/**'
+    - '**.md'
+
+jobs:
+
+  tests:
+    name: Tests
+    strategy:
+      fail-fast: false
+      matrix:
+        otp: ['19.3']
+    runs-on: ubuntu-18.04
+    services:
+      redis:
+        image: redis
+        ports:
+        - 6379:6379
+
+    steps:
+
+    - uses: actions/checkout@v3
+
+    - name: Get specific Erlang/OTP
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp }}
+
+    - name: Get a compatible Rebar3
+      run: |
+        rm rebar3
+        wget https://github.com/processone/ejabberd/raw/21.12/rebar3
+        chmod +x rebar3
+
+    - 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 -y purge libgd3 nginx
+        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: Remove syntax_tools from release
+      run: sed -i 's|, syntax_tools||g' src/ejabberd.app.src.script
+
+    - name: Cache rebar
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cache/rebar3/
+        key: ${{matrix.otp}}-${{hashFiles('rebar.config')}}
+
+    - name: Compile
+      run: |
+        ./autogen.sh
+        ./configure --with-rebar=./rebar3 \
+                    --prefix=/tmp/ejabberd \
+                    --enable-all \
+                    --disable-elixir \
+                    --disable-mssql \
+                    --disable-odbc
+        make update
+        make
+
+    - run: make install -s
+    - run: make hooks
+    - run: make options
+    - run: make xref
+    - run: make dialyzer
+
+    - name: Check Production Release
+      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
+
+    - name: Check Development Release
+      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
+      id: ct
+      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
+
+    - name: Check results
+      if: always() && (steps.ct.outcome != 'skipped' || steps.ct2.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 failures
+      if: failure() && steps.ctresults.outcome == 'failure'
+      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 '{}' ';'
+
+    - name: Upload test logs
+      if: always() && steps.ct.outcome == 'failure' && github.repository == 'processone/ejabberd'
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        publish_dir: _build/test
+        exclude_assets: '.github,lib,plugins'
+        external_repository: processone/ecil
+        deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+        keep_files: true
+
+    - 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/"
+
+    - name: Prepare new schema
+      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;"
+        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'
+      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'
+      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 '{}' ';'
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -25,20 +25,20 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        otp: ['25', '26', '27', '28']
-    runs-on: ubuntu-24.04
+        otp: ['20.0', '21.3', '24.3', '25']
+    runs-on: ubuntu-20.04
    services:
      redis:
-        image: public.ecr.aws/docker/library/redis
+        image: redis
        ports:
        - 6379:6379

    steps:

-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3

    - name: Test shell scripts
-      if: matrix.otp == '27'
+      if: matrix.otp == 25
      run: |
        shellcheck test/ejabberd_SUITE_data/gencerts.sh
        shellcheck tools/captcha.sh
@ -46,38 +46,35 @@ jobs:
        shellcheck -x ejabberdctl.template

    - name: Get specific Erlang/OTP
+      if: matrix.otp != 25
      uses: erlef/setup-beam@v1
      with:
        otp-version: ${{ matrix.otp }}

-    - name: Install MS SQL Server
+    - name: Get a compatible Rebar3
+      if: matrix.otp <= '21.3'
      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
+        rm rebar3
+        wget https://github.com/processone/ejabberd/raw/21.12/rebar3
+        chmod +x rebar3

    - name: Prepare databases
      run: |
-        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd -C -U SA -P ejabberd_Test1 -S localhost -i /initdb_mssql.sql
-        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd -C -U SA -P ejabberd_Test1 -S localhost -d ejabberd_test -i /mssql.sql
        sudo systemctl start mysql.service
        sudo systemctl start postgresql.service
-        mysql -u root -proot -e "CREATE DATABASE ejabberd_test;"
        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 DATABASE ejabberd_test;"
        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 -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;"
@ -92,16 +89,39 @@ jobs:
        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: Remove syntax_tools from release
      run: sed -i 's|, syntax_tools||g' src/ejabberd.app.src.script

-    - name: Cache Hex.pm
-      uses: actions/cache@v4
+    - name: Cache rebar
+      uses: actions/cache@v3
      with:
        path: |
          ~/.cache/rebar3/
        key: ${{matrix.otp}}-${{hashFiles('rebar.config')}}

+    - name: Download test logs
+      if: matrix.otp == 25 && 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/
+
    - name: Compile
      run: |
        ./autogen.sh
@ -111,6 +131,7 @@ jobs:
                    --disable-elixir \
                    --disable-mssql \
                    --disable-odbc
+        make update
        make

    - run: make install -s
@ -118,9 +139,6 @@ jobs:
    - run: make options
    - run: make xref
    - run: make dialyzer
-    - run: make test-eunit
-    - run: make elvis
-      if: matrix.otp >= '26'

    - name: Check Production Release
      run: |
@ -133,30 +151,12 @@ jobs:
        cat $RE/logs/ejabberd.log
        grep -q "is stopped in" $RE/logs/ejabberd.log

-    - name: Start Development Release
+    - name: Check Development Release
      run: |
        make dev
        RE=_build/dev/rel/ejabberd
-        sed -i 's/starttls_required: true/starttls_required: false/g'  $RE/conf/ejabberd.yml
        $RE/bin/ejabberdctl start
        $RE/bin/ejabberdctl started
-        $RE/bin/ejabberdctl register admin localhost admin
-        grep -q "is started in" $RE/logs/ejabberd.log
-
-    - name: Run XMPP Interoperability Tests against CI server.
-      if: matrix.otp == '27'
-      continue-on-error: true
-      uses: XMPP-Interop-Testing/xmpp-interop-tests-action@v1.6.1
-      with:
-        domain: 'localhost'
-        adminAccountUsername: 'admin'
-        adminAccountPassword: 'admin'
-        disabledSpecifications: RFC6121,XEP-0030,XEP-0045,XEP-0054,XEP-0060,XEP-0080,XEP-0115,XEP-0118,XEP-0215,XEP-0347,XEP-0363,XEP-0384
-
-    - name: Stop Development Release
-      if: always()
-      run: |
-        RE=_build/dev/rel/ejabberd
        $RE/bin/ejabberdctl stop
        $RE/bin/ejabberdctl stopped
        cat $RE/logs/ejabberd.log
@ -166,7 +166,6 @@ jobs:
      id: ct
      run: |
        (cd priv && ln -sf ../sql)
-        sed -i -e 's/ct:pal/ct:log/' test/suite.erl
        COMMIT=`echo $GITHUB_SHA | cut -c 1-7`
        DATE=`date +%s`
        REF_NAME=`echo $GITHUB_REF_NAME | tr "/" "_"`
@ -176,7 +175,7 @@ jobs:
        ./rebar3 cover

    - name: Check results
-      if: always() && (steps.ct.outcome != 'skipped')
+      if: always() && (steps.ct.outcome != 'skipped' || steps.ct2.outcome != 'skipped')
      id: ctresults
      run: |
        [[ -d _build ]] && ln -s _build/test/logs/last/ logs || true
@ -194,7 +193,7 @@ jobs:
        find logs/ -name exunit.log -exec cat '{}' ';'

    - name: Send to coveralls
-      if: matrix.otp == '27'
+      if: matrix.otp == 25
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      run: |
@ -206,60 +205,36 @@ jobs:
                      "payload":{"build_num":$GITHUB_RUN_ID,
                                 "status":"done"}}'

-    - name: Check for changes to trigger schema upgrade test
-      uses: dorny/paths-filter@v3
-      id: filter
+    - name: Upload test logs
+      if: always() && steps.ct.outcome == 'failure' && github.repository == 'processone/ejabberd'
+      uses: peaceiris/actions-gh-pages@v3
      with:
-        filters: |
-          sql:
-            - 'sql/**'
-            - 'src/mod_admin_update_sql.erl'
+        publish_dir: _build/test
+        exclude_assets: '.github,lib,plugins'
+        external_repository: processone/ecil
+        deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+        keep_files: true

-    - name: Prepare for schema upgrade test
-      id: prepupgradetest
-      if: ${{ steps.filter.outputs.sql == 'true' }}
+    - name: View ECIL address
+      if: always() && steps.ct.outcome == 'failure' && github.repository == 'processone/ejabberd'
      run: |
-        [[ -d logs ]] && rm -rf logs
-        [[ -d _build/test/logs ]] && rm -rf _build/test/logs || true
-        sed -i 's|update_sql, false|update_sql, true|g' test/suite.erl
-    - name: Run DB tests on upgraded schema (mssql, mysql, pgsql)
-      run: CT_BACKENDS=mssql,mysql,pgsql make test
-      if: always() && steps.prepupgradetest.outcome != 'skipped'
-      id: ctupgradedschema
-    - name: Check results
-      if: always() && steps.ctupgradedschema.outcome != 'skipped'
-      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.ctupgradedschema.outcome != 'skipped'
-      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 '{}' ';'
+        CTRUN=`ls -la _build/test/logs/last | sed 's|.*-> ||'`
+        echo "::notice::View CT results: https://processone.github.io/ecil/logs/$CTRUN/"

    - name: Prepare new schema
      run: |
        [[ -d logs ]] && rm -rf logs
        [[ -d _build/test/logs ]] && rm -rf _build/test/logs || true
-        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd -C -U SA -P ejabberd_Test1 -S localhost -Q "drop database [ejabberd_test];"
-        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd -C -U SA -P ejabberd_Test1 -S localhost -Q "drop login [ejabberd_test];"
        mysql -u root -proot -e "DROP DATABASE ejabberd_test;"
        sudo -u postgres psql -c "DROP DATABASE ejabberd_test;"
-        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd -C -U SA -P ejabberd_Test1 -S localhost -i /initdb_mssql.sql
-        docker exec ejabberd-mssql /opt/mssql-tools18/bin/sqlcmd -C -U SA -P ejabberd_Test1 -S localhost -d ejabberd_test -i /mssql.new.sql
        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 -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;"
@ -267,8 +242,7 @@ jobs:
                                                SEQUENCES IN SCHEMA public
                                                TO ejabberd_test;"
        sed -i 's|new_schema, false|new_schema, true|g' test/suite.erl
-    - name: Run DB tests on new schema (mssql, mysql, pgsql)
-      run: CT_BACKENDS=mssql,mysql,pgsql make test
+    - run: CT_BACKENDS=mysql,pgsql make test
      id: ctnewschema
    - name: Check results
      if: always() && steps.ctnewschema.outcome != 'skipped'
@ -285,17 +259,3 @@ jobs:
          '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 '{}' ';'
-
-    - name: Upload CT logs
-      if: failure()
-      uses: actions/upload-artifact@v4
-      with:
-        name: ejabberd-ct-logs-${{matrix.otp}}
-        #
-        # Appending the wildcard character ("*") is a trick to make
-        # "ejabberd-packages" the root directory of the uploaded ZIP file:
-        #
-        # https://github.com/actions/upload-artifact#upload-using-multiple-paths-and-exclusions
-        #
-        path: _build/test/logs
-        retention-days: 14
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@ -17,23 +17,24 @@ env:
 jobs:
  container:
    name: Container
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    permissions:
      packages: write
    steps:
+
      - name: Check out repository code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

      - name: Checkout ejabberd-contrib
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
        with:
          repository: processone/ejabberd-contrib
          path: .ejabberd-modules/sources/ejabberd-contrib

      - name: Log in to the Container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1.14.1
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@ -41,11 +42,11 @@ jobs:

      - name: Get git describe
        id: gitdescribe
-        run: echo "ver=$(git describe --tags)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=ver::$(git describe --tags)"

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3.8.0
        with:
          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
          labels: |
@ -54,13 +55,13 @@ jobs:
            org.opencontainers.image.vendor=ProcessOne

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1

      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2.10.0
        with:
          build-args: |
            VERSION=${{ steps.gitdescribe.outputs.ver }}
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@ -21,13 +21,13 @@ on:
 jobs:
  binaries:
    name: Binaries
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
      - name: Cache build directory
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: ~/build/
-          key: ${{runner.os}}-ct-ng-1.27.0
+          key: ${{runner.os}}-ct-ng-1.25.0
      - name: Install prerequisites
        run: |
          sudo apt-get -qq update
@ -39,9 +39,9 @@ jobs:
      - name: Install FPM
        run: |
          gem install --no-document --user-install fpm
-          echo $HOME/.local/share/gem/ruby/*/bin >> $GITHUB_PATH
+          echo $HOME/.gem/ruby/*/bin >> $GITHUB_PATH
      - name: Check out repository code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Build binary archives
@ -55,7 +55,7 @@ jobs:
          mkdir ejabberd-packages
          mv ejabberd_*.deb ejabberd-*.rpm ejabberd-*.run ejabberd-packages
      - name: Upload packages
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: ejabberd-packages
          #
@ -70,15 +70,15 @@ jobs:
  release:
    name: Release
    needs: [binaries]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    if: github.ref_type == 'tag'
    steps:
      - name: Download packages
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v3
        with:
          name: ejabberd-packages
      - name: Draft Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        with:
          draft: true
          files: ejabberd-packages/*
--- a/.github/workflows/runtime.yml
+++ b/.github/workflows/runtime.yml
@ -31,292 +31,114 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        otp: ['24', '25', '26', '27', '28']
+        otp: ['19.3', '20.3', '24.3', '25']
        rebar: ['rebar', 'rebar3']
-        exclude:
-        - otp: '24'
-          rebar: 'rebar'
-        - otp: '27'
-          rebar: 'rebar'
-        - otp: '28'
-          rebar: 'rebar'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    container:
-      image: public.ecr.aws/docker/library/erlang:${{ matrix.otp }}
+      image: erlang:${{ matrix.otp }}

    steps:

-    - uses: actions/checkout@v5
-
-    - name: Get old compatible Rebar binaries
-      if: matrix.otp < 24
-      run: |
-        rm rebar
-        rm rebar3
-        wget https://github.com/processone/ejabberd/raw/21.12/rebar
-        wget https://github.com/processone/ejabberd/raw/21.12/rebar3
-        chmod +x rebar
-        chmod +x rebar3
-
-    - name: Get recent compatible Rebar binaries
-      if: matrix.otp > 23 && matrix.otp < 25
-      run: |
-        rm rebar
-        rm rebar3
-        wget https://github.com/processone/ejabberd/raw/24.12/rebar
-        wget https://github.com/processone/ejabberd/raw/24.12/rebar3
-        chmod +x rebar
-        chmod +x rebar3
+    - uses: actions/checkout@v3

    - name: Prepare libraries
      run: |
        apt-get -qq update
-        apt-get purge -y libgd3 nginx
+        apt-get purge -y libgd3
        apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
                            libsqlite3-dev libwebp-dev libyaml-dev

-    - name: Cache Hex.pm
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/rebar3/
-        key: ${{matrix.otp}}-${{hashFiles('rebar.config')}}
-
-    - name: Unlock eredis dependency
-      if: matrix.rebar == 'rebar3' && matrix.otp < 21
-      run: rebar3 unlock eredis
-
    - name: Compile
      run: |
        ./autogen.sh
-        ./configure --with-rebar=./${{ matrix.rebar }} \
+        ./configure --with-rebar=`which ${{ matrix.rebar }}` \
                    --prefix=/tmp/ejabberd \
-                    --with-min-erlang=9.0.5 \
                    --enable-all \
                    --disable-elixir \
-                    --disable-tools \
                    --disable-odbc
+        make update
        make

+    - 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
+
    - run: make xref

-    - run: make dialyzer
-
-    - name: Prepare rel (rebar2)
+    - name: Test rel (rebar2)
      if: matrix.rebar == 'rebar'
      run: |
-        mkdir -p _build/prod && ln -s `pwd`/rel/ _build/prod/rel
-        mkdir -p _build/dev  && ln -s `pwd`/rel/ _build/dev/rel
+        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: Run rel
+    - 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 > registered.log
+        _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: Run dev
+    - 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 user2 localhost s0mePass
-        _build/dev/rel/ejabberd/bin/ejabberdctl registered_users localhost >> registered.log
+        _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
-
-    - name: Run install
-      run: |
-        make install
-        /tmp/ejabberd/sbin/ejabberdctl start \
-          && /tmp/ejabberd/sbin/ejabberdctl started
-        /tmp/ejabberd/sbin/ejabberdctl register user3 localhost s0mePass
-        /tmp/ejabberd/sbin/ejabberdctl registered_users localhost >> registered.log
-        /tmp/ejabberd/sbin/ejabberdctl stop \
-          && /tmp/ejabberd/sbin/ejabberdctl stopped
-
-    - name: View logs
-      run: |
-        echo "===> Registered:"
-        cat registered.log
-        echo "===> Prod:"
-        cat _build/prod/rel/ejabberd/logs/*
-        echo "===> Dev:"
        cat _build/dev/rel/ejabberd/logs/*
-        echo "===> Install:"
-        cat /tmp/ejabberd/var/log/ejabberd/*
-
-    - name: Check logs
-      run: |
-        grep -q '^user1$' registered.log
-        grep -q '^user2$' registered.log
-        grep -q '^user3$' 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/rel/ -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/rel/ -empty -name error.log)
-        grep -q 'is started' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        grep -q 'is stopped' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        test $(find /tmp/ejabberd/var/log/ejabberd/ -empty -name error.log)
-
-    - name: View logs failures
-      if: always()
-      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
-        cat /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        cat /tmp/ejabberd/var/log/ejabberd/error.log
-
-  rebar3-elixir:
-    name: Rebar3+Elixir
-    strategy:
-      fail-fast: false
-      matrix:
-        elixir: ['1.14', '1.15', '1.16', '1.17', '1.18']
-    runs-on: ubuntu-24.04
-    container:
-      image: public.ecr.aws/docker/library/elixir:${{ matrix.elixir }}
-
-    steps:
-
-    - uses: actions/checkout@v5
-
-    - name: Prepare libraries
-      run: |
-        apt-get -qq update
-        apt-get -y purge libgd3 nginx
-        apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
-                            libsqlite3-dev libwebp-dev libyaml-dev
-
-    - 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@v4
-      with:
-        path: |
-          ~/.cache/rebar3/
-        key: ${{matrix.elixir}}-${{hashFiles('rebar.config')}}
-
-    - name: Install Hex and Rebar3 manually on older Elixir
-      if: matrix.elixir <= '1.14'
-      run: |
-        mix local.hex --force
-        mix local.rebar --force
-
-    - name: Compile
-      run: |
-        ./autogen.sh
-        ./configure --with-rebar=./rebar3 \
-                    --prefix=/tmp/ejabberd \
-                    --enable-all \
-                    --disable-odbc
-        make
-
-    - 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: Run install
-      run: |
-        make install
-        /tmp/ejabberd/sbin/ejabberdctl start \
-          && /tmp/ejabberd/sbin/ejabberdctl started
-        /tmp/ejabberd/sbin/ejabberdctl register user3 localhost s0mePass
-        /tmp/ejabberd/sbin/ejabberdctl registered_users localhost >> registered.log
-        /tmp/ejabberd/sbin/ejabberdctl stop \
-          && /tmp/ejabberd/sbin/ejabberdctl stopped
-
-    - name: View logs
-      if: always()
-      run: |
-        echo "===> Registered:"
-        cat registered.log
-        echo "===> Prod:"
-        cat _build/prod/rel/ejabberd/logs/*
-        echo "===> Dev:"
-        cat _build/dev/rel/ejabberd/logs/*
-        echo "===> Install:"
-        cat /tmp/ejabberd/var/log/ejabberd/*
-
-    - name: Check logs
-      if: always()
-      run: |
-        grep -q '^user1$' registered.log
-        grep -q '^user2$' registered.log
-        grep -q '^user3$' registered.log
-        grep -q 'is started' _build/prod/rel/ejabberd/logs/ejabberd.log
-        grep -q 'is stopped' _build/prod/rel/ejabberd/logs/ejabberd.log
-        grep -q 'Stopping Ejabberd.Module.Example' _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
-        grep -q 'Stopping Ejabberd.Module.Example' _build/dev/rel/ejabberd/logs/ejabberd.log
-        test $(find _build/dev/ -empty -name error.log)
-        grep -q 'is started' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        grep -q 'is stopped' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        grep -q 'Stopping Ejabberd.Module.Example' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        test $(find /tmp/ejabberd/var/log/ejabberd/ -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
-        cat /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        cat /tmp/ejabberd/var/log/ejabberd/error.log

  mix:
    name: Mix
    strategy:
      fail-fast: false
      matrix:
-        elixir: ['1.14', '1.15', '1.16', '1.17', '1.18']
-    runs-on: ubuntu-24.04
-    container:
-      image: public.ecr.aws/docker/library/elixir:${{ matrix.elixir }}
+        otp: ['21.3', '22.0', '25.0']
+        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: '25.0'
+          elixir: '1.10.3'
+        - otp: '25.0'
+          elixir: '1.11.4'
+        - otp: '25.0'
+          elixir: '1.12.3'
+    runs-on: ubuntu-latest

    steps:

-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
+
+    - name: Get specific Erlang/OTP
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{matrix.otp}}
+        elixir-version: ${{matrix.elixir}}

    - name: Prepare libraries
      run: |
-        apt-get -qq update
-        apt-get -y purge libgd3 nginx
-        apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
-                            libsqlite3-dev libwebp-dev libyaml-dev
+        sudo apt-get -qq update
+        sudo apt-get -y purge libgd3 nginx
+        sudo apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
+                                 libsqlite3-dev libwebp-dev libyaml-dev

    - name: Remove Elixir Matchers
      run: |
@ -326,40 +148,19 @@ jobs:
        echo "::remove-matcher owner=elixir-mixTestFailure::"
        echo "::remove-matcher owner=elixir-dialyzerOutputDefault::"

-    - 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, \1\n  {decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}}, |g' rebar.config
-        cat rebar.config
-
-    - name: Cache Hex.pm
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.hex/
-        key: ${{matrix.elixir}}-${{hashFiles('mix.exs')}}
-
-    - name: Install Hex and Rebar3 manually on older Elixir
-      if: matrix.elixir <= '1.14'
-      run: |
-        mix local.hex --force
-        mix local.rebar --force
-
    - name: Compile
      run: |
        ./autogen.sh
        ./configure --with-rebar=mix \
                    --prefix=/tmp/ejabberd \
-                    --enable-all
+                    --enable-all \
+                    --disable-elixir \
+                    --disable-odbc
+        mix deps.get
        make

    - run: make xref

-    - run: make dialyzer
-
-    - run: make edoc
-
    - name: Run rel
      run: |
        make rel
@ -380,46 +181,17 @@ jobs:
        _build/dev/rel/ejabberd/bin/ejabberdctl stop \
          && _build/dev/rel/ejabberd/bin/ejabberdctl stopped

-    - name: Run install
-      run: |
-        make install
-        /tmp/ejabberd/sbin/ejabberdctl start \
-          && /tmp/ejabberd/sbin/ejabberdctl started
-        /tmp/ejabberd/sbin/ejabberdctl register user3 localhost s0mePass
-        /tmp/ejabberd/sbin/ejabberdctl registered_users localhost >> registered.log
-        /tmp/ejabberd/sbin/ejabberdctl stop \
-          && /tmp/ejabberd/sbin/ejabberdctl stopped
-
-    - name: View logs
-      if: always()
-      run: |
-        echo "===> Registered:"
-        cat registered.log
-        echo "===> Prod:"
-        cat _build/prod/rel/ejabberd/logs/*
-        echo "===> Dev:"
-        cat _build/dev/rel/ejabberd/logs/*
-        echo "===> Install:"
-        cat /tmp/ejabberd/var/log/ejabberd/*
-
-    - name: Check logs
+    - name: Check rel
      if: always()
      run: |
        grep -q '^user1$' registered.log
        grep -q '^user2$' registered.log
-        grep -q '^user3$' registered.log
        grep -q 'is started' _build/prod/rel/ejabberd/logs/ejabberd.log
        grep -q 'is stopped' _build/prod/rel/ejabberd/logs/ejabberd.log
-        grep -q 'Stopping Ejabberd.Module.Example' _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
-        grep -q 'Stopping Ejabberd.Module.Example' _build/dev/rel/ejabberd/logs/ejabberd.log
        test $(find _build/dev/ -empty -name error.log)
-        grep -q 'is started' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        grep -q 'is stopped' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        grep -q 'Stopping Ejabberd.Module.Example' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        test $(find /tmp/ejabberd/var/log/ejabberd/ -empty -name error.log)

    - name: View logs failures
      if: failure()
@ -428,5 +200,3 @@ jobs:
        cat _build/prod/rel/ejabberd/logs/error.log
        cat _build/dev/rel/ejabberd/logs/ejabberd.log
        cat _build/dev/rel/ejabberd/logs/error.log
-        cat /tmp/ejabberd/var/log/ejabberd/ejabberd.log
-        cat /tmp/ejabberd/var/log/ejabberd/error.log
--- a/.gitignore
+++ b/.gitignore
@ -5,10 +5,8 @@
 \#*#
 .#*
 .edts
-.tool-versions
 *.dump
 /Makefile
-/doc
 /config.log
 /config.status
 /config/releases.exs
@ -34,14 +32,12 @@
 /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
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -1,5 +0,0 @@
-{
-        "recommendations": [
-                "erlang-ls.erlang-ls"
-        ]
-}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -1,66 +0,0 @@
-{
-        "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}"
-                }
-        ]
-}
--- a/.vscode/relive.sh
+++ b/.vscode/relive.sh
@ -1,6 +0,0 @@
-[ ! -f Makefile ] \
-    && ./autogen.sh \
-    && ./configure --with-rebar=rebar3 \
-    && make
-
-make relive
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,13 +0,0 @@
-{
-    "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"}
-    }
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -22,21 +22,6 @@ 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.
@ -49,13 +34,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 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.
+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.

 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 [https://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

-[homepage]: https://www.contributor-covenant.org/
-[version]: https://www.contributor-covenant.org/version/1/4/
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
--- a/COMPILE.md
+++ b/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/install/source/
+[docs-source]: https://docs.ejabberd.im/admin/installation/#source-code


 Requirements
@ -15,20 +15,20 @@ Requirements

 To compile ejabberd you need:

- GNU Make
- GCC
- Libexpat ≥ 1.95
- Libyaml ≥ 0.1.4
- Erlang/OTP ≥ 25.0
- OpenSSL ≥ 1.0.0
+ - GNU Make
+ - GCC
+ - Libexpat ≥ 1.95
+ - Libyaml ≥ 0.1.4
+ - Erlang/OTP ≥ 19.3
+ - 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, for Elixir support. It is recommended Elixir 1.14.0 or higher
+ - 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

 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/download/ejabberd/
+[p1dl]: https://www.process-one.net/en/ejabberd/downloads/
 [ghr]: https://github.com/processone/ejabberd/releases
 [gitrepo]: https://github.com/processone/ejabberd

@ -65,11 +65,6 @@ 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
 ---------------------
@ -94,8 +89,13 @@ 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
-    make prod
+    ./configure --with-rebar=rebar3
+    make rel
+
+Or, if you have Elixir available and plan to develop Elixir code:
+
+    ./configure --with-rebar=mix
+    make dev

 Check the full list of targets:

--- a/CONTAINER.md
+++ b/CONTAINER.md
--- a/CONTRIBUTING.md
+++ b/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](#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)
+* [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
+## <a name="coc"></a> Code of Conduct

 Help us keep ejabberd community open-minded and inclusive. Please read and follow our [Code of Conduct][coc].

-## Questions, Bugs, Features
+## <a name="requests"></a> Questions, Bugs, Features

-### Got a Question or Problem?
+### <a name="question"></a> 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]

-* ejabberd XMPP room: [ejabberd@conference.process-one.net][muc]
-* [ejabberd Mailing List][list]
-
-### Found an Issue or Bug?
+### <a name="issue"></a> 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.

-### Missing a Feature?
+### <a name="feature"></a> 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](#pull-request-submission-guidelines).
+  as a Pull Request. See the section about [Pull Request Submission Guidelines](#submit-pr).

-## Issue Submission Guidelines
+## <a name="submit"></a> 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.

-## Pull Request Submission Guidelines
+## <a name="submit-pr"></a> 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,7 +80,6 @@ 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].
@ -89,7 +88,6 @@ 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:
@ -125,25 +123,28 @@ restarted.

 That's it! Thank you for your contribution!

-## Signing the Contributor License Agreement (CLA)
+## <a name="cla"></a> 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

-Here's a link to the  [ProcessOne Contribution License Agreement][cla].
+You can read [ProcessOne Contribution License Agreement][cla] in PDF.

 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://web.archive.org/web/20230319174915/http://lists.jabber.ru/mailman/listinfo/ejabberd
+[list]: https://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://cla.process-one.net/
+[cla]: https://www.process-one.net/resources/ejabberd-cla.pdf
+[license]: https://github.com/processone/ejabberd/blob/master/COPYING
--- a/Makefile.in
+++ b/Makefile.in
@ -1,23 +1,8 @@
-#.
-#' definitions
-#
-
-ESCRIPT = @ESCRIPT@
-REBAR = @rebar@ # rebar|rebar3|mix binary (or path to binary)
-REBAR3 = @REBAR3@ # path to rebar3 binary
+REBAR = @ESCRIPT@ @rebar@
 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@
@ -86,10 +71,7 @@ SPOOLDIR = @localstatedir@/lib/ejabberd
 # /var/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=
@ -104,22 +86,18 @@ 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

-#.
-#' rebar / rebar3 / mix
-#
-
-ifeq "$(notdir $(MIX))" "mix"
+ifeq "$(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"
@ -134,26 +112,11 @@ ifeq "$(REBAR_VER)" "6"
  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
-  REL_LIB_DIR = _build/dev/rel/ejabberd/lib
-  COPY_REL_TARGET = dev
-  GET_DEPS_TRANSLATIONS=MIX_ENV=translations $(REBAR) $(GET_DEPS)
-  DEPSDIR_TRANSLATIONS=deps
+  RELIVECMD=escript rel/relive.escript && MIX_ENV=dev RELIVE=true iex --name ejabberd@localhost -S mix run
 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
@ -171,12 +134,8 @@ endif
  XREFOPTIONS=
  CLEANARG=--all
  REBARREL=$(REBAR) as prod tar
-  REBARDEV=$(REBAR) as dev release
-  RELIVECMD=$(REBAR) as dev relive
-  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
+  REBARDEV=REBAR_PROFILE=dev $(REBAR) release
+  RELIVECMD=$(REBAR) relive
 else
  SKIPDEPS=skip_deps=true
  LISTDEPS=-q list-deps
@ -192,16 +151,10 @@ else
  REBARREL=$(REBAR) generate
  REBARDEV=
  RELIVECMD=@echo "Rebar2 detected... relive not supported.\
-	 \nTry: ./configure --with-rebar=rebar3 ; make relive"
-  REL_LIB_DIR = rel/ejabberd/lib
-  COPY_REL_TARGET = rel
+	 \nTry: ./configure --with-rebar=./rebar3 ; make relive"
 endif
 endif

-#.
-#' main targets
-#
-
 all: scripts deps src

 deps: $(DEPSDIR)/.got
@ -209,7 +162,7 @@ deps: $(DEPSDIR)/.got
 $(DEPSDIR)/.got:
 	rm -rf $(DEPSDIR)/.got
 	rm -rf $(DEPSDIR)/.built
-	$(MKDIR_P) $(DEPSDIR)
+	mkdir -p $(DEPSDIR)
 	$(REBAR) $(GET_DEPS) && :> $(DEPSDIR)/.got
 	$(CONFIGURE_DEPS)

@ -218,7 +171,6 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got

 src: $(DEPSDIR)/.built
 	$(REBAR) $(SKIPDEPS) compile
-	$(EXPLICIT_ELIXIR_COMPILE)

 update:
 	rm -rf $(DEPSDIR)/.got
@ -236,45 +188,11 @@ options: all
 	tools/opt_types.sh ejabberd_option $(EBINDIR)

 translations:
-	$(GET_DEPS_TRANSLATIONS)
-	tools/prepare-tr.sh $(DEPSDIR_TRANSLATIONS)
+	tools/prepare-tr.sh $(DEPSDIR)

-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
-#
+edoc:
+	$(ERL) -noinput +B -eval \
+        'case edoc:application(ejabberd, ".", []) of ok -> halt(0); error -> halt(1) end.'

 JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(1))/$(call JOIN_PATHS,$(wordlist 2,1000,$(1))),$(1))

@ -361,58 +279,26 @@ 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)

 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

-#.
-#' scripts
-#
-
 ejabberdctl.relive:
-	$(SED)  -e "s*{{installuser}}*${INSTALLUSER}*g" \
+	$(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}}*${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 \
+		-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

 ejabberd.init:
@ -428,29 +314,19 @@ ejabberd.service:
 	chmod 644 ejabberd.service

 ejabberdctl.example: vars.config
-	$(SED)  -e "s*{{installuser}}*${INSTALLUSER}*g" \
+	$(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 \
+		-e "s*{{bindir}}*@bindir@*g" \
+		-e "s*{{libdir}}*@libdir@*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:
+install: copy-files
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR)
@ -473,12 +349,12 @@ install-main:
 	#
 	# Spool directory
 	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(SPOOLDIR)
-	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
+	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
 	chmod -R 750 $(DESTDIR)$(SPOOLDIR)
 	#
 	# Log directory
 	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(LOGDIR)
-	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
+	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
 	chmod -R 750 $(DESTDIR)$(LOGDIR)
 	#
 	# Documentation
@ -489,14 +365,8 @@ install-main:
 		|| echo "Man page not included in sources"
 	$(INSTALL) -m 644 COPYING $(DESTDIR)$(DOCDIR)

-#.
-#' uninstall
-#
-
 uninstall: uninstall-binary

-uninstall-rel: uninstall-binary uninstall-librel
-
 uninstall-binary:
 	rm -f  $(DESTDIR)$(SBINDIR)/ejabberdctl
 	rm -f  $(DESTDIR)$(BINDIR)/iex
@ -525,7 +395,6 @@ uninstall-binary:
 	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 $(DESTDIR)$(ETCDIR)
@ -533,10 +402,6 @@ uninstall-all: uninstall-binary
 	rm -rf $(DESTDIR)$(SPOOLDIR)
 	rm -rf $(DESTDIR)$(LOGDIR)

-#.
-#' clean
-#
-
 clean:
 	rm -rf $(DEPSDIR)/.got
 	rm -rf $(DEPSDIR)/.built
@ -559,53 +424,27 @@ distclean: clean clean-rel
 	rm -f Makefile
 	rm -f vars.config

-#.
-#' releases
-#
-
-rel: prod
-
-prod:
-	$(PREPARE_ELIXIR_SCRIPTS)
+rel:
 	$(REBARREL)

 DEV_CONFIG = _build/dev/rel/ejabberd/conf/ejabberd.yml

 dev $(DEV_CONFIG):
-	$(PREPARE_ELIXIR_SCRIPTS)
 	$(REBARDEV)

-#.
-#' tags
-#
-
 TAGS:
-	etags src/*.erl
-
-#.
-#' makefile
-#
+	etags *.erl

 Makefile: Makefile.in

-#.
-#' dialyzer
-#
-
-ifeq "$(REBAR_VER)" "6" # Mix
-dialyzer:
-	MIX_ENV=test $(REBAR) dialyzer
-
-else
-ifeq "$(REBAR_VER)" "3" # Rebar3
+ifeq "$(REBAR_VER)" "3"
 dialyzer:
 	$(REBAR) dialyzer
-
-else # Rebar2
+else
 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 \
@ -613,13 +452,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
@ -641,18 +480,6 @@ 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 ***************************************"
@ -661,32 +488,9 @@ test:
 	@cd priv && ln -sf ../sql
 	$(REBAR) $(SKIPDEPS) ct

-.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
-
-test-eunit:
-	$(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 test-eunit \
-	all dev doap help install-rel relive scripts uninstall-rel update \
-	erlang_plt deps_plt ejabberd_plt xref hooks options format indent
-
-#.
-#' help
-#
+.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

 help:
 	@echo ""
@ -694,37 +498,24 @@ help:
 	@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 "  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 "  prod           Build a production release"
+	@echo "  rel            Build a production release"
 	@echo "  dev            Build a development release"
 	@echo "  relive         Start a live ejabberd in _build/relive/"
 	@echo ""
-	@echo "  doap           Generate DOAP file"
-	@echo "  edoc           Generate EDoc documentation [mix]"
+	@echo "  edoc           Generate edoc documentation (unused)"
 	@echo "  options        Generate ejabberd_option.erl"
-	@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 "  translations   Extract translation files (requires --enable-tools)"
+	@echo "  tags           Generate tags file for text editors"
 	@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 [rebar3]"
-	@echo "  test-eunit     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:
+	@echo "  test           Run Common Tests suite"
+	@echo "  xref           Run cross reference analysis"
--- a/README.md
+++ b/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">
+    <img src="https://www.process-one.net/wp-content/uploads/2022/05/ejabberd-logo-rounded-index.png"
+        height="216">
 </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" /></a>
+       <img src="https://coveralls.io/repos/github/processone/ejabberd/badge.svg?branch=master "Coverage in coveralls.io"" /></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>
-    <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>
+       <img src="https://hosted.weblate.org/widgets/ejabberd/-/ejabberd-po/svg-badge.svg"" /></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 the list of [supported protocols in ProcessOne][xeps]
-and [XMPP.org][xmppej].
+[ejabberd at ProcessOne][p1home], and a list of [supported protocols and XEPs][xeps].
+

 Installation
 ------------
@ -38,16 +38,12 @@ Installation
 There are several ways to install ejabberd:

 - Source code: compile yourself, see [COMPILE](COMPILE.md)
- 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`)
+- 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)
 - 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
 -------------
@ -64,6 +60,7 @@ Once ejabberd is installed, try:
    ejabberdctl help
    man ejabberd.yml

+
 Development
 -----------

@ -75,37 +72,31 @@ 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: [ejabberd@conference.process-one.net][muc]
+- [ejabberd XMPP chatroom][muc]: ejabberd@conference.process-one.net
+- [Mailing list][list]
 - [GitHub Discussions][discussions]
 - [Stack Overflow][stackoverflow]

+
 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__.
+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.
+

 [discussions]: https://github.com/processone/ejabberd/discussions
 [docker-ecs-readme]: https://github.com/processone/docker-ejabberd/tree/master/ecs#readme
@ -114,23 +105,22 @@ License
 [erlang]: https://www.erlang.org/
 [features]: https://docs.ejabberd.im/admin/introduction/
 [fluux]: https://fluux.io/
-[homebrew]: https://docs.ejabberd.im/admin/install/homebrew/
+[github]: https://github.com/processone/ejabberd
+[homebrew]: https://docs.ejabberd.im/admin/installation/#homebrew
 [hubecs]: https://hub.docker.com/r/ejabberd/ecs/
-[im]: https://www.ejabberd.im/
+[im]: https://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/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/
+[osp]: https://docs.ejabberd.im/admin/installation/#operating-system-packages
+[p1contact]: https://www.process-one.net/en/company/contact/
+[p1home]: https://www.process-one.net/en/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/ejabberd-features/
+[xeps]: https://www.process-one.net/en/ejabberd/protocols/
 [xmpp]: https://xmpp.org/
-[xmppej]: https://xmpp.org/software/servers/ejabberd/
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,45 +0,0 @@
-# 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!
--- a/config/runtime.exs
+++ b/config/runtime.exs
@ -8,8 +8,6 @@ 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/")
-config :exsync,
-  reload_callback: {:ejabberd_admin, :update, []}
+  dir: Path.join(rootpath, 'database/')
--- a/configure.ac
+++ b/configure.ac
@ -2,26 +2,15 @@
 # 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 25.08` | 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)"])
-
+AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 22.10` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
+REQUIRE_ERLANG_MIN="8.3 (Erlang/OTP 19.3)"
 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
@ -39,42 +28,18 @@ fi
 ])

 AC_ARG_WITH(rebar,
-	AS_HELP_STRING([--with-rebar=bin],[use as build tool the rebar/rebar3/mix binary specified]),
+	AS_HELP_STRING([--with-rebar=bin],[use the rebar/rebar3/mix binary specified]),
 [if test "$withval" = "yes" -o "$withval" = "no" -o "X$with_rebar" = "X"; then
-    rebar="rebar3"
+    rebar="rebar"
 else
    rebar="$with_rebar"
 fi
-], [rebar="unconfigured"])
+], [rebar="rebar"])

 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

@ -119,7 +84,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 in Rebar3 (default: no)])],
+[AS_HELP_STRING([--enable-elixir],[enable Elixir support (default: no)])],
 [case "${enableval}" in
  yes) elixir=true ;;
  no)  elixir=false ;;
@ -147,7 +112,7 @@ esac],[full_xml=false])

 ENABLEGROUP=""
 AC_ARG_ENABLE(group,
-  [AS_HELP_STRING([--enable-group[[=GROUP]]], [specify the group of the account defined in --enable-user (default: no)])],
+  [AS_HELP_STRING([--enable-group[[[[=GROUP]]]]], [allow this system group to start ejabberd (default: no)])],
  [case "${enableval}" in
     yes) ENABLEGROUP=`groups |head -n 1` ;;
     no) ENABLEGROUP="" ;;
@ -272,7 +237,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],[include debugging/development tools (default: no)])],
+[AS_HELP_STRING([--enable-tools],[build development tools (default: no)])],
 [case "${enableval}" in
  yes) tools=true ;;
  no)  tools=false ;;
@ -281,7 +246,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="" ;;
@ -315,8 +280,6 @@ 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(full_xml)
@ -342,28 +305,3 @@ 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" -lt "21"], [deps="luerl,$deps"])
-  AS_IF([test "$ERLANG_VERSION" -lt "22"], [deps="lager,$deps"])
-  AS_IF([test "$ERLANG_VERSION" -le "23"], [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"])
- ])
--- a/ejabberd.doap
+++ b/ejabberd.doap
@ -1,849 +0,0 @@
-<?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.9</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.2</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.6</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.4</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.25</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.2</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.2</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</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</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.5</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</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.0</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</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.0</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</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</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</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.1</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.2</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</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</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>0.7</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.0</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.xx</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>0.2</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.2</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.5.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-0384.html"/>
-        <xmpp:version>0.8.3</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>0.4.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-0398.html"/>
-        <xmpp:version>0.2.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-0402.html"/>
-        <xmpp:version>1.1.3</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>0.2.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>0.1.0</xmpp:version>
-        <xmpp:since>23.10</xmpp:since>
-        <xmpp:status>complete</xmpp:status>
-        <xmpp:note>mod_muc_occupantid</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>0.4.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-0474.html"/>
-        <xmpp:version>0.4.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>0.1.1</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>
--- a/ejabberd.service.template
+++ b/ejabberd.service.template
@ -9,6 +9,7 @@ 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
--- a/ejabberd.yml.example
+++ b/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
-    tls: true
+    starttls_required: 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: 5478
+    port: 3478
    ip: "::"
    transport: udp
    module: ejabberd_stun
@ -111,19 +111,11 @@ access_rules:

 api_permissions:
  "console commands":
-    from: ejabberd_ctl
+    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
+  "admin access":
    who:
      access:
        allow:
@ -164,7 +156,6 @@ shaper_rules:

 modules:
  mod_adhoc: {}
-  mod_adhoc_api: {}
  mod_admin_extra: {}
  mod_announce:
    access: announce
@ -179,7 +170,7 @@ modules:
  mod_fail2ban: {}
  mod_http_api: {}
  mod_http_upload:
-    put_url: https://@HOST_URL_ENCODE@:5443/upload
+    put_url: https://@HOST@:5443/upload
    custom_headers:
      "Access-Control-Allow-Origin": "https://@HOST@"
      "Access-Control-Allow-Methods": "GET,HEAD,PUT,OPTIONS"
@ -205,7 +196,6 @@ modules:
    default_room_options:
      mam: true
  mod_muc_admin: {}
-  mod_muc_occupantid: {}
  mod_offline:
    access_max_user_messages: max_user_offline_messages
  mod_ping: {}
@ -234,7 +224,6 @@ modules:
    ip_access: trusted_network
  mod_roster:
    versioning: true
-  mod_s2s_bidi: {}
  mod_s2s_dialback: {}
  mod_shared_roster: {}
  mod_stream_mgmt:
--- a/ejabberdctl.cfg.example
+++ b/ejabberdctl.cfg.example
@ -108,11 +108,10 @@
 #.
 #' ERL_OPTIONS: Additional Erlang options
 #
-# 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.
+# 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.
 #
 # It might be useful to add "-pa /usr/local/lib/ejabberd/ebin" if you
 # want to add local modules in this path.
@ -121,20 +120,6 @@
 #
 #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
 #
@ -198,17 +183,6 @@
 #
 #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:
--- a/ejabberdctl.template
+++ b/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
@ -66,26 +66,18 @@ 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" $ERLANG_OPTS -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" -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
@ -97,12 +89,11 @@ 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="\
-$(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"
+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")\
+$(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")"
 [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS"
 EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd"

@ -130,7 +121,7 @@ set_dist_client()
 exec_cmd()
 {
    case $EXEC_CMD in
-        as_install_user) su -s /bin/sh -c 'exec "$0" "$@"' "$INSTALLUSER" -- "$@" ;;
+        as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
        as_current_user) "$@" ;;
    esac
 }
@ -158,11 +149,9 @@ debugwarning()
        echo "Please be extremely cautious with your actions,"
        echo "and exit immediately if you are not completely sure."
        echo ""
-        echo "To exit and detach this shell from ejabberd, press:"
-        echo "  control+g and then q"
+        echo "To detach this shell from ejabberd, press:"
+        echo "  control+c, control+c"
        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"
@ -183,10 +172,8 @@ livewarning()
        echo "Please be extremely cautious with your actions,"
        echo "and exit immediately if you are not completely sure."
        echo ""
-        echo "To stop ejabberd gracefully:"
-        echo "  ejabberd:stop()."
-        echo "To quit erlang immediately, press:"
-        echo "  control+g and then q"
+        echo "To exit this LIVE mode and stop ejabberd, press:"
+        echo "  q().  and press the Enter key"
        echo ""
        echo "--------------------------------------------------------------------"
        echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
@ -197,39 +184,6 @@ 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 ""
@ -258,34 +212,16 @@ help()
 }

 # dynamic node name helper
-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
+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}"
 }

 # stop epmd if there is no other running node
@ -318,13 +254,6 @@ 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"
@ -335,71 +264,14 @@ wait_status_node()
        if [ $timeout -eq 0 ] ; then
            status="$1"
        else
-            exec_erl "$(uid ctl)" -hidden -noinput \
-                     -eval 'net_kernel:connect_node('"'$CONNECT_NODE'"')' \
-                     -s ejabberd_ctl \
-                     -extra "$CONNECT_NODE" $NO_TIMEOUT status > /dev/null
+            exec_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+                     -extra "$ERLANG_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" || {
@ -407,103 +279,6 @@ 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)
@ -530,31 +305,25 @@ case $1 in
        ;;
    etop)
        set_dist_client
-        exec_erl "$(uid top)" -hidden -remsh "$ERLANG_NODE" -s etop \
-                 -output text
-        check_etop_result
+        exec_erl "$(uid top)" -hidden -node "$ERLANG_NODE" -s etop \
+                 -s erlang halt -output text
        ;;
    iexdebug)
        debugwarning
        set_dist_client
        exec_iex "$(uid debug)" --remsh "$ERLANG_NODE"
-        check_iex_result
        ;;
    iexlive)
        livewarning
-        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS"
-        check_iex_result
+        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS" --app ejabberd
        ;;
    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 '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
+                 -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
+                 -s erlang halt -output text
        ;;
    started)
        set_dist_client
@ -564,11 +333,15 @@ case $1 in
        set_dist_client
        wait_status 3 30 2 && stop_epmd # wait 30x2s before timeout
        ;;
-    mnesia_change)
-        mnesia_change $2
-        ;;
    *)
        set_dist_client
-        exec_other_command "$@"
+        exec_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+                 -extra "$ERLANG_NODE" $NO_TIMEOUT "$@"
+        result=$?
+        case $result in
+            2|3) help;;
+            *) :;;
+        esac
+        exit $result
        ;;
 esac
--- a/elvis.config
+++ b/elvis.config
@ -1,59 +0,0 @@
-[
- {
-  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:
--- a/erlang_ls.config
+++ b/erlang_ls.config
@ -1,32 +0,0 @@
-#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: DEPRECATED_GET_STACKTRACE
-  - name: HAVE_ERL_ERROR
-  - name: HAVE_URI_STRING
-  - 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
--- a/examples/extauth/check_pass_null.pl
+++ b/examples/extauth/check_pass_null.pl
@ -0,0 +1,66 @@
+#!/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;
--- a/examples/mtr/ejabberd
+++ b/examples/mtr/ejabberd
@ -0,0 +1,75 @@
+#!/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
--- a/examples/mtr/ejabberd-netbsd.sh
+++ b/examples/mtr/ejabberd-netbsd.sh
@ -0,0 +1,81 @@
+#!/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'
--- a/examples/mtr/ejabberd.cfg
+++ b/examples/mtr/ejabberd.cfg
@ -0,0 +1,65 @@
+% 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:
--- a/include/bosh.hrl
+++ b/include/bosh.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/ejabberd_auth.hrl
+++ b/include/ejabberd_auth.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -18,5 +18,5 @@
 %%%
 %%%----------------------------------------------------------------------

-record(passwd, {us = {<<"">>, <<"">>} :: {binary(), binary()} | {binary(), binary(), atom()} | '$1',
+-record(passwd, {us = {<<"">>, <<"">>} :: {binary(), binary()} | '$1',
                 password = <<"">> :: binary() | scram() | '_'}).
--- a/include/ejabberd_commands.hrl
+++ b/include/ejabberd_commands.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -19,30 +19,13 @@
 %%%----------------------------------------------------------------------

 -type aterm() :: {atom(), atype()}.
-type atype() :: integer | string | binary | any | atom |
+-type atype() :: integer | string | binary |
                 {tuple, [aterm()]} | {list, aterm()}.
 -type rterm() :: {atom(), rtype()}.
-type rtype() :: integer | string | atom | any |
+-type rtype() :: integer | string | atom |
                 {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.
-
-%% 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:
@ -84,24 +67,42 @@
         args_example = none     :: none | [any()] | '_',
         result_example = none   :: any()}).

-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()
-                                               }.
+%% 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(),
+%%    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.
--- a/include/ejabberd_ctl.hrl
+++ b/include/ejabberd_ctl.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/ejabberd_http.hrl
+++ b/include/ejabberd_http.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/ejabberd_oauth.hrl
+++ b/include/ejabberd_oauth.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/ejabberd_sm.hrl
+++ b/include/ejabberd_sm.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/ejabberd_sql.hrl
+++ b/include/ejabberd_sql.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -34,14 +34,12 @@
 		    format_query :: fun(),
 		    format_res :: fun(),
 		    args :: fun(),
-		    flags :: non_neg_integer(),
 		    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.

@ -50,26 +48,3 @@
 		     boolean :: fun((boolean()) -> binary()),
 		     in_array_string :: fun((binary()) -> binary()),
 		     like_escape :: fun(() -> binary())}).
-
-
-record(sql_index, {columns,
-                    unique = false :: boolean(),
-                    meta = #{}}).
-record(sql_column, {name :: binary(),
-                     type,
-                     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(),
-         new_schema = true :: boolean()}).
--- a/include/ejabberd_sql_pt.hrl
+++ b/include/ejabberd_sql_pt.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/ejabberd_stacktrace.hrl
+++ b/include/ejabberd_stacktrace.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -18,19 +18,10 @@
 %%%
 %%%----------------------------------------------------------------------

-define(MODULE_ANTISPAM, mod_antispam).
-
-type url() :: binary().
-type filename() :: binary() | none | false.
-type jid_set() :: sets:set(ljid()).
-type url_set() :: sets:set(url()).
-
-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{}.
+-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.
--- a/include/ejabberd_web_admin.hrl
+++ b/include/ejabberd_web_admin.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -62,11 +62,6 @@
 	    [{<<"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)))).

@ -100,27 +95,16 @@
 -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/", Ref/binary>>},
+		   [{<<"href">>, <<"https://docs.ejabberd.im/admin/configuration/", Ref/binary>>},
 		    {<<"target">>, <<"_blank">>}],
 		   [?C(<<"docs: ", Title/binary>>)])])).

 %% h1 with a Guide Link
-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("¶"))])])).
+-define(H1GL(Name, Ref, Title),
+	[?XC(<<"h1">>, Name), ?GL(Ref, Title)]).
--- a/include/eldap.hrl
+++ b/include/eldap.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/http_bind.hrl
+++ b/include/http_bind.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/logger.hrl
+++ b/include/logger.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -39,46 +39,20 @@
 -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,
-                        #{clevel => ?CLEAD ++ ?CDEBUG,
-                          ctext => ?CMID ++ ?CDEBUG}),
-              ok end).
+	begin ?LOG_DEBUG(Format, Args), ok end).

 -define(INFO_MSG(Format, Args),
-	begin ?LOG_INFO(Format, Args,
-                        #{clevel => ?CLEAD ++ ?CINFO,
-                          ctext => ?CCLEAN}),
-              ok end).
+	begin ?LOG_INFO(Format, Args), ok end).

 -define(WARNING_MSG(Format, Args),
-	begin ?LOG_WARNING(Format, Args,
-                        #{clevel => ?CLEAD ++ ?CWARNING,
-                          ctext => ?CMID ++ ?CWARNING}),
-              ok end).
+	begin ?LOG_WARNING(Format, Args), ok end).

 -define(ERROR_MSG(Format, Args),
-	begin ?LOG_ERROR(Format, Args,
-                        #{clevel => ?CLEAD ++ ?CERROR,
-                          ctext => ?CMID ++ ?CERROR}),
-              ok end).
+	begin ?LOG_ERROR(Format, Args), ok end).

 -define(CRITICAL_MSG(Format, Args),
-	begin ?LOG_CRITICAL(Format, Args,
-                        #{clevel => ?CLEAD++ ?CCRITICAL,
-                          ctext => ?CMID ++ ?CCRITICAL}),
-              ok end).
+	begin ?LOG_CRITICAL(Format, Args), ok end).
 -endif.

 %% Use only when trying to troubleshoot test problem with ExUnit
--- a/include/mod_announce.hrl
+++ b/include/mod_announce.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_caps.hrl
+++ b/include/mod_caps.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_last.hrl
+++ b/include/mod_last.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_mam.hrl
+++ b/include/mod_mam.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -26,8 +26,7 @@
 	 bare_peer = {<<"">>, <<"">>, <<"">>} :: ljid(),
 	 packet = #xmlel{}                    :: xmlel() | message(),
 	 nick = <<"">>                        :: binary(),
-	 type = chat                          :: chat | groupchat,
-         origin_id = <<"">>                   :: binary()}).
+	 type = chat                          :: chat | groupchat}).

 -record(archive_prefs,
 	{us = {<<"">>, <<"">>} :: {binary(), binary()},
--- a/include/mod_matrix_gw.hrl
+++ b/include/mod_matrix_gw.hrl
@ -1,36 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2025   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(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()
-        }).
--- a/include/mod_muc.hrl
+++ b/include/mod_muc.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_muc_room.hrl
+++ b/include/mod_muc_room.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
@ -38,13 +38,13 @@
    description                          = <<"">> :: binary(),
    allow_change_subj                    = true :: boolean(),
    allow_query_users                    = true :: boolean(),
-    allowpm                              = anyone :: anyone | participants | moderators | none,
+    allow_private_messages               = true :: boolean(),
    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() | {destroying, boolean()},
+    persistent                           = false :: boolean(),
    moderated                            = true :: boolean(),
    captcha_protected                    = false :: boolean(),
    members_by_default                   = true :: boolean(),
@ -125,9 +125,8 @@
    roles                   = #{} :: roles(),
    history                 = #lqueue{} :: lqueue(),
    subject                 = [] :: [text()],
-    subject_author          = {<<"">>, #jid{}} :: {binary(), jid()},
-    hats_defs               = #{} :: #{binary() => {binary(), binary()}},
-    hats_users              = #{} :: #{ljid() => [binary()]},
+    subject_author          = <<"">> :: binary(),
+    hats_users              = #{} :: map(), % FIXME on OTP 21+: #{ljid() => #{binary() => binary()}},
    just_created            = erlang:system_time(microsecond) :: true | integer(),
    activity                = treap:empty() :: treap:treap(),
    room_shaper             = none :: ejabberd_shaper:shaper(),
--- a/include/mod_offline.hrl
+++ b/include/mod_offline.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_privacy.hrl
+++ b/include/mod_privacy.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_private.hrl
+++ b/include/mod_private.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_proxy65.hrl
+++ b/include/mod_proxy65.hrl
@ -2,7 +2,7 @@
 %%% RFC 1928 constants.
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_push.hrl
+++ b/include/mod_push.hrl
@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% ejabberd, Copyright (C) 2017-2025 ProcessOne
+%%% ejabberd, Copyright (C) 2017-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
--- a/include/mod_roster.hrl
+++ b/include/mod_roster.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_shared_roster.hrl
+++ b/include/mod_shared_roster.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mod_vcard.hrl
+++ b/include/mod_vcard.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/include/mqtt.hrl
+++ b/include/mqtt.hrl
@ -1,6 +1,6 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeny Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2002-2025 ProcessOne, SARL. All Rights Reserved.
+%%% @copyright (C) 2002-2022 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.
--- a/include/pubsub.hrl
+++ b/include/pubsub.hrl
@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2025   ProcessOne
+%%% 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
--- a/0
+++ b/0
--- a/lib/ejabberd/config/attr.ex
+++ b/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])
+  def validate(attr), do: validate([attr]) |> List.first

  @doc """
  Returns the type of an attribute, given its name.
--- a/lib/ejabberd/config/config.ex
+++ b/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,8 +105,11 @@ defmodule Ejabberd.Config do
    Code.eval_file(file_path) |> extract_and_store_module_name()

    # Getting start/0 config
-    [module] = Ejabberd.Config.Store.get(:module_name)
-    call_start_func_and_store_data(module)
+    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

    # Fetching git modules and install them
    get_modules_parsed_in_order()
--- a/lib/ejabberd/config/ejabberd_hook.ex
+++ b/lib/ejabberd/config/ejabberd_hook.ex
@ -13,6 +13,7 @@ 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)
--- a/lib/ejabberd/config/ejabberd_module.ex
+++ b/lib/ejabberd/config/ejabberd_module.ex
@ -7,14 +7,13 @@ defmodule Ejabberd.Config.EjabberdModule do
  the already existing Elixir.Module.
  """

-  alias Ejabberd.Config.EjabberdModule
-  alias Ejabberd.Config.Validation
-  alias Ejabberd.Config.Attr
-
-  @type t :: %{module: atom, attrs: [Attr.attr]}
+  @type t :: %{module: atom, attrs: [Attr.t]}

  defstruct [:module, :attrs]

+  alias Ejabberd.Config.EjabberdModule
+  alias Ejabberd.Config.Validation
+
  @doc """
  Given a list of modules / single module
  it runs different validators on them.
@ -30,6 +29,7 @@ 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(~c"git clone #{repo} #{path}")
+      :os.cmd('git clone #{repo} #{path}')
    end
  end

--- a/lib/ejabberd/config/logger/ejabberd_logger.ex
+++ b/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."
--- a/lib/ejabberd/config/opts_formatter.ex
+++ b/lib/ejabberd/config/opts_formatter.ex
@ -14,12 +14,15 @@ defmodule Ejabberd.Config.OptsFormatter do
  Look at how Config.get_ejabberd_opts/0 is constructed for
  more informations.
  """
-  @spec format_opts_for_ejabberd(map) :: list()
+  @spec format_opts_for_ejabberd([{atom(), any()}]) :: 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)}

@ -29,9 +32,6 @@ 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]}
--- a/lib/ejabberd/config/validator/validation.ex
+++ b/lib/ejabberd/config/validator/validation.ex
@ -3,12 +3,12 @@ defmodule Ejabberd.Config.Validation do
  Module used to validate a list of modules.
  """

-  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}

+  alias Ejabberd.Config.EjabberdModule
+  alias Ejabberd.Config.Validator
+
  @doc """
  Given a module or a list of modules it runs validators on them
  and returns {:ok, mod} or {:error, mod, errors}, for each
--- a/lib/ejabberd/config/validator/validator_attrs.ex
+++ b/lib/ejabberd/config/validator/validator_attrs.ex
@ -3,13 +3,12 @@ defmodule Ejabberd.Config.Validator.Attrs do
  Validator module used to validate attributes.
  """

-  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}

+  import Ejabberd.Config.ValidatorUtility
+  alias Ejabberd.Config.Attr
+
  @doc """
  Given a module (with the form used for validation)
  it runs Attr.validate/1 on each attribute and
@ -18,9 +17,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

--- a/lib/ejabberd/config/validator/validator_dependencies.ex
+++ b/lib/ejabberd/config/validator/validator_dependencies.ex
@ -4,8 +4,6 @@ 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
--- a/lib/ejabberd/config/validator/validator_utility.ex
+++ b/lib/ejabberd/config/validator/validator_utility.ex
@ -4,6 +4,8 @@ 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
@ -20,6 +22,7 @@ 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))
--- a/lib/ejabberd/config_util.ex
+++ b/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(binary) :: boolean
+  @spec is_elixir_config(list) :: boolean
  def is_elixir_config(filename) when is_list(filename) do
    is_elixir_config(to_string(filename))
  end
--- a/lib/ejabberd/module.ex
+++ b/lib/ejabberd/module.ex
@ -0,0 +1,19 @@
+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
--- a/lib/ejabberd_auth_example.ex
+++ b/lib/ejabberd_auth_example.ex
@ -1,44 +0,0 @@
-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
--- a/lib/mix/tasks/deps.tree.ex
+++ b/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
--- a/lib/mod_example.ex
+++ b/lib/mod_example.ex
@ -1,46 +0,0 @@
-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
--- a/lib/mod_presence_demo.ex
+++ b/lib/mod_presence_demo.ex
@ -0,0 +1,33 @@
+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
--- a/m4/erlang-extra.m4
+++ b/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])
--- a/man/ejabberd.yml.5
+++ b/man/ejabberd.yml.5
--- a/mix.exs
+++ b/mix.exs
@ -3,34 +3,31 @@ defmodule Ejabberd.MixProject do

  def project do
    [app: :ejabberd,
-     source_url: "https://github.com/processone/ejabberd",
     version: version(),
     description: description(),
     elixir: elixir_required_version(),
     elixirc_paths: ["lib"],
     compile_path: ".",
-     compilers: [:asn1, :yecc] ++ Mix.compilers(),
+     compilers: [:asn1] ++ 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
-      ~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'
+      '0.0' -> "0.0.0" # the full git repository wasn't downloaded
+      '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}.0"
+        <<head::binary, ".0">>
      vsn -> String.replace(:erlang.list_to_binary(vsn), ~r/\.0+([0-9])/, ".\\1")
    end
  end
@ -43,24 +40,14 @@ defmodule Ejabberd.MixProject do

  def application do
    [mod: {:ejabberd_app, []},
-     extra_applications: [:inets, :kernel, :sasl, :ssl, :stdlib, :syntax_tools,
-                          :logger, :mix]
-     ++ cond_apps(),
+     extra_applications: [:mix],
+     applications: [:idna, :inets, :kernel, :sasl, :ssl, :stdlib,
+                    :base64url, :fast_tls, :fast_xml, :fast_yaml, :jiffy, :jose,
+                    :p1_utils, :stringprep, :syntax_tools, :yconf],
     included_applications: [:mnesia, :os_mon,
                             :cache_tab, :eimp, :mqtree, :p1_acme,
-                             :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],
-    ]
+                             :p1_oauth2, :pkix, :xmpp]
+     ++ cond_apps()]
  end

  defp if_version_above(ver, okResult) do
@ -81,24 +68,20 @@ defmodule Ejabberd.MixProject do

  defp erlc_options do
    # Use our own includes + includes from all dependencies
-    includes = ["include", deps_include()]
+    includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"])
    result = [{:d, :ELIXIR_ENABLED}] ++
             cond_options() ++
             Enum.map(includes, fn (path) -> {:i, path} end) ++
-             if_version_above(~c"20", [{:d, :HAVE_URI_STRING}]) ++
-             if_version_above(~c"20", [{:d, :HAVE_ERL_ERROR}]) ++
-             if_version_below(~c"21", [{:d, :USE_OLD_HTTP_URI}]) ++
-             if_version_below(~c"22", [{:d, :LAGER}]) ++
-             if_version_below(~c"21", [{:d, :NO_CUSTOMIZE_HOSTNAME_CHECK}]) ++
-             if_version_below(~c"23", [{:d, :USE_OLD_CRYPTO_HMAC}]) ++
-             if_version_below(~c"23", [{:d, :USE_OLD_PG2}]) ++
-             if_version_below(~c"24", [{:d, :COMPILER_REPORTS_ONLY_LINES}]) ++
-             if_version_below(~c"24", [{:d, :SYSTOOLS_APP_DEF_WITHOUT_OPTIONAL}]) ++
-             if_version_below(~c"24", [{:d, :OTP_BELOW_24}]) ++
-             if_version_below(~c"25", [{:d, :OTP_BELOW_25}]) ++
-             if_version_below(~c"26", [{:d, :OTP_BELOW_26}]) ++
-             if_version_below(~c"27", [{:d, :OTP_BELOW_27}]) ++
-             if_version_below(~c"28", [{:d, :OTP_BELOW_28}])
+             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}])
    defines = for {:d, value} <- result, do: {:d, value}
    result ++ [{:d, :ALL_DEFS, defines}]
  end
@ -115,27 +98,29 @@ defmodule Ejabberd.MixProject do
  end

  defp deps do
-    [{:cache_tab, "~> 1.0"},
-     {:dialyxir, "~> 1.2", only: [:test], runtime: false},
+    [{:base64url, "~> 1.0"},
+     {:cache_tab, "~> 1.0"},
     {:eimp, "~> 1.0"},
-     {:ex_doc, "~> 0.31", only: [:edoc], runtime: false},
-     {:fast_tls, "~> 1.1.24"},
-     {:fast_xml, "~> 1.1.56"},
+     {:ex_doc, ">= 0.0.0", only: :dev},
+     {:fast_tls, "~> 1.1"},
+     {:fast_xml, "~> 1.1"},
     {:fast_yaml, "~> 1.0"},
     {:idna, "~> 6.0"},
+     {:jiffy, "~> 1.1.1"},
+     {:jose, "~> 1.11.1"},
     {:mqtree, "~> 1.0"},
-     {:p1_acme, ">= 1.0.28"},
+     {:p1_acme, "~> 1.0"},
     {:p1_oauth2, "~> 0.6"},
     {:p1_utils, "~> 1.0"},
     {:pkix, "~> 1.0"},
     {:stringprep, ">= 1.0.26"},
-     {:xmpp, git: "https://github.com/processone/xmpp", ref: "e9d901ea84fd3910ad32b715853397eb1155b41c", override: true},
-     {:yconf, git: "https://github.com/processone/yconf", ref: "95692795a8a8d950ba560e5b07e6b80660557259", override: true}]
+     {:xmpp, ">= 1.6.0"},
+     {:yconf, "~> 1.0"}]
    ++ cond_deps()
  end

-  defp deps_include() do
-    if Mix.Project.umbrella?() do
+  defp deps_include(deps) do
+    base = if Mix.Project.umbrella?() do
      "../../deps"
    else
      case Mix.Project.deps_paths()[:ejabberd] do
@ -143,45 +128,28 @@ 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"}},
-                         {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(:redis), {:eredis, "~> 1.2.0"}},
                         {config(:sip), {:esip, "~> 1.0"}},
                         {config(:zlib), {:ezlib, "~> 1.0"}},
-                         {if_version_above(~c"23", true), {:jose, "~> 1.11.10"}},
-                         {if_version_below(~c"24", true), {:jose, "1.11.1", override: true}},
-                         {if_version_below(~c"27", true), {:jiffy, "~> 1.1.1"}},
-                         {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}},
-                         {config(:lua), {:luerl, "~> 1.2.0"}},
-                         {config(:mysql), {:p1_mysql, ">= 1.0.24"}},
-                         {config(:pgsql), {:p1_pgsql, ">= 1.1.32"}},
+                         {if_version_below('22', true), {:lager, "~> 3.9.1"}},
+                         {config(:lua), {:luerl, "~> 1.0"}},
+                         {config(:mysql), {:p1_mysql, "~> 1.0.20"}},
+                         {config(:pgsql), {:p1_pgsql, "~> 1.1"}},
                         {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},
-                         {Mix.env() == :edoc, :ex_doc},
-                         {Mix.env() == :test, :dialyxir},
-                         {if_version_below(~c"22", true), :lager},
+                         {if_version_below('22', true), :lager},
                         {config(:mysql), :p1_mysql},
                         {config(:sip), :esip},
                         {config(:odbc), :odbc},
@ -194,30 +162,19 @@ 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: ["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/"}]
+      links: %{"Site" => "https://www.ejabberd.im",
+               "Documentation" => "http://docs.ejabberd.im",
+               "Source" => "https://github.com/processone/ejabberd",
+               "ProcessOne" => "http://www.process-one.net/"}]
  end

  defp vars do
-    filepath = case Application.fetch_env(:ejabberd, :vars_config_path) do
-      :error ->
-        "vars.config"
-      {:ok, path} ->
-        path
-    end
-    config2 = case :file.consult(filepath) do
+    case :file.consult("vars.config") do
      {:ok,config} -> config
-      _ -> [stun: true, zlib: true]
-    end
-    case Mix.env() do
-      :dev -> List.keystore(config2, :tools, 0, {:tools, true})
-      _ -> config2
+      _ -> [zlib: true]
    end
  end

@ -246,7 +203,7 @@ defmodule Ejabberd.MixProject do
          _ -> :ok
        end
        case Version.match?(System.version(), "< 1.11.4")
-          and :erlang.system_info(:otp_release) > ~c"23" do
+          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
@ -266,7 +223,6 @@ 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]
      ]
    ]
@ -283,8 +239,6 @@ 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()]),
@ -299,14 +253,14 @@ defmodule Ejabberd.MixProject do
    execute = fn(command) ->
      case function_exported?(System, :shell, 1) do
        true ->
-          System.shell(command, into: IO.stream())
+          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
+    case Version.match?(System.version, "~> 1.11") do
      true ->
        :ok
      false ->
@ -317,7 +271,8 @@ defmodule Ejabberd.MixProject do
    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.example4")
+    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|^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)
@ -365,38 +320,13 @@ defmodule Ejabberd.MixProject do
    end

    case Mix.env() do
-      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh mix")
+      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh")
      _ -> :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"],
-        "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
@ -409,7 +339,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)
@ -431,7 +361,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
--- a/mix.lock
+++ b/mix.lock
@ -1,39 +1,35 @@
 %{
  "base64url": {:hex, :base64url, "1.0.1", "f8c7f2da04ca9a5d0f5f50258f055e1d699f0e8bf4cfdb30b750865368403cf6", [:rebar3], [], "hexpm", "f9b3add4731a02a9b0410398b475b33e7566a695365237a6bdee1bb447719f5c"},
-  "cache_tab": {:hex, :cache_tab, "1.0.33", "e2542afb34f17ee3ca19d2b0f546a074922c2b99fb6b2acfb38160d7d0336ec3", [:rebar3], [{:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "4258009eb050b22aabe0c848e230bba58401a6895c58c2ff74dfb635e3c35900"},
-  "dialyxir": {:hex, :dialyxir, "1.4.6", "7cca478334bf8307e968664343cbdb432ee95b4b68a9cba95bdabb0ad5bdfd9a", [:mix], [{:erlex, ">= 0.2.7", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "8cf5615c5cd4c2da6c501faae642839c8405b49f8aa057ad4ae401cb808ef64d"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
-  "eimp": {:hex, :eimp, "1.0.26", "c0b05f32e35629c4d9bcfb832ff879a92b0f92b19844bc7835e0a45635f2899a", [:rebar3], [{:p1_utils, "~> 1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "d96d4e8572b9dfc40f271e47f0cb1d8849373bc98a21223268781765ed52044c"},
-  "epam": {:hex, :epam, "1.0.14", "aa0b85d27f4ef3a756ae995179df952a0721237e83c6b79d644347b75016681a", [:rebar3], [], "hexpm", "2f3449e72885a72a6c2a843f561add0fc2f70d7a21f61456930a547473d4d989"},
-  "eredis": {:hex, :eredis, "1.7.1", "39e31aa02adcd651c657f39aafd4d31a9b2f63c6c700dc9cece98d4bc3c897ab", [:mix, :rebar3], [], "hexpm", "7c2b54c566fed55feef3341ca79b0100a6348fd3f162184b7ed5118d258c3cc1"},
-  "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"},
-  "esip": {:hex, :esip, "1.0.59", "eb202f8c62928193588091dfedbc545fe3274c34ecd209961f86dcb6c9ebce88", [:rebar3], [{:fast_tls, "1.1.25", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.2.21", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm", "0bdf2e3c349dc0b144f173150329e675c6a51ac473d7a0b2e362245faad3fbe6"},
-  "ex_doc": {:hex, :ex_doc, "0.38.3", "ddafe36b8e9fe101c093620879f6604f6254861a95133022101c08e75e6c759a", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "ecaa785456a67f63b4e7d7f200e8832fa108279e7eb73fd9928e7e66215a01f9"},
-  "exsync": {:hex, :exsync, "0.4.1", "0a14fe4bfcb80a509d8a0856be3dd070fffe619b9ba90fec13c58b316c176594", [:mix], [{:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm", "cefb22aa805ec97ffc5b75a4e1dc54bcaf781e8b32564bf74abbe5803d1b5178"},
-  "ezlib": {:hex, :ezlib, "1.0.15", "d74f5df191784744726a5b1ae9062522c606334f11086363385eb3b772d91357", [:rebar3], [{:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "dd14ba6c12521af5cfe6923e73e3d545f4a0897dc66bfab5287fbb7ae3962eab"},
-  "fast_tls": {:hex, :fast_tls, "1.1.25", "da8ed6f05a2452121b087158b17234749f36704c1f2b74dc51db99a1e27ed5e8", [:rebar3], [{:p1_utils, "~> 1.0.26", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "59e183b5740e670e02b8aa6be673b5e7779e5fe5bfcc679fe2d4993d1949a821"},
-  "fast_xml": {:hex, :fast_xml, "1.1.57", "31efc0f9bceda92069704f7a25830407da5dc3dad1272b810d6f2e13e73cc11a", [:rebar3], [{:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "eec34e90adacafe467d5ddab635a014ded73b98b4061554b2d1972173d929c39"},
-  "fast_yaml": {:hex, :fast_yaml, "1.0.39", "2e71168091949bab0e5f583b340a99072b4d22d93eb86624e7850a12b1517be4", [:rebar3], [{:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "24c7b9ab9e2b9269d64e45f4a2a1280966adb17d31e63365cfd3ee277fb0a78d"},
-  "file_system": {:hex, :file_system, "1.1.0", "08d232062284546c6c34426997dd7ef6ec9f8bbd090eb91780283c9016840e8f", [:mix], [], "hexpm", "bfcf81244f416871f2a2e15c1b515287faa5db9c6bcf290222206d120b3d43f6"},
-  "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
-  "jiffy": {:hex, :jiffy, "1.1.2", "a9b6c9a7ec268e7cf493d028f0a4c9144f59ccb878b1afe42841597800840a1b", [:rebar3], [], "hexpm", "bb61bc42a720bbd33cb09a410e48bb79a61012c74cb8b3e75f26d988485cf381"},
-  "jose": {:hex, :jose, "1.11.10", "a903f5227417bd2a08c8a00a0cbcc458118be84480955e8d251297a425723f83", [:mix, :rebar3], [], "hexpm", "0d6cd36ff8ba174db29148fc112b5842186b68a90ce9fc2b3ec3afe76593e614"},
-  "luerl": {:hex, :luerl, "1.2.3", "df25f41944e57a7c4d9ef09d238bc3e850276c46039cfc12b8bb42eccf36fcb1", [:rebar3], [], "hexpm", "1b4b9d0ca5d7d280d1d2787a6a5ee9f5a212641b62bff91556baa53805df3aed"},
-  "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"},
-  "makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"},
-  "makeup_erlang": {:hex, :makeup_erlang, "1.0.2", "03e1804074b3aa64d5fad7aa64601ed0fb395337b982d9bcf04029d68d51b6a7", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "af33ff7ef368d5893e4a267933e7744e46ce3cf1f61e2dccf53a111ed3aa3727"},
-  "mqtree": {:hex, :mqtree, "1.0.19", "d769c25f898810725fc7db0dbffe5f72098647048b1be2e6d772f1c2f31d8476", [:rebar3], [{:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "c81065715c49a1882812f80a5ae2d842e80dd3f2d130530df35990248bf8ce3c"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.4.2", "8efba0122db06df95bfaa78f791344a89352ba04baedd3849593bfce4d0dc1c6", [:mix], [], "hexpm", "4b21398942dda052b403bbe1da991ccd03a053668d147d53fb8c4e0efe09c973"},
-  "p1_acme": {:hex, :p1_acme, "1.0.28", "64d9c17f5412aa92d75b29206b2b984d734a4fe1b7eacb66c3d7a7c697ac612c", [:rebar3], [{:base64url, "~> 1.0", [hex: :base64url, repo: "hexpm", optional: false]}, {:idna, "~> 6.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jiffy, "~> 1.1.1", [hex: :jiffy, repo: "hexpm", optional: false]}, {:jose, "~> 1.11.10", [hex: :jose, repo: "hexpm", optional: false]}, {:yconf, "~> 1.0.17", [hex: :yconf, repo: "hexpm", optional: false]}], "hexpm", "ce686986de3f9d5fd285afe87523cb45329a349c6c6be7acc1ed916725d46423"},
-  "p1_mysql": {:hex, :p1_mysql, "1.0.26", "574d07c9936c53b1ec3556db3cf064cc14a6c39039835b3d940471bfa5ac8e2b", [:rebar3], [], "hexpm", "ea138083f2c54719b9cf549dbf5802a288b0019ea3e5449b354c74cc03fafdec"},
-  "p1_oauth2": {:hex, :p1_oauth2, "0.6.14", "1c5f82535574de87e2059695ac4b91f8f9aebacbc1c80287dae6f02552d47aea", [:rebar3], [], "hexpm", "1fd3ac474e43722d9d5a87c6df8d36f698ed87af7bb81cbbb66361451d99ae8f"},
-  "p1_pgsql": {:hex, :p1_pgsql, "1.1.35", "e13d89f14d717553e85c88a152ce77461916b013d88fcb851e354a0b332d4218", [:rebar3], [{:xmpp, "~> 1.11.0", [hex: :xmpp, repo: "hexpm", optional: false]}], "hexpm", "e99594446c411c660696795b062336f5c4bd800451d8f620bb4d4ce304e255c2"},
-  "p1_utils": {:hex, :p1_utils, "1.0.28", "9a7088a98d788b4c4880fd3c82d0c135650db13f2e4ef7e10db179791bc94d59", [:rebar3], [], "hexpm", "c49bd44bc4a40ad996691af826dd7e0aa56d4d0cd730817190a1f84d1a7f0033"},
-  "pkix": {:hex, :pkix, "1.0.10", "d3bfadf7b7cfe2a3636f1b256c9cce5f646a07ce31e57ee527668502850765a0", [:rebar3], [], "hexpm", "e02164f83094cb124c41b1ab28988a615d54b9adc38575f00f19a597a3ac5d0e"},
-  "sqlite3": {:hex, :sqlite3, "1.1.15", "e819defd280145c328457d7af897d2e45e8e5270e18812ee30b607c99cdd21af", [:rebar3], [], "hexpm", "3c0ba4e13322c2ad49de4e2ddd28311366adde54beae8dba9d9e3888f69d2857"},
-  "stringprep": {:hex, :stringprep, "1.0.33", "22f42866b4f6f3c238ea2b9cb6241791184ddedbab55e94a025511f46325f3ca", [:rebar3], [{:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "96f8b30bc50887f605b33b46bca1d248c19a879319b8c482790e3b4da5da98c0"},
-  "stun": {:hex, :stun, "1.2.21", "735855314ad22cb7816b88597d2f5ca22e24aa5e4d6010a0ef3affb33ceed6a5", [:rebar3], [{:fast_tls, "1.1.25", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "3d7fe8efb9d05b240a6aa9a6bf8b8b7bff2d802895d170443c588987dc1e12d9"},
-  "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.1", "a48703a25c170eedadca83b11e88985af08d35f37c6f664d6dcfb106a97782fc", [:rebar3], [], "hexpm", "b3a917854ce3ae233619744ad1e0102e05673136776fb2fa76234f3e03b23642"},
-  "xmpp": {:git, "https://github.com/processone/xmpp", "e9d901ea84fd3910ad32b715853397eb1155b41c", [ref: "e9d901ea84fd3910ad32b715853397eb1155b41c"]},
-  "yconf": {:git, "https://github.com/processone/yconf", "95692795a8a8d950ba560e5b07e6b80660557259", [ref: "95692795a8a8d950ba560e5b07e6b80660557259"]},
+  "cache_tab": {:hex, :cache_tab, "1.0.30", "6d35eecfb65fbe5fc85988503a27338d32de01243f3fc8ea3ee7161af08725a4", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "6d8a5e00d8f84c42627706a6dbedb02e34d58495f3ed61935c8475ca0531cda0"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.25", "2024618731c55ebfcc5439d756852ec4e85978a39d0d58593763924d9a15916f", [:mix], [], "hexpm", "56749c5e1c59447f7b7a23ddb235e4b3defe276afc220a6227237f3efe83f51e"},
+  "eimp": {:hex, :eimp, "1.0.22", "fa9b376ef0b50e8455db15c7c11dea4522c6902e04412288aab436d26335f6eb", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "b3b9ffb1d9a5f4a2ba88ac418a819164932d9a9d3a2fc3d32ca338ce855c4392"},
+  "epam": {:hex, :epam, "1.0.12", "2a5625d4133bca4b3943791a3f723ba764455a461ae9b6ba5debb262efcf4b40", [:rebar3], [], "hexpm", "54c166c4459cef72f2990a3d89a8f0be27180fe0ab0f24b28ddcc3b815f49f7f"},
+  "eredis": {:hex, :eredis, "1.2.0", "0b8e9cfc2c00fa1374cd107ea63b49be08d933df2cf175e6a89b73dd9c380de4", [:rebar3], [], "hexpm", "d9b5abef2c2c8aba8f32aa018203e0b3dc8b1157773b254ab1d4c2002317f1e1"},
+  "esip": {:hex, :esip, "1.0.48", "3b3b3afc798be9458517d4fd2730674322368e54c2c1211aa630327354946d1b", [:rebar3], [{:fast_tls, "1.1.16", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.2.6", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm", "02b9fc6e071415cbc62105f5115aeb68d11184bdad3960da7b62ea3e99e7fccf"},
+  "ex_doc": {:hex, :ex_doc, "0.28.4", "001a0ea6beac2f810f1abc3dbf4b123e9593eaa5f00dd13ded024eae7c523298", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bf85d003dd34911d89c8ddb8bda1a958af3471a274a4c2150a9c01c78ac3f8ed"},
+  "ezlib": {:hex, :ezlib, "1.0.12", "ffe906ba10d03aaee7977e1e0e81d9ffc3bb8b47fb9cd8e2e453507a2e56221f", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "30e94355fb42260aab6e12582cb0c56bf233515e655c8aeaf48760e7561e4ebb"},
+  "fast_tls": {:hex, :fast_tls, "1.1.16", "85fa7f3112ea4ff5ccb4f3abadc130a8c855ad74eb00869487399cb0c322d208", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "aa08cca89b4044e74f1f12e399817d8beaeae3ee006c98a893c0bfb1d81fba51"},
+  "fast_xml": {:hex, :fast_xml, "1.1.49", "67d9bfcadd04efd930e0ee1412b5ea09d3e791f1fdbd4d3e9a8c8f29f8bfed8c", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "01da064d2f740818956961036637fee2475c17bf8aab9442217f90dc77883593"},
+  "fast_yaml": {:hex, :fast_yaml, "1.0.34", "3be1ed8a37fe87a53f7f2ad1ee9586dcc257103d0b1d1f0ee6306cad9d54c29a", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "926dc1798399418d3983bd53356f3395b01c07a550f6b8d1dd5d6cc07c22c1c9"},
+  "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"},
+  "jiffy": {:hex, :jiffy, "1.1.1", "aca10f47aa91697bf24ab9582c74e00e8e95474c7ef9f76d4f1a338d0f5de21b", [:rebar3], [], "hexpm", "62e1f0581c3c19c33a725c781dfa88410d8bff1bbafc3885a2552286b4785c4c"},
+  "jose": {:hex, :jose, "1.11.1", "59da64010c69aad6cde2f5b9248b896b84472e99bd18f246085b7b9fe435dcdb", [:mix, :rebar3], [], "hexpm", "078f6c9fb3cd2f4cfafc972c814261a7d1e8d2b3685c0a76eb87e158efff1ac5"},
+  "luerl": {:hex, :luerl, "1.0.0", "1b68c30649323590d5339b967b419260500ffe520cd3abc1987482a82d3b5a6c", [:rebar3], [], "hexpm", "c17bc45cb4b0845ec975387f9a5d8c81ab60456698527a29c96f78992af86bd1"},
+  "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"},
+  "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
+  "mqtree": {:hex, :mqtree, "1.0.15", "bc54d8b88698fdaebc1e27a9ac43688b927e3dbc05bd5cee4057e69a89a8cf17", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "294ac43c9b3d372e24eeea56c259e19c655522dcff64a55c401a639663b9d829"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
+  "p1_acme": {:hex, :p1_acme, "1.0.20", "c976cbca2dd1bdcf71a6e17fb512e30451b5f258694157f7b63963767ee26560", [:rebar3], [{:base64url, "1.0.1", [hex: :base64url, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jiffy, "1.1.1", [hex: :jiffy, repo: "hexpm", optional: false]}, {:jose, "1.11.1", [hex: :jose, repo: "hexpm", optional: false]}, {:yconf, "1.0.14", [hex: :yconf, repo: "hexpm", optional: false]}], "hexpm", "70e0ecf8c8729dfc01f6a15279ef9fa4003c3b5af47b6732d9312296a8ba4f5c"},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.20", "08aeade83a24902a5fca2dbf78fa674eef25ca4e66250b4be8bd3580f35880e7", [:rebar3], [], "hexpm", "12152e8feadcf8ce586334314ca27cb088f12e0a5c850c496a8df69859390877"},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.11", "96b4e85c08355720523c2f892011a81a07994d15c179ce4dd82d704fecad15b2", [:rebar3], [], "hexpm", "9c3c6ae59382b9525473bb02a32949889808f33f95f6db10594fd92acd1f63db"},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.1.19", "dc615844fd22a2e45182018d5bcc6b757ac19f576fab3fe6d69e1c0ff25cee2b", [:rebar3], [{:xmpp, "1.6.0", [hex: :xmpp, repo: "hexpm", optional: false]}], "hexpm", "4b0c6d30bbf881feb01171d13f444a6e05e1d19b6926e3f56f4028823d02730b"},
+  "p1_utils": {:hex, :p1_utils, "1.0.25", "2d39b5015a567bbd2cc7033eeb93a7c60d8c84efe1ef69a3473faa07fa268187", [:rebar3], [], "hexpm", "9219214428f2c6e5d3187ff8eb9a8783695c2427420be9a259840e07ada32847"},
+  "pkix": {:hex, :pkix, "1.0.9", "eb20b2715d71a23b4fe7e754dae9281a964b51113d0bba8adf9da72bf9d65ac2", [:rebar3], [], "hexpm", "daab2c09cdd4eda05c9b45a5c00e994a1a5f27634929e1377e2e59b707103e3a"},
+  "sqlite3": {:hex, :sqlite3, "1.1.13", "94a6e0508936514e1493efeb9b939a9bbfa861f4b8dc93ef174ae88a1d9381d3", [:rebar3], [], "hexpm", "b77fad096d1ae9553ad8551ea75bd0d64a2f5b09923a7ca48b14215564dbfc48"},
+  "stringprep": {:hex, :stringprep, "1.0.29", "02f23e8c3a219a3dfe40a22e908bece3a2f68af0ff599ea8a7b714ecb21e62ee", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "928eba304c3006eb1512110ebd7b87db163b00859a09375a1e4466152c6c462a"},
+  "stun": {:hex, :stun, "1.2.6", "5d1978d340ea20efb28bc1e58779a3a1d64568c66168db4d20692e76ce813d5e", [:rebar3], [{:fast_tls, "1.1.16", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "21aed098457e5099e925129459590592e001c470cf7503e5614a7a6b688ff146"},
+  "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm", "1d1848c40487cdb0b30e8ed975e34e025860c02e419cb615d255849f3427439d"},
+  "xmpp": {:hex, :xmpp, "1.6.0", "2ca2180eac1a97e929d1cfa1e4faabef4f32a719331c7f56e47d305c0ec8e438", [:rebar3], [{:ezlib, "1.0.12", [hex: :ezlib, repo: "hexpm", optional: false]}, {:fast_tls, "1.1.16", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:fast_xml, "1.1.49", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "1.0.29", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm", "5fd723c95bce79600a8f44ba79cf5d3b1dac80af65493a4a414e39791f7dd7e9"},
+  "yconf": {:hex, :yconf, "1.0.14", "b216f385f729b338385b25176f6e4fe8cabfdf7ede9c40a35b2e77fc93e98fc8", [:rebar3], [{:fast_yaml, "1.0.34", [hex: :fast_yaml, repo: "hexpm", optional: false]}], "hexpm", "a8a9262553c11ed4cd13cc8e656e53acb00f9385f0a50cd235af7d02e9204bce"},
 }
--- a/priv/css/admin.css
+++ b/priv/css/admin.css
@ -131,27 +131,16 @@ ul li #navhead a, ul li #navheadsub a, ul li #navheadsubsub a {
  background: #424a55;
  color: #fff;
 }
-
-#navitemlogin-start {
-  border-top: 0.2em solid #cae7e4;
-}
-#navitemlogin {
-  padding: 0.5em;
-  border-bottom: 0.2em solid #cae7e4;
-  padding-left: 0.5em;
-}
-#welcome {
-  padding: 2em;
-  border-top: 0.2em solid #cae7e4;
-  border-bottom: 0.2em solid #cae7e4;
-  background-color: #f4f9f9;
-}
 #lastactivity li {
  padding: 2px;
  margin-bottom: -1px;
 }
 thead tr td {
-  background: #cae7e4;
+  background: #3eaffa;
+  color: #fff;
+}
+thead tr td a {
+  color: #fff;
 }
 td.copy {
  text-align: center;
@ -238,32 +227,24 @@ h3 {
  padding-top: 25px;
  width: 70%;
 }
-div.anchorlink {
-  display: inline-block;
-  float: right;
-  margin-top: 1em;
-  margin-right: 1em;
-}
-div.anchorlink a {
-  padding: 3px;
-  background: #cae7e4;
-  font-size: 0.75em;
-  color: black;
-}
 div.guidelink,
 p[dir=ltr] {
  display: inline-block;
  float: right;
-  margin-top: 1em;
+
+  margin: 0;
  margin-right: 1em;
 }
 div.guidelink a,
 p[dir=ltr] a {
+  display: inline-block;
+  border-radius: 3px;
  padding: 3px;
+
  background: #3eaffa;
+
  font-size: 0.75em;
  color: #fff;
-  border-radius: 2px;
 }
 table {
  margin-top: 1em;
@ -284,7 +265,7 @@ input,
 select {
  font-size: 1em;
 }
-.result {
+p.result {
  border: 1px;
  border-style: dashed;
  border-color: #FE8A02;
@ -303,20 +284,3 @@ select {
 	color: #cb2431;
 	transition: none;
 }
-h3.api {
-  border-bottom: 1px solid #b6b6b6;
-}
-details > summary {
-  background-color: #dbeceb;
-  border: none;
-  cursor: pointer;
-  list-style: none;
-  padding: 8px;
-  border-radius: 4px;
-}
-details > pre, details > p {
-  background-color: #f2f8f7;
-  border-bottom: 0.2em solid #dbeceb;
-  margin: 0;
-  padding: 10px;
-}
--- a/priv/css/muc.css
+++ b/priv/css/muc.css
@ -16,14 +16,12 @@ a.roomjid {color: #336699; font-size: 24px; font-weight: bold; font-family: sans
 div.logdate {color: #663399; font-size: 20px; font-weight: bold; font-family: sans-serif; letter-spacing: 2px; border-bottom: #224466 solid 1pt; margin-left:80pt; margin-top:20px;}
 div.roomsubject {color: #336699; font-size: 18px; font-family: sans-serif; margin-left: 80pt; margin-bottom: 10px;}
 div.rc {color: #336699; font-size: 12px; font-family: sans-serif; margin-left: 50%; text-align: right; background: #f3f6f9; border-bottom: 1px solid #336699; border-right: 4px solid #336699;}
-div.rct {font-weight: bold; background: #e3e6e9; padding-right: 10px; cursor: pointer;}
-div.rct:hover {text-decoration: underline;}
+div.rct {font-weight: bold; background: #e3e6e9; padding-right: 10px;}
 div.rcos {padding-right: 10px;}
 div.rcoe {color: green;}
 div.rcod {color: red;}
 div.rcoe:after {content: ": v";}
 div.rcod:after {content: ": x";}
 div.rcot:after {}
-div.jl {display: none;}
 .legend {width: 100%; margin-top: 30px; border-top: #224466 solid 1pt;  padding: 10px 0px 10px 0px; text-align: left; font-family: monospace; letter-spacing: 2px;}
 .w3c {position: absolute; right: 10px; width: 60%; text-align: right; font-family: monospace; letter-spacing: 1px;}
--- a/priv/css/sortable.min.css
+++ b/priv/css/sortable.min.css
@ -1 +0,0 @@
-.sortable thead th:not(.no-sort){cursor:pointer}.sortable thead th:not(.no-sort)::after,.sortable thead th:not(.no-sort)::before{transition:color .1s ease-in-out;font-size:1.2em;color:rgba(0,0,0,0)}.sortable thead th:not(.no-sort)::after{margin-left:3px;content:"▸"}.sortable thead th:not(.no-sort):hover::after{color:inherit}.sortable thead th:not(.no-sort)[aria-sort=descending]::after{color:inherit;content:"▾"}.sortable thead th:not(.no-sort)[aria-sort=ascending]::after{color:inherit;content:"▴"}.sortable thead th:not(.no-sort).indicator-left::after{content:""}.sortable thead th:not(.no-sort).indicator-left::before{margin-right:3px;content:"▸"}.sortable thead th:not(.no-sort).indicator-left:hover::before{color:inherit}.sortable thead th:not(.no-sort).indicator-left[aria-sort=descending]::before{color:inherit;content:"▾"}.sortable thead th:not(.no-sort).indicator-left[aria-sort=ascending]::before{color:inherit;content:"▴"}/*# sourceMappingURL=sortable-base.min.css.map */
--- a/priv/img/admin-logo-fill.png
+++ b/priv/img/admin-logo-fill.png
--- a/priv/img/admin-logo.png
+++ b/priv/img/admin-logo.png
--- a/priv/js/muc.js
+++ b/priv/js/muc.js
@ -6,14 +6,3 @@ function sh(e) {
 	document.getElementById(e).style.display='none';
    }
 }
-// Show/Hide join/leave elements
-function jlf() {
-    var es = document.getElementsByClassName('jl');
-    for (var i = 0; i < es.length; i++) {
-        if (es[i].style.display === 'block') {
-            es[i].style.display = 'none';
-        } else {
-            es[i].style.display = 'block';
-        }
-    }
-}
--- a/priv/js/sortable.min.js
+++ b/priv/js/sortable.min.js
@ -1,3 +0,0 @@
-document.addEventListener("click",function(c){try{function h(b,a){return b.nodeName===a?b:h(b.parentNode,a)}var v=c.shiftKey||c.altKey,d=h(c.target,"TH"),m=d.parentNode,n=m.parentNode,g=n.parentNode;function p(b){var a;return v?b.dataset.sortAlt:null!==(a=b.dataset.sort)&&void 0!==a?a:b.textContent}if("THEAD"===n.nodeName&&g.classList.contains("sortable")&&!d.classList.contains("no-sort")){var q,f=m.cells,r=+d.dataset.sortTbr;for(c=0;c<f.length;c++)f[c]===d?q=+d.dataset.sortCol||c:f[c].setAttribute("aria-sort",
-"none");f="descending";if("descending"===d.getAttribute("aria-sort")||g.classList.contains("asc")&&"ascending"!==d.getAttribute("aria-sort"))f="ascending";d.setAttribute("aria-sort",f);var w="ascending"===f,x=g.classList.contains("n-last"),t=function(b,a,e){a=p(a.cells[e]);b=p(b.cells[e]);if(x){if(""===a&&""!==b)return-1;if(""===b&&""!==a)return 1}e=+a-+b;a=isNaN(e)?a.localeCompare(b):e;return w?-a:a};for(c=0;c<g.tBodies.length;c++){var k=g.tBodies[c],u=[].slice.call(k.rows,0);u.sort(function(b,a){var e=
-t(b,a,q);return 0!==e||isNaN(r)?e:t(b,a,r)});var l=k.cloneNode();l.append.apply(l,u);g.replaceChild(l,k)}}}catch(h){}});
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				.sortable thead th:not(.no-sort){cursor:pointer}.sortable thead th:not(.no-sort)::after,.sortable thead th:not(.no-sort)::before{transition:color .1s ease-in-out;font-size:1.2em;color:rgba(0,0,0,0)}.sortable thead th:not(.no-sort)::after{margin-left:3px;content:"▸"}.sortable thead th:not(.no-sort):hover::after{color:inherit}.sortable thead th:not(.no-sort)[aria-sort=descending]::after{color:inherit;content:"▾"}.sortable thead th:not(.no-sort)[aria-sort=ascending]::after{color:inherit;content:"▴"}.sortable thead th:not(.no-sort).indicator-left::after{content:""}.sortable thead th:not(.no-sort).indicator-left::before{margin-right:3px;content:"▸"}.sortable thead th:not(.no-sort).indicator-left:hover::before{color:inherit}.sortable thead th:not(.no-sort).indicator-left[aria-sort=descending]::before{color:inherit;content:"▾"}.sortable thead th:not(.no-sort).indicator-left[aria-sort=ascending]::before{color:inherit;content:"▴"}/# sourceMappingURL=sortable-base.min.css.map /