ejabberd 2.1.2 release

SVN Revision: 2915

.dockerignore

@@ -1,3 +0,0 @@
-.git
-.win32
-.examples

.github/ISSUE_TEMPLATE

@@ -1,15 +0,0 @@
-> What version of ejabberd are you using?
-
-
-
-> What operating system (version) are you using?
-
-
-
-> How did you install ejabberd (source, package, distribution)?
-
-
-
-> What did not work as expected? Are there error messages in the log? What
-> was the unexpected behavior? What was the expected result?
-

.github/PULL_REQUEST_TEMPLATE

@@ -1,20 +0,0 @@
-We are open to contributions for ejabberd, as GitHub pull requests (PR).
-Here are a few points to consider before submitting your PR. (You can
-remove the whole text after reading.)
-
-1. Does this PR address an issue? Please reference it in the PR
-   description.
-
-2. Have you properly described the proposed change?
-
-3. Please make sure the change is atomic and does only touch the needed
-   modules. If you have other changes/fixes to provide, please submit
-   them as separate PRs.
-
-4. If your change or new feature involves storage backends, did you make
-   sure your change works with all backends?
-
-5. Do you provide tests? How can we check the behavior of the code?
-
-6. Did you consider documentation changes in the
-   processone/docs.ejabberd.im repository?

.gitignore

@@ -1,49 +0,0 @@
-#
-# You can add personal rules in your file .git/info/exclude
-*.swp
-*~
-\#*#
-.#*
-.edts
-*.dump
-/Makefile
-/config.log
-/config.status
-/configure
-/aclocal.m4
-/contrib/extract_translations/extract_translations.beam
-/*.cache
-/deps/
-/doc/*.aux
-/doc/*.haux
-/doc/*.html
-/doc/*.htoc
-/doc/*.idx
-/doc/*.ilg
-/doc/*.ind
-/doc/*.log
-/doc/*.out
-/doc/*.pdf
-/doc/*.toc
-/doc/contributed_modules.tex
-/doc/version.tex
-/ebin/
-/ejabberd.init
-/ejabberd.service
-/ejabberdctl.example
-XmppAddr.hrl
-/rel/ejabberd/
-/src/XmppAddr.asn1db
-/src/XmppAddr.erl
-/src/ejabberd.app.src
-/src/eldap_filter_yecc.erl
-/vars.config
-/dialyzer/
-/test/*.beam
-/test/*.ctc
-/logs/
-/priv/sql
-/rel/ejabberd
-/_build
-/mnesiadb
-/.rebar

.travis.yml

@@ -1,75 +0,0 @@
-language: erlang
-
-otp_release:
-  - 17.5
-  - 18.3
-  - 19.2
-
-services:
-  - riak
-  - redis-server
-
-before_install:
-  #
-  # We need MySQL 5.6 or newer in order to get support for FULLTEXT indexes
-  # with InnoDB. As soon as Travis ships that version, the following lines
-  # (except for the "apt-get update" call) can go away.
-  #
-  # See: https://github.com/travis-ci/travis-ci/issues/1986
-  #
-  - sudo sed -i -e s/table_cache/table_open_cache/ -e /log_slow_queries/d /etc/mysql/my.cnf
-  - sudo apt-key adv --import .travis/mysql_repo_key.asc
-  - sudo add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6'
-  - sudo apt-get -qq update
-  - sudo apt-get -qq -o Dpkg::Options::=--force-confold install mysql-server
-  - sudo mysql_upgrade
-  # /END MYSQL 5.6
-  - pip install --user coveralls-merge
-
-install:
-  - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev libsqlite3-dev libgd-dev libwebp-dev
-
-before_script:
-  # Ulimit: See Travis-CI issue report: https://github.com/travis-ci/travis-ci/issues/3328
-  - echo 'ulimit -n 4096' > riak
-  - sudo mv riak /etc/default/riak
-  - mkdir "$PWD/ebin"
-  - sed 's/^storage_backend.*/storage_backend = leveldb/' /etc/riak/riak.conf > riak.conf
-  - sudo mv riak.conf /etc/riak/riak.conf
-  - echo "[{riak_kv, [{add_paths, [\"$PWD/ebin/\"]}]}]." > advanced.config
-  - sudo mv advanced.config /etc/riak/advanced.config
-  - sudo service riak restart
-  - sudo riak-admin wait-for-service riak_kv 'riak@127.0.0.1'
-  - sudo riak-admin test
-  - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';"
-  - mysql -u root -e "CREATE DATABASE ejabberd_test;"
-  - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';"
-  - psql -U postgres -c "CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';"
-  - psql -U postgres -c "CREATE DATABASE ejabberd_test;"
-  - psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;"
-
-script:
-  - ./autogen.sh
-  - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc
-  - make
-  - make install
-  - make xref
-  - sed -i -e 's/ct:pal/ct:log/' test/suite.erl
-  - ln -sf ../sql priv/
-  - escript ./rebar skip_deps=true ct -v
-  - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log
-
-after_script:
-  - find logs -name suite.log -exec cat '{}' ';'
-
-after_failure:
-  - find logs -name exunit.log -exec cat '{}' ';'
-  # Try checking Riak database logs
-  - tail -n 100000 /var/log/riak/*.log
-  - find logs -name ejabberd.log -exec cat '{}' ';'
-
-after_success:
-  - coveralls-merge erlang.json
-
-notifications:
-  email: false

.travis/mysql_repo_key.asc

@@ -1,432 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-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
-roUTAKClYAhZuX2nUNwH4vlEJQHDqYa5yQ==
-=HfUN
------END PGP PUBLIC KEY BLOCK-----

COPYING

@@ -4,8 +4,8 @@ with the OpenSSL library and distribute the resulting binary.
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -306,9 +306,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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.
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
 Also add information on how to contact you by electronic and paper mail.

Dockerfile

@@ -1,120 +0,0 @@
-FROM debian:jessie-slim
-MAINTAINER Rafael Römhild <rafael@roemhild.de>
-
-ENV EJABBERD_BRANCH=17.08 \
-    EJABBERD_USER=ejabberd \
-    EJABBERD_HTTPS=true \
-    EJABBERD_STARTTLS=true \
-    EJABBERD_S2S_SSL=true \
-    EJABBERD_HOME=/opt/ejabberd \
-    EJABBERD_DEBUG_MODE=false \
-    HOME=$EJABBERD_HOME \
-    PATH=$EJABBERD_HOME/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/sbin \
-    DEBIAN_FRONTEND=noninteractive \
-    XMPP_DOMAIN=localhost \
-    # Set default locale for the environment
-    LC_ALL=C.UTF-8 \
-    LANG=en_US.UTF-8 \
-    LANGUAGE=en_US.UTF-8
-
-# Add ejabberd user and group
-RUN groupadd -r $EJABBERD_USER \
-    && useradd -r -m \
-       -g $EJABBERD_USER \
-       -d $EJABBERD_HOME \
-       $EJABBERD_USER
-
-# Install packages and perform cleanup
-RUN set -x \
-    && buildDeps=' \
-        git-core \
-        build-essential \
-        automake \
-        libssl-dev \
-        zlib1g-dev \
-        libexpat-dev \
-        libyaml-dev \
-        libsqlite3-dev \
-        erlang-src erlang-dev \
-    ' \
-    && requiredAptPackages=' \
-        wget \
-        locales \
-        ldnsutils \
-        python2.7 \
-        python-jinja2 \
-        ca-certificates \
-        libyaml-0-2 \
-        erlang-base erlang-snmp erlang-ssl erlang-ssh erlang-webtool \
-        erlang-tools erlang-xmerl erlang-corba erlang-diameter erlang-eldap \
-        erlang-eunit erlang-ic erlang-odbc erlang-os-mon \
-        erlang-parsetools erlang-percept erlang-typer \
-        python-mysqldb \
-        imagemagick \
-    ' \
-    && apt-key adv \
-        --keyserver keys.gnupg.net \
-        --recv-keys 434975BD900CCBE4F7EE1B1ED208507CA14F4FCA \
-    && apt-get update \
-    && apt-get install -y $buildDeps $requiredAptPackages --no-install-recommends \
-    && dpkg-reconfigure locales && \
-        locale-gen C.UTF-8 \
-    && /usr/sbin/update-locale LANG=C.UTF-8 \
-    && echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
-    && locale-gen \
-    && cd /tmp \
-    && git clone https://github.com/processone/ejabberd.git \
-        --branch $EJABBERD_BRANCH --single-branch --depth=1 \
-    && cd ejabberd \
-    && chmod +x ./autogen.sh \
-    && ./autogen.sh \
-    && ./configure --enable-user=$EJABBERD_USER \
-        --enable-all \
-        --disable-tools \
-        --disable-pam \
-    && make debug=$EJABBERD_DEBUG_MODE \
-    && make install \
-    && mkdir $EJABBERD_HOME/ssl \
-    && mkdir $EJABBERD_HOME/conf \
-    && mkdir $EJABBERD_HOME/backup \
-    && mkdir $EJABBERD_HOME/upload \
-    && mkdir $EJABBERD_HOME/database \
-    && mkdir $EJABBERD_HOME/module_source \
-    && cd $EJABBERD_HOME \
-    && rm -rf /tmp/ejabberd \
-    && rm -rf /usr/local/etc/ejabberd \
-    && ln -sf $EJABBERD_HOME/conf /usr/local/etc/ejabberd \
-    && chown -R $EJABBERD_USER: $EJABBERD_HOME \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get purge -y --auto-remove $buildDeps
-
-RUN wget -P /usr/local/share/ca-certificates/cacert.org http://www.cacert.org/certs/root.crt http://www.cacert.org/certs/class3.crt; \
-    update-ca-certificates
-
-# Create logging directories
-RUN mkdir -p /var/log/ejabberd
-RUN touch /var/log/ejabberd/crash.log /var/log/ejabberd/error.log /var/log/ejabberd/erlang.log
-
-# Wrapper for setting config on disk from environment
-# allows setting things like XMPP domain at runtime
-ADD ./docker/run.sh /sbin/run
-
-# Add run scripts
-ADD ./docker/scripts $EJABBERD_HOME/scripts
-ADD https://raw.githubusercontent.com/rankenstein/ejabberd-auth-mysql/master/auth_mysql.py $EJABBERD_HOME/scripts/lib/auth_mysql.py
-RUN chmod a+rx $EJABBERD_HOME/scripts/lib/auth_mysql.py
-
-# Add config templates
-ADD ./docker/conf /opt/ejabberd/conf
-
-# Continue as user
-USER $EJABBERD_USER
-
-# Set workdir to ejabberd root
-WORKDIR $EJABBERD_HOME
-
-VOLUME ["$EJABBERD_HOME/database", "$EJABBERD_HOME/ssl", "$EJABBERD_HOME/backup", "$EJABBERD_HOME/upload"]
-EXPOSE 4560 5222 5269 5280 5443
-
-CMD ["start"]
-ENTRYPOINT ["run"]

Makefile.in

@@ -1,365 +0,0 @@
-REBAR = @ESCRIPT@ rebar
-INSTALL = @INSTALL@
-SED = @SED@
-ERL = @ERL@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-DESTDIR =
-
-# /etc/ejabberd/
-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
-
-# /bin/
-BINDIR = $(DESTDIR)@bindir@
-
-# /sbin/
-SBINDIR = $(DESTDIR)@sbindir@
-
-# /lib/
-LIBDIR =  $(DESTDIR)@libdir@
-
-# /lib/ejabberd/
-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
-
-# /share/doc/ejabberd
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-datarootdir = @datarootdir@
-DOCDIR = $(DESTDIR)@docdir@
-
-# /usr/lib/ejabberd/ebin/
-BEAMDIR = $(EJABBERDDIR)/ebin
-
-# /usr/lib/ejabberd/include/
-INCLUDEDIR = $(EJABBERDDIR)/include
-
-# /usr/lib/ejabberd/priv/
-PRIVDIR = $(EJABBERDDIR)/priv
-
-# /usr/lib/ejabberd/priv/bin
-PBINDIR = $(PRIVDIR)/bin
-
-# /usr/lib/ejabberd/priv/lib
-SODIR = $(PRIVDIR)/lib
-
-# /usr/lib/ejabberd/priv/msgs
-MSGSDIR = $(PRIVDIR)/msgs
-
-# /usr/lib/ejabberd/priv/css
-CSSDIR = $(PRIVDIR)/css
-
-# /usr/lib/ejabberd/priv/img
-IMGDIR = $(PRIVDIR)/img
-
-# /usr/lib/ejabberd/priv/js
-JSDIR = $(PRIVDIR)/js
-
-# /usr/lib/ejabberd/priv/sql
-SQLDIR = $(PRIVDIR)/sql
-
-# /var/lib/ejabberd/
-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
-
-# /var/lock/ejabberdctl
-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
-
-# /var/lib/ejabberd/.erlang.cookie
-COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
-
-# /var/log/ejabberd/
-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
-
-INSTALLUSER=@INSTALLUSER@
-# if no user was enabled, don't set privileges or ownership
-ifeq ($(INSTALLUSER),)
-  O_USER=
-  G_USER=
-  CHOWN_COMMAND=echo
-  CHOWN_OUTPUT=/dev/null
-  INIT_USER=root
-else
-  O_USER=-o $(INSTALLUSER)
-  G_USER=-g $(INSTALLUSER)
-  CHOWN_COMMAND=chown
-  CHOWN_OUTPUT=&1
-  INIT_USER=$(INSTALLUSER)
-endif
-
-all: deps src
-
-deps: deps/.got
-
-deps/.got:
-	rm -rf deps/.got
-	rm -rf deps/.built
-	mkdir -p deps
-	$(REBAR) get-deps && :> deps/.got
-
-deps/.built: deps/.got
-	$(REBAR) compile && :> deps/.built
-
-src: deps/.built
-	$(REBAR) skip_deps=true compile
-
-update:
-	rm -rf deps/.got
-	rm -rf deps/.built
-	$(REBAR) update-deps && :> deps/.got
-
-xref: all
-	$(REBAR) skip_deps=true xref
-
-
-translations:
-	tools/prepare-tr.sh
-
-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))
-
-VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
-
-ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
-DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
-MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
-TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
-TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
-
-FILTER_DIRS=$(foreach path,$(1),$(if $(wildcard $(path)/*),,$(path)))
-FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
-
-ifeq ($(MAKECMDGOALS),copy-files-sub)
-
-DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -ne '/ TAG / s/ .*// p; / REV / s/ .*// p; / BRANCH / s/ .*// p'))
-
-DEPS_FILES=$(call FILES_WILDCARD,$(foreach DEP,$(DEPS),deps/$(DEP)/ebin/*.beam deps/$(DEP)/ebin/*.app deps/$(DEP)/priv/* deps/$(DEP)/priv/lib/* deps/$(DEP)/priv/bin/* deps/$(DEP)/include/*.hrl deps/$(DEP)/COPY* deps/$(DEP)/LICENSE* deps/$(DEP)/lib/*/ebin/*.beam deps/$(DEP)/lib/*/ebin/*.app))
-DEPS_FILES_FILTERED=$(filter-out %/epam %/eimp %/mac_listener deps/elixir/ebin/elixir.app,$(DEPS_FILES))
-DEPS_DIRS=$(sort deps/ $(foreach DEP,$(DEPS),deps/$(DEP)/) $(dir $(DEPS_FILES)))
-
-MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,ebin/*.beam ebin/*.app priv/msgs/*.msg priv/css/*.css priv/img/*.png priv/js/*.js priv/lib/* include/*.hrl COPYING))
-MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql)
-
-define DEP_VERSION_template
-DEP_$(1)_VERSION:=$(shell $(SED) -e '/vsn/!d;s/.*, *"/$(1)-/;s/".*//' $(2) 2>/dev/null)
-endef
-
-$(foreach DEP,$(DEPS),$(eval $(call DEP_VERSION_template,$(DEP),deps/$(DEP)/ebin/$(DEP).app)))
-$(eval $(call DEP_VERSION_template,ejabberd,ebin/ejabberd.app))
-
-define COPY_template
-$(call TO_DEST,$(1)): $(1) $(call TO_DEST,$(dir $(1))) ; $$(INSTALL) -m 644 $(1) $(call TO_DEST,$(1))
-endef
-
-$(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,$(file))))
-
-$(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))):
-	$(INSTALL) -d $@
-
-$(call TO_DEST,deps/epam/priv/bin/epam): $(LIBDIR)/%: deps/epam/priv/bin/epam $(call TO_DEST,deps/epam/priv/bin/)
-	$(INSTALL) -m 750 $(O_USER) $< $@
-
-$(call TO_DEST,deps/eimp/priv/bin/eimp): $(LIBDIR)/%: deps/eimp/priv/bin/eimp $(call TO_DEST,deps/eimp/priv/bin/)
-	$(INSTALL) -m 755 $(O_USER) $< $@
-
-$(call TO_DEST,deps/fs/priv/mac_listener): $(LIBDIR)/%: deps/fs/priv/mac_listener $(call TO_DEST,deps/fs/priv/)
-	$(INSTALL) -m 755 $(O_USER) $< $@
-
-$(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
-	$(INSTALL) -m 644 $< $@
-
-$(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin)
-	$(INSTALL) -m 755 $(O_USER) $< $@
-
-copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
-
-endif
-
-copy-files:
-	$(MAKE) copy-files-sub
-
-copy-files-sub: copy-files-sub2
-
-install: all copy-files
-	#
-	# Configuration files
-	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
-	[ -f $(ETCDIR)/ejabberd.yml ] \
-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
-	$(SED) -e "s*{{rootdir}}*@prefix@*g" \
-		-e "s*{{installuser}}*@INSTALLUSER@*g" \
-		-e "s*{{bindir}}*@bindir@*g" \
-		-e "s*{{libdir}}*@libdir@*g" \
-		-e "s*{{sysconfdir}}*@sysconfdir@*g" \
-		-e "s*{{localstatedir}}*@localstatedir@*g" \
-		-e "s*{{docdir}}*@docdir@*g" \
-		-e "s*{{erl}}*@ERL@*g" \
-		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
-		> ejabberdctl.example
-	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
-	#
-	# Administration script
-	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
-	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-	# Elixir binaries
-	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
-	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
-	[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir || true
-	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
-	#
-	# Init script
-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
-		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
-		> ejabberd.init
-	chmod 755 ejabberd.init
-	#
-	# Service script
-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
-		> ejabberd.service
-	chmod 644 ejabberd.service
-	#
-	# Spool directory
-	$(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
-	chmod -R 750 $(SPOOLDIR)
-	[ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; }
-	#
-	# ejabberdctl lock directory
-	$(INSTALL) -d -m 750 $(O_USER) $(CTLLOCKDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
-	chmod -R 750 $(CTLLOCKDIR)
-	#
-	# Log directory
-	$(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
-	chmod -R 750 $(LOGDIR)
-	#
-	# Documentation
-	$(INSTALL) -d $(DOCDIR)
-	[ -f doc/guide.html ] \
-		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
-		|| echo "Documentation not included in sources"
-	$(INSTALL) -m 644 COPYING $(DOCDIR)
-
-uninstall: uninstall-binary
-
-uninstall-binary:
-	rm -f  $(SBINDIR)/ejabberdctl
-	rm -f  $(BINDIR)/iex
-	rm -f  $(BINDIR)/elixir
-	rm -f  $(BINDIR)/mix
-	rm -fr $(DOCDIR)
-	rm -f  $(BEAMDIR)/*.beam
-	rm -f  $(BEAMDIR)/*.app
-	rm -fr $(BEAMDIR)
-	rm -f  $(INCLUDEDIR)/*.hrl
-	rm -fr $(INCLUDEDIR)
-	rm -fr $(PBINDIR)
-	rm -f  $(SODIR)/*.so
-	rm -fr $(SODIR)
-	rm -f  $(MSGSDIR)/*.msg
-	rm -fr $(MSGSDIR)
-	rm -f  $(CSSDIR)/*.css
-	rm -fr $(CSSDIR)
-	rm -f  $(IMGDIR)/*.png
-	rm -fr $(IMGDIR)
-	rm -f  $(JSDIR)/*.js
-	rm -fr $(JSDIR)
-	rm -f  $(SQLDIR)/*.sql
-	rm -fr $(SQLDIR)
-	rm -fr $(PRIVDIR)
-	rm -fr $(EJABBERDDIR)
-
-uninstall-all: uninstall-binary
-	rm -rf $(ETCDIR)
-	rm -rf $(EJABBERDDIR)
-	rm -rf $(SPOOLDIR)
-	rm -rf $(CTLLOCKDIR)
-	rm -rf $(LOGDIR)
-
-clean:
-	rm -rf deps/.got
-	rm -rf deps/.built
-	rm -rf test/*.beam
-	$(REBAR) clean
-
-clean-rel:
-	rm -rf rel/ejabberd
-
-distclean: clean clean-rel
-	rm -f config.status
-	rm -f config.log
-	rm -rf autom4te.cache
-	rm -rf deps
-	rm -rf ebin
-	rm -f Makefile
-	rm -f vars.config
-	rm -f src/ejabberd.app.src
-	[ ! -f ../ChangeLog ] || rm -f ../ChangeLog
-
-rel: all
-	$(REBAR) generate
-
-TAGS:
-	etags *.erl
-
-Makefile: Makefile.in
-
-deps := $(wildcard deps/*/ebin)
-
-dialyzer/erlang.plt:
-	@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 tools compiler erts \
-	runtime_tools asn1 observer xmerl et gs wx syntax_tools; \
-	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
-
-dialyzer/deps.plt:
-	@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
-	@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
-
-erlang_plt: dialyzer/erlang.plt
-	@dialyzer --plt dialyzer/erlang.plt --check_plt -o dialyzer/erlang.log; \
-	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
-
-deps_plt: dialyzer/deps.plt
-	@dialyzer --plt dialyzer/deps.plt --check_plt -o dialyzer/deps.log; \
-	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
-
-ejabberd_plt: dialyzer/ejabberd.plt
-	@dialyzer --plt dialyzer/ejabberd.plt --check_plt -o dialyzer/ejabberd.log; \
-	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
-
-dialyzer: erlang_plt deps_plt ejabberd_plt
-	@dialyzer --plts dialyzer/*.plt --no_check_plt \
-	--get_warnings -o dialyzer/error.log ebin; \
-	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
-
-test:
-	@echo "************************** NOTICE ***************************************"
-	@cat test/README
-	@echo "*************************************************************************"
-	@cd priv && ln -sf ../sql
-	$(REBAR) skip_deps=true ct
-
-quicktest:
-	$(REBAR) skip_deps=true ct suites=elixir
-
-.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

README

@@ -1,177 +1,55 @@
-ejabberd Community Edition 
-==========================
-
-[![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd) [![Hex version](https://img.shields.io/hexpm/v/ejabberd.svg "Hex version")](https://hex.pm/packages/ejabberd)
-
-ejabberd is a distributed, fault-tolerant technology that allows the creation
-of large-scale instant messaging applications. The server can reliably support
-thousands of simultaneous users on a single node and has been designed to
-provide exceptional standards of fault tolerance. As an open source
-technology, based on industry-standards, ejabberd can be used to build bespoke
-solutions very cost effectively.
-
-
-Key Features
-------------
-
-- **Cross-platform**  
-  ejabberd runs under Microsoft Windows and Unix-derived systems such as
-  Linux, FreeBSD and NetBSD.
-
-- **Distributed**  
-  You can run ejabberd on a cluster of machines and all of them will serve the
-  same XMPP domain(s). When you need more capacity you can simply add a new
-  cheap node to your cluster. Accordingly, you do not need to buy an expensive
-  high-end machine to support tens of thousands concurrent users.
-
-- **Fault-tolerant**  
-  You can deploy an ejabberd cluster so that all the information required for
-  a properly working service will be replicated permanently on all nodes. This
-  means that if one of the nodes crashes, the others will continue working
-  without disruption. In addition, nodes also can be added or replaced ‘on
-  the fly’.
-
-- **Administrator-friendly**  
-  ejabberd is built on top of the Open Source Erlang. As a result you do not
-  need to install an external database, an external web server, amongst others
-  because everything is already included, and ready to run out of the box.
-  Other administrator benefits include:
-  - Comprehensive documentation.
-  - Straightforward installers for Linux and Mac OS X.
-  - Web administration.
-  - Shared roster groups.
-  - Command line administration tool.
-  - Can integrate with existing authentication mechanisms.
-  - Capability to send announce messages.
-
-- **Internationalized**  
-  ejabberd leads in internationalization. Hence it is very well suited in a
-  globalized world. Related features are:
-  - Translated to 25 languages.
-  - Support for IDNA.
-
-- **Open Standards**  
-  ejabberd is the first Open Source Jabber server claiming to fully comply to
-  the XMPP standard.
-  - Fully XMPP-compliant.
-  - XML-based protocol.
-  - Many protocols supported.
-
-
-Additional Features
--------------------
-
-Moreover, ejabberd comes with a wide range of other state-of-the-art features:
-
-- **Modularity**
-  - Load only the modules you want.
-  - Extend ejabberd with your own custom modules.
-
-- **Security**
-  - SASL and STARTTLS for c2s and s2s connections.
-  - STARTTLS and Dialback s2s connections.
-  - Web Admin accessible via HTTPS secure access.
-
-- **Databases**
-  - Internal database for fast deployment (Mnesia).
-  - Native MySQL support.
-  - Native PostgreSQL support.
-  - ODBC data storage support.
-  - Microsoft SQL Server support.
-
-- **Authentication**
-  - Internal authentication.
-  - PAM, LDAP and ODBC.
-  - External authentication script.
-
-- **Others**
-  - Support for virtual hosting.
-  - Compressing XML streams with Stream Compression (XEP-0138).
-  - Statistics via Statistics Gathering (XEP-0039).
-  - IPv6 support both for c2s and s2s connections.
-  - Multi-User Chat module with support for clustering and HTML logging.
-  - Users Directory based on users vCards.
-  - Publish-Subscribe component with support for Personal Eventing.
-  - Support for web clients: HTTP Polling and HTTP Binding (BOSH).
-  - IRC transport.
-  - Component support: interface with networks such as AIM, ICQ and MSN.
-
+ejabberd - High-Performance Enterprise Instant Messaging Server 
 
 Quickstart guide
-----------------
 
-### 0. Requirements
+
+0. Requirements
 
 To compile ejabberd you need:
-
- - GNU Make.
- - GCC.
- - Libexpat 1.95 or higher.
- - Libyaml 0.1.4 or higher.
- - Erlang/OTP 17.5 or higher.
- - OpenSSL 1.0.0 or higher, for STARTTLS, SASL and SSL encryption.
- - Zlib 1.2.3 or higher, for Stream Compression support (XEP-0138). Optional.
+ - GNU Make
+ - GCC
+ - Libexpat 1.95 or higher
+ - Erlang/OTP R10B-9 or higher. The recommended version is R12B-5.
+   Support for R13 is experimental.
+ - OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL
+   encryption. Optional, highly recommended.
+ - Zlib 1.2.3 or higher, for Stream Compression support
+   (XEP-0138). Optional.
+ - Erlang mysql library. Optional. MySQL authentication/storage.
+ - Erlang pgsql library. Optional. PostgreSQL authentication/storage.
  - PAM library. Optional. For Pluggable Authentication Modules (PAM).
- - GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not
-   needed on systems with GNU Libc.
- - ImageMagick's Convert program. Optional. For CAPTCHA challenges.
+ - GNU Iconv 1.8 or higher, for the IRC Transport
+   (mod_irc). Optional. Not needed on systems with GNU Libc.
+ - ImageMagick’s Convert program. Optional. For CAPTCHA challenges.
+ - exmpp 0.9.2 or higher. Optional. For import/export XEP-0227 files. 
 
-If your system splits packages in libraries and development headers, you must
-install the development packages also.
 
-### 1. Compile and install on *nix systems
+1. Compile and install on *nix systems
 
-To compile ejabberd, execute the following commands.  The first one is only
-necessary if your source tree didn't come with a `configure` script (In this
-case you need autoconf installed).
+To compile ejabberd, go to the directory src/ and execute the commands:
+  ./configure
+  make
 
-    ./autogen.sh
-    ./configure
-    make
+To install ejabberd, run this command with system administrator rights
+(root user):
 
-To install ejabberd, run this command with system administrator rights (root
-user):
-
-    sudo make install
+  sudo make install
 
 These commands will:
-
-- Install the configuration files in `/etc/ejabberd/`
-- Install ejabberd binary, header and runtime files in `/lib/ejabberd/`
-- Install the administration script: `/sbin/ejabberdctl`
-- Install ejabberd documentation in `/share/doc/ejabberd/`
-- Create a spool directory: `/var/lib/ejabberd/`
-- Create a directory for log files: `/var/log/ejabberd/`
+ - Install the configuration files in /etc/ejabberd/
+ - Install ejabberd binary, header and runtime files in /lib/ejabberd/
+ - Install the administration script: /sbin/ejabberdctl
+ - Install ejabberd documentation in /share/doc/ejabberd/
+ - Create a spool directory: /var/lib/ejabberd/
+ - Create a directory for log files: /var/log/ejabberd/
 
 
-### 2. Start ejabberd
+2. Start ejabberd
 
-You can use the `ejabberdctl` command line administration script to
+You can use the ejabberdctl command line administration script to
 start and stop ejabberd. For example:
-
-    ejabberdctl start
+  ejabberdctl start
 
 
-For detailed information please refer to the ejabberd Installation and
-Operation Guide available online and in the `doc` directory of the source
-tarball.
-
-
-Development
------------
-
-In order to assist in the development of ejabberd, and particularly the
-execution of the test suite, a Vagrant environment is available at
-https://github.com/processone/ejabberd-vagrant-dev.
-
-To start ejabberd in development mode from the repository directory, you can
-type a command like:
-
-    EJABBERD_CONFIG_PATH=ejabberd.yml erl -pa ebin -pa deps/*/ebin -pa test -pa deps/elixir/lib/*/ebin/ -s ejabberd
-
-Links
------
-
-- Documentation: http://docs.ejabberd.im
-- Community site: https://www.ejabberd.im
-- ejabberd commercial offering and support: https://www.process-one.net/en/ejabberd
+For detailed information please refer to the
+ejabberd Installation and Operation Guide

README.md

@@ -1 +0,0 @@
-README

autogen.sh

@@ -1,3 +0,0 @@
-# generate a new autoconf
-aclocal -I m4
-autoconf -f

config/config.exs

@@ -1,10 +0,0 @@
-use Mix.Config
-
-# This is standard path in the context of ejabberd release
-config :ejabberd,
-  file: "config/ejabberd.yml",
-  log_path: 'log/ejabberd.log'
-
-# Customize Mnesia directory:
-config :mnesia,
-  dir: 'database/'

config/ejabberd.exs

@@ -1,169 +0,0 @@
-defmodule Ejabberd.ConfigFile do
-  use Ejabberd.Config
-
-  def start do
-    [loglevel: 4,
-     log_rotate_size: 10485760,
-     log_rotate_date: "",
-     log_rotate_count: 1,
-     log_rate_limit: 100,
-     auth_method: :internal,
-     max_fsm_queue: 1000,
-     language: "en",
-     allow_contrib_modules: true,
-     hosts: ["localhost"],
-     shaper: shaper,
-     acl: acl,
-     access: access]
-  end
-
-  defp shaper do
-    [normal: 1000,
-      fast: 50000,
-      max_fsm_queue: 1000]
-  end
-
-  defp acl do
-    [local:
-      [user_regexp: "", loopback: [ip: "127.0.0.0/8"]]]
-  end
-
-  defp access do
-    [max_user_sessions: [all: 10],
-     max_user_offline_messages: [admin: 5000, all: 100],
-     local: [local: :allow],
-     c2s: [blocked: :deny, all: :allow],
-     c2s_shaper: [admin: :none, all: :normal],
-     s2s_shaper: [all: :fast],
-     announce: [admin: :allow],
-     configure: [admin: :allow],
-     muc_admin: [admin: :allow],
-     muc_create: [local: :allow],
-     muc: [all: :allow],
-     pubsub_createnode: [local: :allow],
-     register: [all: :allow],
-     trusted_network: [loopback: :allow]]
-  end
-
-  listen :ejabberd_c2s do
-    @opts [
-      port: 5222,
-      max_stanza_size: 65536,
-      shaper: :c2s_shaper,
-      access: :c2s]
-  end
-
-  listen :ejabberd_s2s_in do
-    @opts [port: 5269]
-  end
-
-  listen :ejabberd_http do
-    @opts [
-      port: 5280,
-      web_admin: true,
-      http_poll: true,
-      http_bind: true,
-      captcha: true]
-  end
-
-  module :mod_adhoc do
-  end
-
-  module :mod_announce do
-    @opts [access: :announce]
-  end
-
-  module :mod_blocking do
-  end
-
-  module :mod_caps do
-  end
-
-  module :mod_carboncopy do
-  end
-
-  module :mod_client_state do
-    @opts [
-      queue_chat_states: true,
-      queue_presence: false]
-  end
-
-  module :mod_configure do
-  end
-
-  module :mod_disco do
-  end
-
-  module :mod_irc do
-  end
-
-  module :mod_http_bind do
-  end
-
-  module :mod_last do
-  end
-
-  module :mod_muc do
-    @opts [
-      access: :muc,
-      access_create: :muc_create,
-      access_persistent: :muc_create,
-      access_admin: :muc_admin]
-  end
-
-  module :mod_offline do
-    @opts [access_max_user_messages: :max_user_offline_messages]
-  end
-
-  module :mod_ping do
-  end
-
-  module :mod_privacy do
-  end
-
-  module :mod_private do
-  end
-
-  module :mod_pubsub do
-    @opts [
-      access_createnode: :pubsub_createnode,
-      ignore_pep_from_offline: true,
-      last_item_cache: true,
-      plugins: ["flat", "hometree", "pep"]]
-  end
-
-  module :mod_register do
-    @opts [welcome_message: [
-      subject: "Welcome!",
-      body: "Hi.\nWelcome to this XMPP Server",
-      ip_access: :trusted_network,
-      access: :register]]
-  end
-
-  module :mod_roster do
-  end
-
-  module :mod_shared_roster do
-  end
-
-  module :mod_stats do
-  end
-
-  module :mod_time do
-  end
-
-  module :mod_version do
-  end
-
-  # Example of how to define a hook, called when the event
-  # specified is triggered.
-  #
-  # @event: Name of the event
-  # @opts: Params are optional. Available: :host and :priority.
-  #        If missing, defaults are used. (host: :global | priority: 50)
-  # @callback Could be an anonymous function or a callback from a module,
-  #           use the &ModuleName.function/arity format for that.
-  hook :register_user, [host: "localhost"], fn(user, server) ->
-    info("User registered: #{user} on #{server}")
-  end
-end

config/ejabberd.yml

@@ -1,667 +0,0 @@
-###
-###               ejabberd configuration file
-###
-###
-
-### The parameters used in this configuration file are explained in more detail
-### in the ejabberd Installation and Operation Guide.
-### Please consult the Guide in case of doubts, it is included with
-### your copy of ejabberd, and is also available online at
-### http://www.process-one.net/en/ejabberd/docs/
-
-### The configuration file is written in YAML.
-### Refer to http://en.wikipedia.org/wiki/YAML for the brief description.
-### However, ejabberd treats different literals as different types:
-###
-### - unquoted or single-quoted strings. They are called "atoms".
-###   Example: dog, 'Jupiter', '3.14159', YELLOW
-###
-### - numeric literals. Example: 3, -45.0, .0
-###
-### - quoted or folded strings.
-###   Examples of quoted string: "Lizzard", "orange".
-###   Example of folded string:
-###   > Art thou not Romeo,
-###     and a Montague?
-
-###   =======
-###   LOGGING
-
-##
-## loglevel: Verbosity of log files generated by ejabberd.
-## 0: No ejabberd log at all (not recommended)
-## 1: Critical
-## 2: Error
-## 3: Warning
-## 4: Info
-## 5: Debug
-##
-loglevel: 4
-
-##
-## rotation: Describe how to rotate logs. Either size and/or date can trigger
-## log rotation. Setting count to N keeps N rotated logs. Setting count to 0
-## does not disable rotation, it instead rotates the file and keeps no previous
-## versions around. Setting size to X rotate log when it reaches X bytes.
-## To disable rotation set the size to 0 and the date to ""
-## Date syntax is taken from the syntax newsyslog uses in newsyslog.conf.
-## Some examples:
-##  $D0     rotate every night at midnight
-##  $D23    rotate every day at 23:00 hr
-##  $W0D23  rotate every week on Sunday at 23:00 hr
-##  $W5D16  rotate every week on Friday at 16:00 hr
-##  $M1D0   rotate on the first day of every month at midnight
-##  $M5D6   rotate on every 5th day of the month at 6:00 hr
-##
-log_rotate_size: 10485760
-log_rotate_date: ""
-log_rotate_count: 1
-
-##
-## overload protection: If you want to limit the number of messages per second
-## allowed from error_logger, which is a good idea if you want to avoid a flood
-## of messages when system is overloaded, you can set a limit.
-## 100 is ejabberd's default.
-log_rate_limit: 100
-
-##
-## watchdog_admins: Only useful for developers: if an ejabberd process
-## consumes a lot of memory, send live notifications to these XMPP
-## accounts.
-##
-## watchdog_admins:
-##   - "bob@example.com"
-
-
-###   ================
-###   SERVED HOSTNAMES
-
-##
-## hosts: Domains served by ejabberd.
-## You can define one or several, for example:
-## hosts:
-##   - "example.net"
-##   - "example.com"
-##   - "example.org"
-##
-hosts:
-  - "localhost"
-
-##
-## route_subdomains: Delegate subdomains to other XMPP servers.
-## For example, if this ejabberd serves example.org and you want
-## to allow communication with an XMPP server called im.example.org.
-##
-## route_subdomains: s2s
-
-###   ===============
-###   LISTENING PORTS
-
-##
-## listen: The ports ejabberd will listen on, which service each is handled
-## by and what options to start it with.
-##
-listen:
-  -
-    port: 5222
-    module: ejabberd_c2s
-    ##
-    ## If TLS is compiled in and you installed a SSL
-    ## certificate, specify the full path to the
-    ## file and uncomment these lines:
-    ##
-    ## certfile: "/path/to/ssl.pem"
-    ## starttls: true
-    ##
-    ## To enforce TLS encryption for client connections,
-    ## use this instead of the "starttls" option:
-    ##
-    ## starttls_required: true
-    ##
-    ## Custom OpenSSL options
-    ##
-    ## protocol_options:
-    ##   - "no_sslv3"
-    ##   - "no_tlsv1"
-    max_stanza_size: 65536
-    shaper: c2s_shaper
-    access: c2s
-  -
-    port: 5269
-    module: ejabberd_s2s_in
-  ##
-  ## ejabberd_service: Interact with external components (transports, ...)
-  ##
-  ## -
-  ##   port: 8888
-  ##   module: ejabberd_service
-  ##   access: all
-  ##   shaper_rule: fast
-  ##   ip: "127.0.0.1"
-  ##   hosts:
-  ##     "icq.example.org":
-  ##       password: "secret"
-  ##     "sms.example.org":
-  ##       password: "secret"
-
-  ##
-  ## ejabberd_stun: Handles STUN Binding requests
-  ##
-  ## -
-  ##   port: 3478
-  ##   transport: udp
-  ##   module: ejabberd_stun
-
-  ##
-  ## To handle XML-RPC requests that provide admin credentials:
-  ##
-  ## -
-  ##   port: 4560
-  ##   module: ejabberd_xmlrpc
-  -
-    port: 5280
-    module: ejabberd_http
-    ## request_handlers:
-    ##   "/pub/archive": mod_http_fileserver
-    web_admin: true
-    http_poll: true
-    http_bind: true
-    ## register: true
-    captcha: true
-
-##
-## s2s_use_starttls: Enable STARTTLS + Dialback for S2S connections.
-## Allowed values are: false optional required required_trusted
-## You must specify a certificate file.
-##
-## s2s_use_starttls: optional
-
-##
-## s2s_certfile: Specify a certificate file.
-##
-## s2s_certfile: "/path/to/ssl.pem"
-
-## Custom OpenSSL options
-##
-## s2s_protocol_options:
-##   - "no_sslv3"
-##   - "no_tlsv1"
-
-##
-## domain_certfile: Specify a different certificate for each served hostname.
-##
-## host_config:
-##   "example.org":
-##     domain_certfile: "/path/to/example_org.pem"
-##   "example.com":
-##     domain_certfile: "/path/to/example_com.pem"
-
-##
-## S2S whitelist or blacklist
-##
-## Default s2s policy for undefined hosts.
-##
-## s2s_access: s2s
-
-##
-## Outgoing S2S options
-##
-## Preferred address families (which to try first) and connect timeout
-## in milliseconds.
-##
-## outgoing_s2s_families:
-##   - ipv4
-##   - ipv6
-## outgoing_s2s_timeout: 10000
-
-###   ==============
-###   AUTHENTICATION
-
-##
-## auth_method: Method used to authenticate the users.
-## The default method is the internal.
-## If you want to use a different method,
-## comment this line and enable the correct ones.
-##
-auth_method: internal
-
-##
-## Store the plain passwords or hashed for SCRAM:
-## auth_password_format: plain
-## auth_password_format: scram
-##
-## Define the FQDN if ejabberd doesn't detect it:
-## fqdn: "server3.example.com"
-
-##
-## Authentication using external script
-## Make sure the script is executable by ejabberd.
-##
-## auth_method: external
-## extauth_program: "/path/to/authentication/script"
-
-##
-## Authentication using ODBC
-## Remember to setup a database in the next section.
-##
-## auth_method: odbc
-
-##
-## Authentication using PAM
-##
-## auth_method: pam
-## pam_service: "pamservicename"
-
-##
-## Authentication using LDAP
-##
-## auth_method: ldap
-##
-## List of LDAP servers:
-## ldap_servers:
-##   - "localhost"
-##
-## Encryption of connection to LDAP servers:
-## ldap_encrypt: none
-## ldap_encrypt: tls
-##
-## Port to connect to on LDAP servers:
-## ldap_port: 389
-## ldap_port: 636
-##
-## LDAP manager:
-## ldap_rootdn: "dc=example,dc=com"
-##
-## Password of LDAP manager:
-## ldap_password: "******"
-##
-## Search base of LDAP directory:
-## ldap_base: "dc=example,dc=com"
-##
-## LDAP attribute that holds user ID:
-## ldap_uids:
-##   - "mail": "%u@mail.example.org"
-##
-## LDAP filter:
-## ldap_filter: "(objectClass=shadowAccount)"
-
-##
-## Anonymous login support:
-##   auth_method: anonymous
-##   anonymous_protocol: sasl_anon | login_anon | both
-##   allow_multiple_connections: true | false
-##
-## host_config:
-##   "public.example.org":
-##     auth_method: anonymous
-##     allow_multiple_connections: false
-##     anonymous_protocol: sasl_anon
-##
-## To use both anonymous and internal authentication:
-##
-## host_config:
-##   "public.example.org":
-##     auth_method:
-##       - internal
-##       - anonymous
-
-###   ==============
-###   DATABASE SETUP
-
-## ejabberd by default uses the internal Mnesia database,
-## so you do not necessarily need this section.
-## This section provides configuration examples in case
-## you want to use other database backends.
-## Please consult the ejabberd Guide for details on database creation.
-
-##
-## MySQL server:
-##
-## odbc_type: mysql
-## odbc_server: "server"
-## odbc_database: "database"
-## odbc_username: "username"
-## odbc_password: "password"
-##
-## If you want to specify the port:
-## odbc_port: 1234
-
-##
-## PostgreSQL server:
-##
-## odbc_type: pgsql
-## odbc_server: "server"
-## odbc_database: "database"
-## odbc_username: "username"
-## odbc_password: "password"
-##
-## If you want to specify the port:
-## odbc_port: 1234
-##
-## If you use PostgreSQL, have a large database, and need a
-## faster but inexact replacement for "select count(*) from users"
-##
-## pgsql_users_number_estimate: true
-
-##
-## ODBC compatible or MSSQL server:
-##
-## odbc_type: odbc
-## odbc_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
-
-##
-## Number of connections to open to the database for each virtual host
-##
-## odbc_pool_size: 10
-
-##
-## Interval to make a dummy SQL request to keep the connections to the
-## database alive. Specify in seconds: for example 28800 means 8 hours
-##
-## odbc_keepalive_interval: undefined
-
-###   ===============
-###   TRAFFIC SHAPERS
-
-shaper:
-  ##
-  ## The "normal" shaper limits traffic speed to 1000 B/s
-  ##
-  normal: 1000
-
-  ##
-  ## The "fast" shaper limits traffic speed to 50000 B/s
-  ##
-  fast: 50000
-
-##
-## This option specifies the maximum number of elements in the queue
-## of the FSM. Refer to the documentation for details.
-##
-max_fsm_queue: 1000
-
-###.   ====================
-###'   ACCESS CONTROL LISTS
-acl:
-  ##
-  ## The 'admin' ACL grants administrative privileges to XMPP accounts.
-  ## You can put here as many accounts as you want.
-  ##
-  ## admin:
-  ##   user:
-  ##     - "aleksey": "localhost"
-  ##     - "ermine": "example.org"
-  ##
-  ## Blocked users
-  ##
-  ## blocked:
-  ##   user:
-  ##     - "baduser": "example.org"
-  ##     - "test"
-
-  ## Local users: don't modify this.
-  ##
-  local:
-    user_regexp: ""
-
-  ##
-  ## More examples of ACLs
-  ##
-  ## jabberorg:
-  ##   server:
-  ##     - "jabber.org"
-  ## aleksey:
-  ##   user:
-  ##     - "aleksey": "jabber.ru"
-  ## test:
-  ##   user_regexp: "^test"
-  ##   user_glob: "test*"
-
-  ##
-  ## Loopback network
-  ##
-  loopback:
-    ip:
-      - "127.0.0.0/8"
-
-  ##
-  ## Bad XMPP servers
-  ##
-  ## bad_servers:
-  ##   server:
-  ##     - "xmpp.zombie.org"
-  ##     - "xmpp.spam.com"
-
-##
-## Define specific ACLs in a virtual host.
-##
-## host_config:
-##   "localhost":
-##     acl:
-##       admin:
-##         user:
-##           - "bob-local": "localhost"
-
-###   ============
-###   ACCESS RULES
-access:
-  ## Maximum number of simultaneous sessions allowed for a single user:
-  max_user_sessions:
-    all: 10
-  ## Maximum number of offline messages that users can have:
-  max_user_offline_messages:
-    admin: 5000
-    all: 100
-  ## This rule allows access only for local users:
-  local:
-    local: allow
-  ## Only non-blocked users can use c2s connections:
-  c2s:
-    blocked: deny
-    all: allow
-  ## For C2S connections, all users except admins use the "normal" shaper
-  c2s_shaper:
-    admin: none
-    all: normal
-  ## All S2S connections use the "fast" shaper
-  s2s_shaper:
-    all: fast
-  ## Only admins can send announcement messages:
-  announce:
-    admin: allow
-  ## Only admins can use the configuration interface:
-  configure:
-    admin: allow
-  ## Admins of this server are also admins of the MUC service:
-  muc_admin:
-    admin: allow
-  ## Only accounts of the local ejabberd server can create rooms:
-  muc_create:
-    local: allow
-  ## All users are allowed to use the MUC service:
-  muc:
-    all: allow
-  ## Only accounts on the local ejabberd server can create Pubsub nodes:
-  pubsub_createnode:
-    local: allow
-  ## In-band registration allows registration of any possible username.
-  ## To disable in-band registration, replace 'allow' with 'deny'.
-  register:
-    all: allow
-  ## Only allow to register from localhost
-  trusted_network:
-    loopback: allow
-  ## Do not establish S2S connections with bad servers
-  ## s2s:
-  ##   bad_servers: deny
-  ##   all: allow
-
-## By default the frequency of account registrations from the same IP
-## is limited to 1 account every 10 minutes. To disable, specify: infinity
-## registration_timeout: 600
-
-##
-## Define specific Access Rules in a virtual host.
-##
-## host_config:
-##   "localhost":
-##     access:
-##       c2s:
-##         admin: allow
-##         all: deny
-##       register:
-##         all: deny
-
-###   ================
-###   DEFAULT LANGUAGE
-
-##
-## language: Default language used for server messages.
-##
-language: "en"
-
-##
-## Set a different default language in a virtual host.
-##
-## host_config:
-##   "localhost":
-##     language: "ru"
-
-###   =======
-###   CAPTCHA
-
-##
-## Full path to a script that generates the image.
-##
-## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
-
-##
-## Host for the URL and port where ejabberd listens for CAPTCHA requests.
-##
-## captcha_host: "example.org:5280"
-
-##
-## Limit CAPTCHA calls per minute for JID/IP to avoid DoS.
-##
-## captcha_limit: 5
-
-###   =======
-###   MODULES
-
-##
-## Modules enabled in all ejabberd virtual hosts.
-##
-modules:
-  mod_adhoc: {}
-  ## mod_admin_extra: {}
-  mod_announce: # recommends mod_adhoc
-    access: announce
-  mod_blocking: {} # requires mod_privacy
-  mod_caps: {}
-  mod_carboncopy: {}
-  mod_client_state:
-    queue_chat_states: true
-    queue_presence: false
-  mod_configure: {} # requires mod_adhoc
-  mod_disco: {}
-  ## mod_echo: {}
-  mod_irc: {}
-  mod_http_bind: {}
-  ## mod_http_fileserver:
-  ##   docroot: "/var/www"
-  ##   accesslog: "/var/log/ejabberd/access.log"
-  mod_last: {}
-  mod_muc:
-    ## host: "conference.@HOST@"
-    access: muc
-    access_create: muc_create
-    access_persistent: muc_create
-    access_admin: muc_admin
-  ## mod_muc_log: {}
-  mod_offline:
-    access_max_user_messages: max_user_offline_messages
-  mod_ping: {}
-  ## mod_pres_counter:
-  ##   count: 5
-  ##   interval: 60
-  mod_privacy: {}
-  mod_private: {}
-  ## mod_proxy65: {}
-  mod_pubsub:
-    access_createnode: pubsub_createnode
-    ## reduces resource comsumption, but XEP incompliant
-    ignore_pep_from_offline: true
-    ## XEP compliant, but increases resource comsumption
-    ## ignore_pep_from_offline: false
-    last_item_cache: false
-    plugins:
-      - "flat"
-      - "hometree"
-      - "pep" # pep requires mod_caps
-  mod_register:
-    ##
-    ## Protect In-Band account registrations with CAPTCHA.
-    ##
-    ## captcha_protected: true
-
-    ##
-    ## Set the minimum informational entropy for passwords.
-    ##
-    ## password_strength: 32
-
-    ##
-    ## After successful registration, the user receives
-    ## a message with this subject and body.
-    ##
-    welcome_message:
-      subject: "Welcome!"
-      body: |-
-        Hi.
-        Welcome to this XMPP server.
-
-    ##
-    ## When a user registers, send a notification to
-    ## these XMPP accounts.
-    ##
-    ## registration_watchers:
-    ##   - "admin1@example.org"
-
-    ##
-    ## Only clients in the server machine can register accounts
-    ##
-    ip_access: trusted_network
-
-    ##
-    ## Local c2s or remote s2s users cannot register accounts
-    ##
-    ## access_from: deny
-
-    access: register
-  mod_roster: {}
-  mod_shared_roster: {}
-  mod_stats: {}
-  mod_time: {}
-  mod_vcard: {}
-  mod_version: {}
-
-##
-## Enable modules with custom options in a specific virtual host
-##
-## host_config:
-##   "localhost":
-##     modules:
-##       mod_echo:
-##         host: "mirror.localhost"
-
-##
-## Enable modules management via ejabberdctl for installation and
-## uninstallation of public/private contributed modules
-## (enabled by default)
-##
-
-allow_contrib_modules: true
-
-### Local Variables:
-### mode: yaml
-### End:
-### vim: set filetype=yaml tabstop=8

configure.ac

@@ -1,308 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.53)
-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
-REQUIRE_ERLANG_MIN="6.4 (Erlang/OTP 17.5)"
-REQUIRE_ERLANG_MAX="100.0.0 (No Max)"
-
-AC_CONFIG_MACRO_DIR([m4])
-
-# Checks for programs.
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-AC_PROG_SED
-
-if test "x$GCC" = "xyes"; then
-    CFLAGS="$CFLAGS -Wall"
-fi
-
-# Checks Erlang runtime and compiler
-AC_ARG_WITH(erlang,
-	AC_HELP_STRING([--with-erlang=dir],
-		[search for erlang in dir]),
-[if test "$withval" = "yes" -o "$withval" = "no" -o "X$with_erlang" = "X"; then
-    extra_erl_path=""
-else
-    extra_erl_path="$with_erlang:$with_erlang/bin:"
-fi
-])
-
-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_ERLANG_NEED_ERL
-AC_ERLANG_NEED_ERLC
-
-AC_ARG_ENABLE(erlang-version-check,
-[AC_HELP_STRING([--enable-erlang-version-check],
-	[Check Erlang/OTP version @<:@default=yes@:>@])])
-case "$enable_erlang_version_check" in
-	yes|'')
-		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
-		;;
-	no)
-		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])
-		;;
-esac
-
-# Checks and sets ERLANG_ROOT_DIR and ERLANG_LIB_DIR variable
-AC_ERLANG_SUBST_ROOT_DIR
-# AC_ERLANG_SUBST_LIB_DIR
-
-#locating escript
-AC_PATH_PROG([ESCRIPT], [escript], [], [$ERLANG_ROOT_DIR/bin])
-
-#locating make
-AC_CHECK_PROG([MAKE], [make], [make], [])
-
-if test "x$ESCRIPT" = "x"; then
-   AC_MSG_ERROR(['escript' was not found])
-fi
-
-if test "x$MAKE" = "x"; then
-   AC_MSG_ERROR(['make' was not found])
-fi
-
-# Change default prefix
-AC_PREFIX_DEFAULT(/usr/local)
-
-AC_ARG_ENABLE(hipe,
-[AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])],
-[case "${enableval}" in
-  yes) hipe=true ;;
-  no)  hipe=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-hipe) ;;
-esac],[hipe=false])
-
-AC_ARG_ENABLE(roster_gateway_workaround,
-[AC_HELP_STRING([--enable-roster-gateway-workaround], [turn on workaround for processing gateway subscriptions (default: no)])],
-[case "${enableval}" in
-  yes) roster_gateway_workaround=true ;;
-  no)  roster_gateway_workaround=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-roster-gateway-workaround) ;;
-esac],[roster_gateway_workaround=false])
-
-AC_ARG_ENABLE(new_sql_schema,
-[AC_HELP_STRING([--enable-new-sql-schema], [use new SQL schema (default: no)])],
-[case "${enableval}" in
-  yes) new_sql_schema=true ;;
-  no)  new_sql_schema=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-new-sql-schema) ;;
-esac],[new_sql_schema=false])
-
-AC_ARG_ENABLE(full_xml,
-[AC_HELP_STRING([--enable-full-xml], [use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)])],
-[case "${enableval}" in
-  yes) full_xml=true ;;
-  no)  full_xml=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-full-xml) ;;
-esac],[full_xml=false])
-
-AC_ARG_ENABLE(mssql,
-[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
-[case "${enableval}" in
-  yes) db_type=mssql ;;
-  no)  db_type=generic ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mssql) ;;
-esac],[db_type=generic])
-
-AC_ARG_ENABLE(all,
-[AC_HELP_STRING([--enable-all], [same as --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-elixir --enable-iconv --enable-stun --enable-sip --enable-debug --enable-tools (useful for Dialyzer checks, default: no)])],
-[case "${enableval}" in
-  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true elixir=true iconv=true stun=true sip=true debug=true tools=true ;;
-  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false redis=false elixir=false iconv=false stun=false sip=false debug=false tools=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
-esac],[])
-
-AC_ARG_ENABLE(tools,
-[AC_HELP_STRING([--enable-tools], [build development tools (default: no)])],
-[case "${enableval}" in
-  yes) tools=true ;;
-  no)  tools=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
-esac],[if test "x$tools" = "x"; then tools=false; fi])
-
-AC_ARG_ENABLE(odbc,
-[AC_HELP_STRING([--enable-odbc], [enable pure ODBC support (default: no)])],
-[case "${enableval}" in
-  yes) odbc=true ;;
-  no)  odbc=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-odbc) ;;
-esac],[if test "x$odbc" = "x"; then odbc=false; fi])
-
-AC_ARG_ENABLE(mysql,
-[AC_HELP_STRING([--enable-mysql], [enable MySQL support (default: no)])],
-[case "${enableval}" in
-  yes) mysql=true ;;
-  no)  mysql=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mysql) ;;
-esac],[if test "x$mysql" = "x"; then mysql=false; fi])
-
-AC_ARG_ENABLE(pgsql,
-[AC_HELP_STRING([--enable-pgsql], [enable PostgreSQL support (default: no)])],
-[case "${enableval}" in
-  yes) pgsql=true ;;
-  no)  pgsql=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pgsql) ;;
-esac],[if test "x$pgsql" = "x"; then pgsql=false; fi])
-
-AC_ARG_ENABLE(sqlite,
-[AC_HELP_STRING([--enable-sqlite], [enable SQLite support (default: no)])],
-[case "${enableval}" in
-  yes) sqlite=true ;;
-  no)  sqlite=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sqlite) ;;
-esac],[if test "x$sqlite" = "x"; then sqlite=false; fi])
-
-AC_ARG_ENABLE(pam,
-[AC_HELP_STRING([--enable-pam], [enable PAM support (default: no)])],
-[case "${enableval}" in
-  yes) pam=true ;;
-  no)  pam=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pam) ;;
-esac],[if test "x$pam" = "x"; then pam=false; fi])
-
-AC_ARG_ENABLE(zlib,
-[AC_HELP_STRING([--enable-zlib], [enable Stream Compression (XEP-0138) using zlib (default: yes)])],
-[case "${enableval}" in
-  yes) zlib=true ;;
-  no)  zlib=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-zlib) ;;
-esac],[if test "x$zlib" = "x"; then zlib=true; fi])
-
-AC_ARG_ENABLE(riak,
-[AC_HELP_STRING([--enable-riak], [enable Riak support (default: no)])],
-[case "${enableval}" in
-  yes) riak=true ;;
-  no)  riak=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-riak) ;;
-esac],[if test "x$riak" = "x"; then riak=false; fi])
-
-AC_ARG_ENABLE(redis,
-[AC_HELP_STRING([--enable-redis], [enable Redis support (default: no)])],
-[case "${enableval}" in
-  yes) redis=true ;;
-  no)  redis=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-redis) ;;
-esac],[if test "x$redis" = "x"; then redis=false; fi])
-
-AC_ARG_ENABLE(elixir,
-[AC_HELP_STRING([--enable-elixir], [enable Elixir support (default: no)])],
-[case "${enableval}" in
-  yes) elixir=true ;;
-  no)  elixir=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-elixir) ;;
-esac],[if test "x$elixir" = "x"; then elixir=false; fi])
-
-AC_ARG_ENABLE(iconv,
-[AC_HELP_STRING([--enable-iconv], [enable iconv support (default: yes)])],
-[case "${enableval}" in
-  yes) iconv=true ;;
-  no)  iconv=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-iconv) ;;
-esac],[if test "x$iconv" = "x"; then iconv=true; fi])
-
-AC_ARG_ENABLE(debug,
-[AC_HELP_STRING([--enable-debug], [enable debug information (default: yes)])],
-[case "${enableval}" in
-  yes) debug=true ;;
-  no)  debug=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-esac],[if test "x$debug" = "x"; then debug=true; fi])
-
-AC_ARG_ENABLE(latest_deps,
-[AC_HELP_STRING([--enable-latest-deps], [makes rebar use latest commits for dependences instead of tagged versions (default: no)])],
-[case "${enableval}" in
-  yes) latest_deps=true ;;
-  no)  latest_deps=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-latest-deps) ;;
-esac],[if test "x$latest_deps" = "x"; then latest_deps=false; fi])
-
-AC_ARG_ENABLE(system_deps,
-[AC_HELP_STRING([--enable-system-deps], [makes rebar use localy installed dependences instead of downloading them (default: no)])],
-[case "${enableval}" in
-  yes) system_deps=true ;;
-  no)  system_deps=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-deps) ;;
-esac],[if test "x$system_deps" = "x"; then system_deps=false; fi])
-
-AC_ARG_ENABLE(stun,
-[AC_HELP_STRING([--enable-stun], [enable STUN/TURN support (default: no)])],
-[case "${enableval}" in
-  yes) stun=true ;;
-  no)  stun=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-stun) ;;
-esac],[if test "x$stun" = "x"; then stun=false; fi])
-
-AC_ARG_ENABLE(sip,
-[AC_HELP_STRING([--enable-sip], [enable SIP support (default: no)])],
-[case "${enableval}" in
-  yes) sip=true ;;
-  no)  sip=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sip) ;;
-esac],[if test "x$sip" = "x"; then sip=false; fi])
-
-AC_ARG_ENABLE(graphics,
-[AC_HELP_STRING([--enable-graphics], [enable support for graphic images manipulation (default: yes)])],
-[case "${enableval}" in
-  yes) graphics=true ;;
-  no)  graphics=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-graphics) ;;
-esac],[if test "x$graphics" = "x"; then graphics=true; fi])
-
-AC_CONFIG_FILES([Makefile
-		 vars.config
-		 src/ejabberd.app.src])
-
-ENABLEUSER=""
-AC_ARG_ENABLE(user,
-  [AS_HELP_STRING([--enable-user[[[[=USER]]]]], [allow this system user to start ejabberd (default: no)])],
-  [case "${enableval}" in
-     yes) ENABLEUSER=`whoami` ;;
-     no) ENABLEUSER="" ;;
-     *) ENABLEUSER=$enableval
-   esac],
-  [])
-if test "$ENABLEUSER" != ""; then
-  echo "allow this system user to start ejabberd: $ENABLEUSER"
-  AC_SUBST([INSTALLUSER], [$ENABLEUSER])
-fi
-
-ERLANG_DEPRECATED_TYPES_CHECK
-
-if test "$sqlite" = "true"; then
-   AX_LIB_SQLITE3([3.6.19])
-   if test "x$SQLITE3_VERSION" = "x"; then
-      AC_MSG_ERROR(SQLite3 library >= 3.6.19 was not found)
-   fi
-fi
-
-AC_SUBST(hipe)
-AC_SUBST(roster_gateway_workaround)
-AC_SUBST(new_sql_schema)
-AC_SUBST(full_xml)
-AC_SUBST(db_type)
-AC_SUBST(odbc)
-AC_SUBST(mysql)
-AC_SUBST(pgsql)
-AC_SUBST(sqlite)
-AC_SUBST(pam)
-AC_SUBST(zlib)
-AC_SUBST(riak)
-AC_SUBST(redis)
-AC_SUBST(elixir)
-AC_SUBST(iconv)
-AC_SUBST(stun)
-AC_SUBST(sip)
-AC_SUBST(debug)
-AC_SUBST(graphics)
-AC_SUBST(tools)
-AC_SUBST(latest_deps)
-AC_SUBST(system_deps)
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-
-AC_OUTPUT

contrib/ejabberd-modules.repo

@@ -0,0 +1,5 @@
+% List of ejabberd-modules to add for ejabberd packaging (source archive and installer)
+%
+% HTTP-binding:
+%https://svn.process-one.net/ejabberd-modules/http_bind/trunk
+%https://svn.process-one.net/ejabberd-modules/mod_http_fileserver/trunk

contrib/extract_translations/README

@@ -0,0 +1,21 @@
+extract_translations - auxiliary tool that extracts lines to be translated
+from ejabberd source tree.
+
+Building:
+    erlc extract_translations.erl
+
+Invoking 1:
+    erl -noinput -s extract_translations -extra dirname message_file
+
+    where dirname is the directory "src" in ejabberd's source tree root,
+    message_file is a file with translated messages (src/msgs/*.msg).
+
+    Result is a list of messages from source files which aren't contained in
+    message file.
+
+Invoking 2:
+    erl -noinput -s extract_translations -extra -unused dirname message_file
+
+    Result is a list of messages from message file which aren't in source
+    files anymore.
+

contrib/extract_translations/extract_translations.erl

@@ -0,0 +1,294 @@
+%%%----------------------------------------------------------------------
+%%% File    : extract_translations.erl
+%%% Author  : Sergei Golovan <sgolovan@nes.ru>
+%%% Purpose : Auxiliary tool for interface/messages translators
+%%% Created : 23 Apr 2005 by Sergei Golovan <sgolovan@nes.ru>
+%%% Id      : $Id$
+%%%----------------------------------------------------------------------
+
+-module(extract_translations).
+-author('sgolovan@nes.ru').
+
+-export([start/0]).
+
+-define(STATUS_SUCCESS, 0).
+-define(STATUS_ERROR,   1).
+-define(STATUS_USAGE,   2).
+
+-include_lib("kernel/include/file.hrl").
+
+
+start() ->
+    ets:new(translations, [named_table, public]),
+    ets:new(translations_obsolete, [named_table, public]),
+    ets:new(files, [named_table, public]),
+    ets:new(vars, [named_table, public]),
+    case init:get_plain_arguments() of
+	["-srcmsg2po", Dir, File] ->
+	    print_po_header(File),
+	    Status = process(Dir, File, srcmsg2po),
+	    halt(Status);
+	["-unused", Dir, File] ->
+	    Status = process(Dir, File, unused),
+	    halt(Status);
+	[Dir, File] ->
+	    Status = process(Dir, File, used),
+	    halt(Status);
+	_ ->
+	    print_usage(),
+	    halt(?STATUS_USAGE)
+    end.
+
+
+process(Dir, File, Used) ->
+    case load_file(File) of
+	{error, Reason} ->
+	    io:format("~s: ~s~n", [File, file:format_error(Reason)]),
+	    ?STATUS_ERROR;
+	_ ->
+	    FileList = find_src_files(Dir),
+	    lists:foreach(
+	      fun(F) ->
+		    parse_file(Dir, F, Used)
+	      end, FileList),
+	    case Used of
+		unused ->
+		    ets:foldl(fun({Key, _}, _) ->
+				      io:format("~p~n", [Key])
+			      end, ok, translations);
+		srcmsg2po ->
+		    ets:foldl(fun({Key, Trans}, _) ->
+				      print_translation_obsolete(Key, Trans)
+			      end, ok, translations_obsolete);
+		_ ->
+		    ok
+	    end,
+	    ?STATUS_SUCCESS
+    end.
+
+parse_file(Dir, File, Used) ->
+    ets:delete_all_objects(vars),
+    case epp:parse_file(File, [Dir, filename:dirname(File) | code:get_path()], []) of
+	{ok, Forms} ->
+	    lists:foreach(
+	      fun(F) ->
+		    parse_form(Dir, File, F, Used)
+	      end, Forms);
+	_ ->
+	    ok
+    end.
+
+parse_form(Dir, File, Form, Used) ->
+    case Form of
+	%%{undefined, Something} ->
+        %% io:format("Undefined: ~p~n", [Something]);
+	{call,
+	 _,
+	 {remote, _, {atom, _, translate}, {atom, _, translate}},
+	 [_, {string, Line, Str}]
+	} ->
+	    process_string(Dir, File, Line, Str, Used);
+	{call,
+	 _,
+	 {remote, _, {atom, _, translate}, {atom, _, translate}},
+	 [_, {var, _, Name}]
+	} ->
+	    case ets:lookup(vars, Name) of
+		[{_Name, Value, Line}] ->
+		    process_string(Dir, File, Line, Value, Used);
+		_ ->
+		    ok
+	    end;
+	{match,
+	 _,
+	 {var, _, Name},
+	 {string, Line, Value}
+	} ->
+	    ets:insert(vars, {Name, Value, Line});
+	L when is_list(L) ->
+	    lists:foreach(
+	      fun(F) ->
+		      parse_form(Dir, File, F, Used)
+	      end, L);
+	T when is_tuple(T) ->
+	    lists:foreach(
+	      fun(F) ->
+		      parse_form(Dir, File, F, Used)
+	      end, tuple_to_list(T));
+	_ ->
+	    ok
+    end.
+	    
+process_string(_Dir, _File, _Line, "", _Used) ->
+    ok;
+
+process_string(_Dir, File, Line, Str, Used) ->
+    case {ets:lookup(translations, Str), Used} of
+	{[{_Key, _Trans}], unused} ->
+	    ets:delete(translations, Str);
+	{[{_Key, _Trans}], used} ->
+	    ok;
+	{[{_Key, Trans}], srcmsg2po} ->
+	    ets:delete(translations_obsolete, Str),
+	    print_translation(File, Line, Str, Trans);
+	{_, used} ->
+	    case ets:lookup(files, File) of
+		[{_}] ->
+		    ok;
+		_ ->
+		    io:format("~n% ~s~n", [File]),
+		    ets:insert(files, {File})
+	    end,
+	    case Str of
+		[] -> ok;
+		_ -> io:format("{~p, \"\"}.~n", [Str])
+	    end,
+	    ets:insert(translations, {Str, ""});
+	{_, srcmsg2po} ->
+	    case ets:lookup(files, File) of
+		[{_}] ->
+		    ok;
+		_ ->
+		    ets:insert(files, {File})
+	    end,
+	    ets:insert(translations, {Str, ""}),
+	    print_translation(File, Line, Str, "");
+	_ ->
+	    ok
+    end.
+
+load_file(File) ->
+    case file:consult(File) of
+	{ok, Terms} ->
+	    lists:foreach(
+	      fun({Orig, Trans}) ->
+		    case Trans of
+			"" ->
+			    ok;
+			_ ->
+			    ets:insert(translations, {Orig, Trans}),
+			    ets:insert(translations_obsolete, {Orig, Trans})
+		    end
+	      end, Terms);
+	Err ->
+	    Err
+    end.
+
+find_src_files(Dir) ->
+    case file:list_dir(Dir) of
+	{ok, FileList} ->
+	    recurse_filelist(
+	      lists:map(
+	        fun(F) ->
+			filename:join(Dir, F)
+		end, FileList));
+	_ ->
+	    []
+    end.
+
+recurse_filelist(FileList) ->
+    recurse_filelist(FileList, []).
+
+recurse_filelist([], Acc) ->
+    lists:reverse(Acc);
+
+recurse_filelist([H | T], Acc) ->
+    case file:read_file_info(H) of
+	{ok, #file_info{type = directory}} ->
+	    recurse_filelist(T, lists:reverse(find_src_files(H)) ++ Acc);
+	{ok, #file_info{type = regular}} ->
+	    case string:substr(H, string:len(H) - 3) of
+		".erl" ->
+		    recurse_filelist(T, [H | Acc]);
+		".hrl" ->
+		    recurse_filelist(T, [H | Acc]);
+		_ ->
+		    recurse_filelist(T, Acc)
+	    end;
+	_ ->
+	    recurse_filelist(T, Acc)
+    end.
+
+
+print_usage() ->
+    io:format(
+      "Usage: extract_translations [-unused] dir file~n"
+      "~n"
+      "Example:~n"
+      "  extract_translations . ./msgs/ru.msg~n"
+     ).
+
+
+%%%
+%%% Gettext
+%%%
+
+print_po_header(File) ->
+    MsgProps = get_msg_header_props(File),
+    {Language, [LastT | AddT]} = prepare_props(MsgProps),
+    application:load(ejabberd),
+    {ok, Version} = application:get_key(ejabberd, vsn),
+    print_po_header(Version, Language, LastT, AddT).
+
+get_msg_header_props(File) ->
+    {ok, F} = file:open(File, [read]),
+    Lines = get_msg_header_props(F, []),
+    file:close(F),
+    Lines.
+
+get_msg_header_props(F, Lines) ->
+    String = io:get_line(F, ""),
+    case io_lib:fread("% ", String) of
+	{ok, [], RemString} ->
+	    case io_lib:fread("~s", RemString) of
+		{ok, [Key], Value} when Value /= "\n" ->
+		    %% The first character in Value is a blankspace:
+		    %% And the last characters are 'slash n'
+		    ValueClean = string:substr(Value, 2, string:len(Value)-2),
+		    get_msg_header_props(F, Lines ++ [{Key, ValueClean}]);
+		_ ->
+		    get_msg_header_props(F, Lines)
+	    end;
+	_ ->
+	    Lines
+    end.
+
+prepare_props(MsgProps) ->
+    Language = proplists:get_value("Language:", MsgProps),
+    Authors = proplists:get_all_values("Author:", MsgProps),
+    {Language, Authors}.
+
+print_po_header(Version, Language, LastTranslator, AdditionalTranslatorsList) ->
+    AdditionalTranslatorsString = build_additional_translators(AdditionalTranslatorsList),
+    HeaderString =
+	"msgid \"\"\n"
+	"msgstr \"\"\n"
+	"\"Project-Id-Version: " ++ Version ++ "\\n\"\n"
+	++ "\"X-Language: " ++ Language ++ "\\n\"\n"
+	"\"Last-Translator: " ++ LastTranslator ++ "\\n\"\n"
+	++ AdditionalTranslatorsString ++
+	"\"MIME-Version: 1.0\\n\"\n"
+	"\"Content-Type: text/plain; charset=UTF-8\\n\"\n"
+	"\"Content-Transfer-Encoding: 8bit\\n\"\n",
+    io:format("~s~n", [HeaderString]).
+
+build_additional_translators(List) ->
+    lists:foldl(
+      fun(T, Str) ->
+	      Str ++ "\"X-Additional-Translator: " ++ T ++ "\\n\"\n"
+      end,
+      "",
+      List).
+
+print_translation(File, Line, Str, StrT) ->
+    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
+    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    io:format("#: ~s:~p~nmsgid \"~s\"~nmsgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
+
+print_translation_obsolete(Str, StrT) ->
+    File = "unknown.erl",
+    Line = 1,
+    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
+    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    io:format("#: ~s:~p~n#~~ msgid \"~s\"~n#~~ msgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
+

contrib/extract_translations/prepare-translation.sh

@@ -0,0 +1,363 @@
+#!/bin/bash
+
+# Frontend for ejabberd's extract_translations.erl
+# by Badlop
+
+# How to create template files for a new language:
+# NEWLANG=zh
+# cp msgs/ejabberd.pot msgs/$NEWLANG.po
+# echo \{\"\",\"\"\}. > msgs/$NEWLANG.msg
+# ../../extract_translations/prepare-translation.sh -updateall
+
+prepare_dirs ()
+{
+	# Where is Erlang binary
+	ERL=`which erl`
+
+	EJA_SRC_DIR=$EJA_DIR/src/
+	EJA_MSGS_DIR=$EJA_SRC_DIR/msgs/
+	EXTRACT_DIR=$EJA_DIR/contrib/extract_translations/
+	EXTRACT_ERL=$EXTRACT_DIR/extract_translations.erl
+	EXTRACT_BEAM=$EXTRACT_DIR/extract_translations.beam
+
+	SRC_DIR=$RUN_DIR/src
+	MSGS_DIR=$SRC_DIR/msgs
+
+	if !([[ -n $EJA_DIR ]])
+	then 
+	echo "ejabberd dir does not exist: $EJA_DIR"
+	fi
+
+	if !([[ -x $EXTRACT_BEAM ]])
+	then 
+	sh -c "cd $EXTRACT_DIR; $ERL -compile $EXTRACT_ERL"
+	fi
+}
+
+extract_lang ()
+{
+	MSGS_FILE=$1
+	MSGS_FILE2=$MSGS_FILE.translate
+	MSGS_PATH=$MSGS_DIR/$MSGS_FILE
+	MSGS_PATH2=$MSGS_DIR/$MSGS_FILE2
+
+	echo -n "Extracting language strings for '$MSGS_FILE':"
+
+	echo -n " new..."
+	cd $SRC_DIR
+	$ERL -pa $EXTRACT_DIR -noinput -noshell -s extract_translations -s init stop -extra . $MSGS_PATH >$MSGS_PATH.new
+	sed -e 's/^% \.\//% /g;' $MSGS_PATH.new > $MSGS_PATH.new2
+	mv $MSGS_PATH.new2 $MSGS_PATH.new 
+
+	echo -n " old..."
+	$ERL -pa $EXTRACT_DIR -noinput -noshell -s extract_translations -s init stop -extra -unused . $MSGS_PATH >$MSGS_PATH.unused
+	find_unused_full $MSGS_FILE $MSGS_FILE.unused
+
+	echo "" >$MSGS_PATH2
+	echo "    ***** Translation file for ejabberd ***** " >>$MSGS_PATH2
+	echo "" >>$MSGS_PATH2
+
+	echo "" >>$MSGS_PATH2
+	echo "    *** New strings: Can you please translate them? *** " >>$MSGS_PATH2
+	cat $MSGS_PATH.new >>$MSGS_PATH2
+
+	echo "" >>$MSGS_PATH2
+	echo "" >>$MSGS_PATH2
+	echo "    *** Unused strings: They will be removed automatically *** " >>$MSGS_PATH2
+	cat $MSGS_PATH.unused.full >>$MSGS_PATH2
+
+	echo "" >>$MSGS_PATH2
+	echo "" >>$MSGS_PATH2
+	echo "    *** Already translated strings: you can also modify any of them if you want *** " >>$MSGS_PATH2
+	echo "" >>$MSGS_PATH2
+	cat $MSGS_PATH.old_cleaned >>$MSGS_PATH2
+
+	echo " ok"
+
+	rm $MSGS_PATH.new
+	rm $MSGS_PATH.old_cleaned
+	rm $MSGS_PATH.unused.full
+}
+
+extract_lang_all ()
+{
+	cd $MSGS_DIR
+	for i in $( ls *.msg ) ; do
+		extract_lang $i;
+	done
+
+	echo -e "File\tMissing\tLanguage\t\tLast translator"
+	echo -e "----\t-------\t--------\t\t---------------"
+	cd $MSGS_DIR
+	for i in $( ls *.msg ) ; do
+		MISSING=`cat $i.translate | grep "\", \"\"}." | wc -l`
+		LANGUAGE=`grep "Language:" $i.translate | sed 's/% Language: //g'`
+		LASTAUTH=`grep "Author:" $i.translate | head -n 1 | sed 's/% Author: //g'`
+		echo -e "$i\t$MISSING\t$LANGUAGE\t$LASTAUTH"
+	done
+
+	cd $MSGS_DIR
+	REVISION=`svn info | grep "^Rev" | head -1 | awk '{print $2}'`
+	zip $HOME/ejabberd-langs-$REVISION.zip *.translate;
+
+	rm *.translate
+}
+
+find_unused_full ()
+{
+	DATFILE=$1
+	DATFILEI=$1.old_cleaned
+	DELFILE=$2
+	cd msgs
+
+	DATFILE1=$DATFILE.t1
+	DATFILE2=$DATFILE.t2
+
+	DELFILE1=$DELFILE.t1
+	DELFILE2=$DELFILE.t2
+	DELFILEF=$DATFILE.unused.full
+	echo "" >$DELFILEF
+
+	grep -v "\\\\" $DELFILE >$DELFILE2
+	echo ENDFILEMARK >>$DELFILE2
+	cp $DATFILE $DATFILEI
+	cp $DATFILE $DATFILE2
+
+	cp $DELFILE2 $DELFILE1
+	STRING=`head -1 $DELFILE1`
+	until [[ $STRING == ENDFILEMARK ]]; do 
+		cp $DELFILE2 $DELFILE1
+		cp $DATFILE2 $DATFILE1
+
+		STRING=`head -1 $DELFILE1`
+
+		cat $DATFILE1 | grep "$STRING" >>$DELFILEF
+		cat $DATFILE1 | grep -v "$STRING" >$DATFILE2
+		cat $DELFILE1 | grep -v "$STRING" >$DELFILE2
+	done
+
+	mv $DATFILE2 $DATFILEI
+
+	rm -f $MSGS_PATH.t1
+	rm $MSGS_PATH.unused
+	rm -f $MSGS_PATH.unused.t1
+	rm $MSGS_PATH.unused.t2
+
+	cd ..
+}
+
+extract_lang_srcmsg2po ()
+{
+	LANG=$1
+	LANG_CODE=$LANG.$PROJECT
+	MSGS_PATH=$MSGS_DIR/$LANG_CODE.msg
+	PO_PATH=$MSGS_DIR/$LANG_CODE.po
+
+	echo $MSGS_PATH
+
+	$ERL -pa $EXTRACT_DIR -pa $SRC_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$PO_PATH.1
+	sed -e 's/ \[\]$/ \"\"/g;' $PO_PATH.1 > $PO_PATH.2
+	msguniq --sort-by-file $PO_PATH.2 --output-file=$PO_PATH
+	
+	rm $PO_PATH.*
+}
+
+extract_lang_src2pot ()
+{
+	LANG_CODE=$PROJECT
+	MSGS_PATH=$MSGS_DIR/$LANG_CODE.msg
+	POT_PATH=$MSGS_DIR/$LANG_CODE.pot
+
+	echo -n "" >$MSGS_PATH
+	echo "% Language: Language Name" >>$MSGS_PATH
+	echo "% Author: Translator name and contact method" >>$MSGS_PATH
+	echo "" >>$MSGS_PATH
+
+	cd $SRC_DIR
+	$ERL -pa $EXTRACT_DIR -pa $SRC_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$POT_PATH.1
+	sed -e 's/ \[\]$/ \"\"/g;' $POT_PATH.1 > $POT_PATH.2
+
+	#msguniq --sort-by-file $POT_PATH.2 $EJA_MSGS_DIR --output-file=$POT_PATH
+	msguniq --sort-by-file $POT_PATH.2 --output-file=$POT_PATH
+
+	rm $POT_PATH.*
+	rm $MSGS_PATH
+
+	# If the project is a specific module, not the main ejabberd
+	if [[ $PROJECT != ejabberd ]] ; then
+	    # Remove from project.pot the strings that are already present in the general ejabberd
+	    EJABBERD_MSG_FILE=$EJA_MSGS_DIR/es.po # This is just some file with translated strings
+	    POT_PATH_TEMP=$POT_PATH.temp
+	    msgattrib --set-obsolete --only-file=$EJABBERD_MSG_FILE -o $POT_PATH_TEMP $POT_PATH
+	    mv $POT_PATH_TEMP $POT_PATH
+	fi
+}
+
+extract_lang_popot2po ()
+{
+	LANG_CODE=$1
+	PO_PATH=$MSGS_DIR/$LANG_CODE.po
+	POT_PATH=$MSGS_DIR/$PROJECT.pot
+
+	msgmerge $PO_PATH $POT_PATH >$PO_PATH.translate 2>/dev/null
+	mv $PO_PATH.translate $PO_PATH 
+}
+
+extract_lang_po2msg ()
+{
+	LANG_CODE=$1
+	PO_PATH=$LANG_CODE.po
+	MS_PATH=$PO_PATH.ms
+	MSGID_PATH=$PO_PATH.msgid
+	MSGSTR_PATH=$PO_PATH.msgstr
+	MSGS_PATH=$LANG_CODE.msg
+
+	cd $MSGS_DIR
+
+	# Check PO has correct ~
+	# Let's convert to C format so we can use msgfmt
+	PO_TEMP=$LANG_CODE.po.temp
+	cat $PO_PATH | sed 's/%/perc/g' | sed 's/~/%/g' | sed 's/#:.*/#, c-format/g' >$PO_TEMP
+	msgfmt $PO_TEMP --check-format
+	result=$?
+	rm $PO_TEMP
+	if [ $result -ne 0 ] ; then
+		exit 1
+	fi
+
+	msgattrib $PO_PATH --translated --no-fuzzy --no-obsolete --no-location --no-wrap | grep "^msg" | tail --lines=+3 >$MS_PATH
+	grep "^msgid" $PO_PATH.ms | sed 's/^msgid //g' >$MSGID_PATH
+	grep "^msgstr" $PO_PATH.ms | sed 's/^msgstr //g' >$MSGSTR_PATH
+	paste $MSGID_PATH $MSGSTR_PATH --delimiter=, | awk '{print "{" $0 "}."}' | sort -g >$MSGS_PATH
+
+	rm $MS_PATH
+	rm $MSGID_PATH
+	rm $MSGSTR_PATH
+}
+
+extract_lang_updateall ()
+{
+	echo "Generating POT"
+	extract_lang_src2pot 
+
+	cd $MSGS_DIR
+	echo ""
+	echo -e "File Missing Language     Last translator"
+	echo -e "---- ------- --------     ---------------"
+	for i in $( ls *.msg ) ; do
+                LANG_CODE=${i%.msg}
+		echo -n $LANG_CODE | awk '{printf "%-6s", $1 }'
+
+		# Convert old MSG file to PO
+		PO=$LANG_CODE.po
+		[ -f $PO ] || extract_lang_srcmsg2po $LANG_CODE
+
+		extract_lang_popot2po $LANG_CODE
+		extract_lang_po2msg $LANG_CODE
+
+		MISSING=`msgfmt --statistics $PO 2>&1 | awk '{printf "%5s", $4 }'`
+		echo -n " $MISSING"
+
+		LANGUAGE=`grep "Language:" $PO | sed 's/\"X-Language: //g' | sed 's/\\\\n\"//g' | awk '{printf "%-12s", $1}'`
+		echo -n " $LANGUAGE"
+
+		LASTAUTH=`grep "Last-Translator" $PO | sed 's/\"Last-Translator: //g' | sed 's/\\\\n\"//g'`
+		echo " $LASTAUTH"
+	done
+	echo ""
+	rm messages.mo
+
+	cd ..
+}
+
+translation_instructions ()
+{
+	echo ""
+	echo "  A new file has been created for you, with the current, the new and the deprecated strings:"
+	echo "  $MSGS_PATH2"
+	echo ""
+	echo "  At the end of that file you will find the strings you must update:"
+	echo "   - Untranslated strings are like this: {"March", ""}."
+	echo "     To translate the string, add the text inside the commas. Example:"
+	echo "     {"March", "Marzo"}."
+	echo "   - Old strings that are not used: "Woowoa""
+	echo "     Search the entire file for those strings and remove them"
+	echo ""
+	echo "  Once you have translated all the strings and removed all the old ones,"
+	echo "  rename the file to overwrite the previous one:"
+	echo "  $MSGS_PATH"
+}
+
+EJA_DIR=`pwd`/..
+RUN_DIR=`pwd`/..
+PROJECT=ejabberd
+
+while [ $# -ne 0 ] ; do
+    PARAM=$1
+    shift
+    case $PARAM in
+        --) break ;;
+	-project)
+		PROJECT=$1
+		shift
+		;;
+	-ejadir)
+		EJA_DIR=$1
+		shift
+		;;
+	-rundir)
+		RUN_DIR=$1
+		shift
+		;;
+	-lang)
+		LANGU=$1
+		prepare_dirs
+		extract_lang $LANGU
+		shift
+		;;
+	-langall)
+		prepare_dirs
+		extract_lang_all
+		;;
+	-srcmsg2po)
+		LANG_CODE=$1
+		prepare_dirs
+		extract_lang_srcmsg2po $LANG_CODE
+		shift
+		;;
+	-popot2po)
+		LANG_CODE=$1
+		prepare_dirs
+		extract_lang_popot2po $LANG_CODE
+		shift
+		;;
+	-src2pot)
+		prepare_dirs
+		extract_lang_src2pot 
+		;;
+	-po2msg)
+		LANG_CODE=$1
+		prepare_dirs
+		extract_lang_po2msg $LANG_CODE
+		shift
+		;;
+	-updateall)
+		prepare_dirs
+		extract_lang_updateall
+		;;
+	*)
+		echo "Options:"
+		echo "  -langall"
+		echo "  -lang LANGUAGE_FILE"
+		echo "  -srcmsg2po LANGUAGE   Construct .msg file using source code to PO file"
+		echo "  -src2pot              Generate template POT file from source code"
+		echo "  -popot2po LANGUAGE    Update PO file with template POT file"
+		echo "  -po2msg LANGUAGE      Export PO file to MSG file"
+		echo "  -updateall            Generate POT and update all PO"
+		echo ""
+		echo "Example:"
+		echo "  ./prepare-translation.sh -lang es.msg"
+		exit 0
+		;;
+    esac
+done

cover.spec

@@ -1,5 +0,0 @@
-{level, details}.
-{incl_dirs, ["src", "ebin"]}.
-{excl_mods, [eldap, 'ELDAPv3']}.
-{export, "logs/all.coverdata"}.
-

doc/Makefile

@@ -0,0 +1,62 @@
+# $Id$
+
+SHELL = /bin/bash
+
+CONTRIBUTED_MODULES = ""
+#ifeq ($(shell ls mod_http_bind.tex),mod_http_bind.tex)
+#	CONTRIBUTED_MODULES += "\\n\\setboolean{modhttpbind}{true}"
+#endif
+
+
+all:	release pdf html
+
+release:
+	@echo "Notes for the releaser:"
+	@echo "* Do not forget to add a link to the release notes in guide.tex"
+	@echo "* Do not forget to update the version number in src/ejabberd.app!"
+	@echo "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)."
+	@echo "Press any key to continue"
+	##@read foo
+	@echo "% ejabberd version (automatically generated)." > version.tex
+	@echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../src/ejabberd.app`"}" >> version.tex
+	@echo -n "% Contributed modules (automatically generated)."  > contributed_modules.tex
+	@echo -e "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex
+
+html:	guide.html dev.html features.html
+
+pdf:	guide.pdf features.pdf
+
+clean:
+	rm -f *.aux
+	rm -f *.haux
+	rm -f *.htoc
+	rm -f *.idx
+	rm -f *.ilg
+	rm -f *.ind
+	rm -f *.log
+	rm -f *.out
+	rm -f *.pdf
+	rm -f *.toc
+	[ ! -f contributed_modules.tex ] || rm contributed_modules.tex
+
+distclean: clean
+	rm -f *.html
+
+guide.html:	guide.tex
+		hevea -fix -pedantic guide.tex
+
+dev.html:	dev.tex
+		hevea -fix -pedantic dev.tex
+
+features.html:	features.tex
+		hevea -fix -pedantic features.tex
+
+guide.pdf:	guide.tex
+		pdflatex guide.tex
+		pdflatex guide.tex
+		pdflatex guide.tex
+		makeindex guide.idx
+		pdflatex guide.tex
+
+features.pdf:	features.tex
+		pdflatex features.tex

doc/api/Makefile

@@ -0,0 +1,18 @@
+APPNAME = ejabberd
+VSN = $(shell sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../../src/ejabberd.app)
+
+DOCDIR=.
+SRCDIR=../../src
+
+.PHONY = all
+
+all: docs
+
+clean:
+	rm -f *.html
+	rm edoc-info
+	rm erlang.png
+
+docs:
+	erl -noshell -run edoc_run application \
+	"'$(APPNAME)'" '"$(SRCDIR)"' '[{dir,"$(DOCDIR)"},{packages, false},{todo,true},{private,true},{def,{vsn,"$(VSN)"}},{stylesheet,"process-one.css"},{overview,"$(DOCDIR)/overview.edoc"}]' -s init stop

doc/api/overview.edoc

@@ -0,0 +1,10 @@
+@author Mickael Remond <mickael.remond@process-one.net>
+  [http://www.process-one.net/]
+@copyright 2007 ProcessOne
+@version {@vsn}, {@date} {@time}
+@title ejabberd Development API Documentation
+
+@doc
+== Introduction ==
+
+TODO: Insert content from Jerome documentation.

doc/api/process-one.css

@@ -0,0 +1,92 @@
+html, body {
+  font-family: Verdana, sans-serif;
+  color: #000;
+  background-color: #fff;
+}
+
+h1 {
+  color: #4a5389;
+  border-bottom: solid 1px #000;
+}
+
+h2 {
+  font-size: 24px;
+  text-align: right;
+  color: #4a5389;
+  border-bottom: 1px solid #000;
+}
+
+h3 {
+  font-size: 18px;
+  color: #900;
+}
+
+h4 {
+  font-size: 14px;
+  color: #000;
+}
+
+a[href] {
+  color: #4a5389;
+}
+
+a[href]:hover {
+  background-color: #ecefff;
+}
+
+p, li, dd {
+  text-align: justify;
+}
+
+li {
+  margin-top: 0.3em;
+}
+
+li:first-child {
+  margin-top: 0px;
+}
+
+blockquote {
+  color: #555;
+}
+
+caption {
+  font-style: italic;
+  color: #009;
+  text-align: left;
+  margin-left: 20px;
+}
+
+table[border="1"] {
+  border-collapse: collapse;
+  margin-bottom: 1em;
+}
+
+table[border="1"] td {
+  border: 1px solid #ddd;
+}
+
+pre, tt, code {
+  color: #461b7e;
+}
+
+pre {
+  margin:1ex 2ex;
+  border:1px dashed lightgrey;
+  background-color:#f9f9f9;
+  padding:0.5ex;
+}
+
+pre em {
+  font-style: normal;
+  font-weight: bold;
+}
+
+dt {
+  margin:0ex 2ex;
+  font-weight:bold;
+}
+
+dd {
+  margin:0ex 0ex 1ex 4ex;
+}

doc/dev.html

@@ -0,0 +1,410 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+            "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML>
+<HEAD>
+<TITLE>Ejabberd 2.1.2 Developers Guide
+</TITLE>
+
+<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<META name="GENERATOR" content="hevea 1.10">
+<STYLE type="text/css">
+.li-itemize{margin:1ex 0ex;}
+.li-enumerate{margin:1ex 0ex;}
+.dd-description{margin:0ex 0ex 1ex 4ex;}
+.dt-description{margin:0ex;}
+.toc{list-style:none;}
+.thefootnotes{text-align:left;margin:0ex;}
+.dt-thefootnotes{margin:0em;}
+.dd-thefootnotes{margin:0em 0em 0em 2em;}
+.footnoterule{margin:1em auto 1em 0px;width:50%;}
+.caption{padding-left:2ex; padding-right:2ex; margin-left:auto; margin-right:auto}
+.title{margin:2ex auto;text-align:center}
+.center{text-align:center;margin-left:auto;margin-right:auto;}
+.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
+.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
+DIV TABLE{margin-left:inherit;margin-right:inherit;}
+PRE{text-align:left;margin-left:0ex;margin-right:auto;}
+BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
+TD P{margin:0px;}
+.boxed{border:1px solid black}
+.textboxed{border:1px solid black}
+.vbar{border:none;width:2px;background-color:black;}
+.hbar{border:none;height:2px;width:100%;background-color:black;}
+.hfill{border:none;height:1px;width:200%;background-color:black;}
+.vdisplay{border-collapse:separate;border-spacing:2px;width:auto; empty-cells:show; border:2px solid red;}
+.vdcell{white-space:nowrap;padding:0px;width:auto; border:2px solid green;}
+.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
+.dcell{white-space:nowrap;padding:0px;width:auto; border:none;}
+.dcenter{margin:0ex auto;}
+.vdcenter{border:solid #FF8000 2px; margin:0ex auto;}
+.minipage{text-align:left; margin-left:0em; margin-right:auto;}
+.marginpar{border:solid thin black; width:20%; text-align:left;}
+.marginparleft{float:left; margin-left:0ex; margin-right:1ex;}
+.marginparright{float:right; margin-left:1ex; margin-right:0ex;}
+.theorem{text-align:left;margin:1ex auto 1ex 0ex;}
+.part{margin:2ex auto;text-align:center}
+</STYLE>
+</HEAD>
+<BODY >
+<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
+<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
+
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.2 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
+ <A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
+ <A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD></TR>
+</TABLE><DIV CLASS="center">
+
+<IMG SRC="logo.png" ALT="logo.png">
+
+
+</DIV><BLOCKQUOTE CLASS="quotation"><I>I can thoroughly recommend ejabberd for ease of setup &#X2013;
+Kevin Smith, Current maintainer of the Psi project</I></BLOCKQUOTE><!--TOC section Contents-->
+<H2 CLASS="section"><!--SEC ANCHOR -->Contents</H2><!--SEC END --><UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc1">1&#XA0;&#XA0;Key Features</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc2">2&#XA0;&#XA0;Additional Features</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc3">3&#XA0;&#XA0;How it Works</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc4">3.1&#XA0;&#XA0;Router</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc5">3.2&#XA0;&#XA0;Local Router</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc6">3.3&#XA0;&#XA0;Session Manager</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc7">3.4&#XA0;&#XA0;S2S Manager</A>
+</LI></UL>
+</LI><LI CLASS="li-toc"><A HREF="#htoc8">4&#XA0;&#XA0;Authentication</A>
+<UL CLASS="toc">
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc9">4.0.1&#XA0;&#XA0;External</A>
+</LI></UL>
+</UL>
+</LI><LI CLASS="li-toc"><A HREF="#htoc10">5&#XA0;&#XA0;XML Representation</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc11">6&#XA0;&#XA0;Module <TT>xml</TT></A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc12">7&#XA0;&#XA0;Module <TT>xml_stream</TT></A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc13">8&#XA0;&#XA0;Modules</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc14">8.1&#XA0;&#XA0;Module gen_iq_handler</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc15">8.2&#XA0;&#XA0;Services</A>
+</LI></UL>
+</LI></UL><P>Introduction
+<A NAME="intro"></A></P><P><TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang/OTP</A>.</P><P><TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</P><P><TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.</P><P><TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments.</P><!--TOC section Key Features-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc1">1</A>&#XA0;&#XA0;Key Features</H2><!--SEC END --><P>
+<A NAME="keyfeatures"></A>
+</P><P><TT>ejabberd</TT> is:
+</P><UL CLASS="itemize"><LI CLASS="li-itemize">
+Cross-platform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</LI><LI CLASS="li-itemize">Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.</LI><LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced &#X2018;on the fly&#X2019;.</LI><LI CLASS="li-itemize">Administrator Friendly: <TT>ejabberd</TT> is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Comprehensive documentation.
+</LI><LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows. </LI><LI CLASS="li-itemize">Web Administration.
+</LI><LI CLASS="li-itemize">Shared Roster Groups.
+</LI><LI CLASS="li-itemize">Command line administration tool. </LI><LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
+</LI><LI CLASS="li-itemize">Capability to send announce messages.
+</LI></UL></LI><LI CLASS="li-itemize">Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Translated to 25 languages. </LI><LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
+</LI></UL></LI><LI CLASS="li-itemize">Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Fully XMPP compliant.
+</LI><LI CLASS="li-itemize">XML-based protocol.
+</LI><LI CLASS="li-itemize"><A HREF="http://www.ejabberd.im/protocols">Many protocols supported</A>.
+</LI></UL></LI></UL><!--TOC section Additional Features-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc2">2</A>&#XA0;&#XA0;Additional Features</H2><!--SEC END --><P>
+<A NAME="addfeatures"></A>
+</P><P>Moreover, <TT>ejabberd</TT> comes with a wide range of other state-of-the-art features:
+</P><UL CLASS="itemize"><LI CLASS="li-itemize">
+Modular
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Load only the modules you want.
+</LI><LI CLASS="li-itemize">Extend <TT>ejabberd</TT> with your own custom modules.
+</LI></UL>
+</LI><LI CLASS="li-itemize">Security
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+SASL and STARTTLS for c2s and s2s connections.
+</LI><LI CLASS="li-itemize">STARTTLS and Dialback s2s connections.
+</LI><LI CLASS="li-itemize">Web Admin accessible via HTTPS secure access.
+</LI></UL>
+</LI><LI CLASS="li-itemize">Databases
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Internal database for fast deployment (Mnesia).
+</LI><LI CLASS="li-itemize">Native MySQL support.
+</LI><LI CLASS="li-itemize">Native PostgreSQL support.
+</LI><LI CLASS="li-itemize">ODBC data storage support.
+</LI><LI CLASS="li-itemize">Microsoft SQL Server support. </LI></UL>
+</LI><LI CLASS="li-itemize">Authentication
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Internal Authentication.
+</LI><LI CLASS="li-itemize">PAM, LDAP and ODBC. </LI><LI CLASS="li-itemize">External Authentication script.
+</LI></UL>
+</LI><LI CLASS="li-itemize">Others
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Support for virtual hosting.
+</LI><LI CLASS="li-itemize">Compressing XML streams with Stream Compression (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>).
+</LI><LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</A>).
+</LI><LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
+</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0045.html">Multi-User Chat</A> module with support for clustering and HTML logging. </LI><LI CLASS="li-itemize">Users Directory based on users vCards.
+</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0060.html">Publish-Subscribe</A> component with support for <A HREF="http://www.xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</A>.
+</LI><LI CLASS="li-itemize">Support for web clients: <A HREF="http://www.xmpp.org/extensions/xep-0025.html">HTTP Polling</A> and <A HREF="http://www.xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</A> services.
+</LI><LI CLASS="li-itemize">IRC transport.
+</LI><LI CLASS="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
+</LI></UL>
+</LI></UL><!--TOC section How it Works-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc3">3</A>&#XA0;&#XA0;How it Works</H2><!--SEC END --><P>
+<A NAME="howitworks"></A></P><P>A XMPP domain is served by one or more <TT>ejabberd</TT> nodes. These nodes can
+be run on different machines that are connected via a network. They all must
+have the ability to connect to port 4369 of all another nodes, and must have
+the same magic cookie (see Erlang/OTP documentation, in other words the file
+<TT>~ejabberd/.erlang.cookie</TT> must be the same on all nodes). This is
+needed because all nodes exchange information about connected users, S2S
+connections, registered services, etc&#X2026;</P><P>Each <TT>ejabberd</TT> node have following modules:
+</P><UL CLASS="itemize"><LI CLASS="li-itemize">
+router;
+</LI><LI CLASS="li-itemize">local router.
+</LI><LI CLASS="li-itemize">session manager;
+</LI><LI CLASS="li-itemize">S2S manager;
+</LI></UL><!--TOC subsection Router-->
+<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc4">3.1</A>&#XA0;&#XA0;Router</H3><!--SEC END --><P>This module is the main router of XMPP packets on each node. It routes
+them based on their destinations domains. It has two tables: local and global
+routes. First, domain of packet destination searched in local table, and if it
+found, then the packet is routed to appropriate process. If no, then it
+searches in global table, and is routed to the appropriate <TT>ejabberd</TT> node or
+process. If it does not exists in either tables, then it sent to the S2S
+manager.</P><!--TOC subsection Local Router-->
+<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc5">3.2</A>&#XA0;&#XA0;Local Router</H3><!--SEC END --><P>This module routes packets which have a destination domain equal to this server
+name. If destination JID has a non-empty user part, then it routed to the
+session manager, else it is processed depending on it&#X2019;s content.</P><!--TOC subsection Session Manager-->
+<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc6">3.3</A>&#XA0;&#XA0;Session Manager</H3><!--SEC END --><P>This module routes packets to local users. It searches for what user resource
+packet must be sended via presence table. If this resource is connected to
+this node, it is routed to C2S process, if it connected via another node, then
+the packet is sent to session manager on that node.</P><!--TOC subsection S2S Manager-->
+<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc7">3.4</A>&#XA0;&#XA0;S2S Manager</H3><!--SEC END --><P>This module routes packets to other XMPP servers. First, it checks if an
+open S2S connection from the domain of the packet source to the domain of
+packet destination already exists. If it is open on another node, then it
+routes the packet to S2S manager on that node, if it is open on this node, then
+it is routed to the process that serves this connection, and if a connection
+does not exist, then it is opened and registered.</P><!--TOC section Authentication-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc8">4</A>&#XA0;&#XA0;Authentication</H2><!--SEC END --><!--TOC subsubsection External-->
+<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A NAME="htoc9">4.0.1</A>&#XA0;&#XA0;External</H4><!--SEC END --><P>
+<A NAME="externalauth"></A>
+</P><P>The external authentication script follows
+<A HREF="http://www.erlang.org/doc/tutorial/c_portdriver.html">the erlang port driver API</A>.</P><P>That script is supposed to do theses actions, in an infinite loop:
+</P><UL CLASS="itemize"><LI CLASS="li-itemize">
+read from stdin: AABBBBBBBBB.....
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+A: 2 bytes of length data (a short in network byte order)
+</LI><LI CLASS="li-itemize">B: a string of length found in A that contains operation in plain text
+operation are as follows:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+auth:User:Server:Password (check if a username/password pair is correct)
+</LI><LI CLASS="li-itemize">isuser:User:Server (check if it&#X2019;s a valid user)
+</LI><LI CLASS="li-itemize">setpass:User:Server:Password (set user&#X2019;s password)
+</LI></UL>
+</LI></UL>
+</LI><LI CLASS="li-itemize">write to stdout: AABB
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+A: the number 2 (coded as a short, which is bytes length of following result)
+</LI><LI CLASS="li-itemize">B: the result code (coded as a short), should be 1 for success/valid, or 0 for failure/invalid
+</LI></UL>
+</LI></UL><P>Example python script
+</P><PRE CLASS="verbatim">#!/usr/bin/python
+
+import sys
+from struct import *
+
+def from_ejabberd():
+    input_length = sys.stdin.read(2)
+    (size,) = unpack('&gt;h', input_length)
+    return sys.stdin.read(size).split(':')
+
+def to_ejabberd(bool):
+    answer = 0
+    if bool:
+        answer = 1
+    token = pack('&gt;hh', 2, answer)
+    sys.stdout.write(token)
+    sys.stdout.flush()
+
+def auth(username, server, password):
+    return True
+
+def isuser(username, server):
+    return True
+
+def setpass(username, server, password):
+    return True
+
+while True:
+    data = from_ejabberd()
+    success = False
+    if data[0] == "auth":
+        success = auth(data[1], data[2], data[3])
+    elif data[0] == "isuser":
+        success = isuser(data[1], data[2])
+    elif data[0] == "setpass":
+        success = setpass(data[1], data[2], data[3])
+    to_ejabberd(success)
+</PRE><!--TOC section XML Representation-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc10">5</A>&#XA0;&#XA0;XML Representation</H2><!--SEC END --><P>
+<A NAME="xmlrepr"></A></P><P>Each XML stanza is represented as the following tuple:
+</P><PRE CLASS="verbatim">XMLElement = {xmlelement, Name, Attrs, [ElementOrCDATA]}
+        Name = string()
+        Attrs = [Attr]
+        Attr = {Key, Val}
+        Key = string()
+        Val = string()
+        ElementOrCDATA = XMLElement | CDATA
+        CDATA = {xmlcdata, string()}
+</PRE><P>E.&#XA0;g. this stanza:
+</P><PRE CLASS="verbatim">&lt;message to='test@conference.example.org' type='groupchat'&gt;
+  &lt;body&gt;test&lt;/body&gt;
+&lt;/message&gt;
+</PRE><P>is represented as the following structure:
+</P><PRE CLASS="verbatim">{xmlelement, "message",
+    [{"to", "test@conference.example.org"},
+     {"type", "groupchat"}],
+    [{xmlelement, "body",
+         [],
+         [{xmlcdata, "test"}]}]}}
+</PRE><!--TOC section Module <TT>xml</TT>-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc11">6</A>&#XA0;&#XA0;Module <TT>xml</TT></H2><!--SEC END --><P>
+<A NAME="xmlmod"></A></P><DL CLASS="description"><DT CLASS="dt-description">
+</DT><DD CLASS="dd-description"><CODE>element_to_string(El) -&gt; string()</CODE>
+<PRE CLASS="verbatim">El = XMLElement
+</PRE>Returns string representation of XML stanza <TT>El</TT>.</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>crypt(S) -&gt; string()</CODE>
+<PRE CLASS="verbatim">S = string()
+</PRE>Returns string which correspond to <TT>S</TT> with encoded XML special
+characters.</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>remove_cdata(ECList) -&gt; EList</CODE>
+<PRE CLASS="verbatim">ECList = [ElementOrCDATA]
+EList = [XMLElement]
+</PRE><TT>EList</TT> is a list of all non-CDATA elements of ECList.</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>get_path_s(El, Path) -&gt; Res</CODE>
+<PRE CLASS="verbatim">El = XMLElement
+Path = [PathItem]
+PathItem = PathElem | PathAttr | PathCDATA
+PathElem = {elem, Name}
+PathAttr = {attr, Name}
+PathCDATA = cdata
+Name = string()
+Res = string() | XMLElement
+</PRE>If <TT>Path</TT> is empty, then returns <TT>El</TT>. Else sequentially
+consider elements of <TT>Path</TT>. Each element is one of:
+<DL CLASS="description"><DT CLASS="dt-description">
+</DT><DD CLASS="dd-description"><CODE>{elem, Name}</CODE> <TT>Name</TT> is name of subelement of
+<TT>El</TT>, if such element exists, then this element considered in
+following steps, else returns empty string.
+</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>{attr, Name}</CODE> If <TT>El</TT> have attribute <TT>Name</TT>, then
+returns value of this attribute, else returns empty string.
+</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>cdata</CODE> Returns CDATA of <TT>El</TT>.
+</DD></DL></DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description">TODO:
+<PRE CLASS="verbatim">         get_cdata/1, get_tag_cdata/1
+         get_attr/2, get_attr_s/2
+         get_tag_attr/2, get_tag_attr_s/2
+         get_subtag/2
+</PRE></DD></DL><!--TOC section Module <TT>xml_stream</TT>-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc12">7</A>&#XA0;&#XA0;Module <TT>xml_stream</TT></H2><!--SEC END --><P>
+<A NAME="xmlstreammod"></A></P><DL CLASS="description"><DT CLASS="dt-description">
+</DT><DD CLASS="dd-description"><CODE>parse_element(Str) -&gt; XMLElement | {error, Err}</CODE>
+<PRE CLASS="verbatim">Str = string()
+Err = term()
+</PRE>Parses <TT>Str</TT> using XML parser, returns either parsed element or error
+tuple.
+</DD></DL><!--TOC section Modules-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc13">8</A>&#XA0;&#XA0;Modules</H2><!--SEC END --><P>
+<A NAME="emods"></A></P><!--TOC subsection Module gen_iq_handler-->
+<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc14">8.1</A>&#XA0;&#XA0;Module gen_iq_handler</H3><!--SEC END --><P>
+<A NAME="geniqhandl"></A></P><P>The module <CODE>gen_iq_handler</CODE> allows to easily write handlers for IQ packets
+of particular XML namespaces that addressed to server or to users bare JIDs.</P><P>In this module the following functions are defined:
+</P><DL CLASS="description"><DT CLASS="dt-description">
+</DT><DD CLASS="dd-description"><CODE>add_iq_handler(Component, Host, NS, Module, Function, Type)</CODE>
+<PRE CLASS="verbatim">Component = Module = Function = atom()
+Host = NS = string()
+Type = no_queue | one_queue | parallel
+</PRE>Registers function <CODE>Module:Function</CODE> as handler for IQ packets on
+virtual host <CODE>Host</CODE> that contain child of namespace <CODE>NS</CODE> in
+<CODE>Component</CODE>. Queueing discipline is <CODE>Type</CODE>. There are at least
+two components defined:
+<DL CLASS="description"><DT CLASS="dt-description">
+</DT><DD CLASS="dd-description"><CODE>ejabberd_local</CODE> Handles packets that addressed to server JID;
+</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>ejabberd_sm</CODE> Handles packets that addressed to users bare JIDs.
+</DD></DL>
+</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>remove_iq_handler(Component, Host, NS)</CODE>
+<PRE CLASS="verbatim">Component = atom()
+Host = NS = string()
+</PRE>Removes IQ handler on virtual host <CODE>Host</CODE> for namespace <CODE>NS</CODE> from
+<CODE>Component</CODE>.
+</DD></DL><P>Handler function must have the following type:
+</P><DL CLASS="description"><DT CLASS="dt-description">
+</DT><DD CLASS="dd-description"><CODE>Module:Function(From, To, IQ)</CODE>
+<PRE CLASS="verbatim">From = To = jid()
+</PRE></DD></DL><PRE CLASS="verbatim">-module(mod_cputime).
+
+-behaviour(gen_mod).
+
+-export([start/2,
+         stop/1,
+         process_local_iq/3]).
+
+-include("ejabberd.hrl").
+-include("jlib.hrl").
+
+-define(NS_CPUTIME, "ejabberd:cputime").
+
+start(Host, Opts) -&gt;
+    IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
+    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_CPUTIME,
+                                  ?MODULE, process_local_iq, IQDisc).
+
+stop(Host) -&gt;
+    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_CPUTIME).
+
+process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -&gt;
+    case Type of
+        set -&gt;
+            {iq, ID, error, XMLNS,
+             [SubEl, ?ERR_NOT_ALLOWED]};
+        get -&gt;
+            CPUTime = element(1, erlang:statistics(runtime))/1000,
+            SCPUTime = lists:flatten(io_lib:format("~.3f", CPUTime)),
+            {iq, ID, result, XMLNS,
+             [{xmlelement, "query",
+               [{"xmlns", ?NS_CPUTIME}],
+               [{xmlelement, "cputime", [], [{xmlcdata, SCPUTime}]}]}]}
+    end.
+</PRE><!--TOC subsection Services-->
+<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc15">8.2</A>&#XA0;&#XA0;Services</H3><!--SEC END --><P>
+<A NAME="services"></A></P><PRE CLASS="verbatim">-module(mod_echo).
+
+-behaviour(gen_mod).
+
+-export([start/2, init/1, stop/1]).
+
+-include("ejabberd.hrl").
+-include("jlib.hrl").
+
+start(Host, Opts) -&gt;
+    MyHost = gen_mod:get_opt(host, Opts, "echo." ++ Host),
+    register(gen_mod:get_module_proc(Host, ?PROCNAME),
+             spawn(?MODULE, init, [MyHost])).
+
+init(Host) -&gt;
+    ejabberd_router:register_local_route(Host),
+    loop(Host).
+
+loop(Host) -&gt;
+    receive
+        {route, From, To, Packet} -&gt;
+            ejabberd_router:route(To, From, Packet),
+            loop(Host);
+        stop -&gt;
+            ejabberd_router:unregister_route(Host),
+            ok;
+        _ -&gt;
+            loop(Host)
+    end.
+
+stop(Host) -&gt;
+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+    Proc ! stop,
+    {wait, Proc}.
+</PRE><!--CUT END -->
+<!--HTMLFOOT-->
+<!--ENDHTML-->
+<!--FOOTER-->
+<HR SIZE=2><BLOCKQUOTE CLASS="quote"><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
+</EM><A HREF="http://hevea.inria.fr/index.html"><EM>H</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>V</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>A</EM></A><EM>.</EM></BLOCKQUOTE></BODY>
+</HTML>

doc/dev.tex

@@ -0,0 +1,467 @@
+\documentclass[a4paper,10pt]{article}
+
+%% Packages
+\usepackage{graphics}
+\usepackage{hevea}
+\usepackage{makeidx}
+\usepackage{verbatim}
+
+%% Index
+\makeindex
+% Remove the index anchors from the HTML version to save size and bandwith.
+\newcommand{\ind}[1]{\begin{latexonly}\index{#1}\end{latexonly}}
+
+%% Images
+\newcommand{\logoscale}{0.7}
+\newcommand{\imgscale}{0.58}
+\newcommand{\insimg}[1]{\insscaleimg{\imgscale}{#1}}
+\newcommand{\insscaleimg}[2]{
+  \imgsrc{#2}{}
+  \begin{latexonly}
+    \scalebox{#1}{\includegraphics{#2}}
+  \end{latexonly}
+}
+
+%% Various
+\newcommand{\ns}[1]{\texttt{#1}}
+\newcommand{\ejabberd}{\texttt{ejabberd}}
+\newcommand{\Jabber}{Jabber}
+\newcommand{\XMPP}{XMPP}
+
+%% Modules
+\newcommand{\module}[1]{\texttt{#1}}
+\newcommand{\modadhoc}{\module{mod\_adhoc}}
+\newcommand{\modannounce}{\module{mod\_announce}}
+\newcommand{\modconfigure}{\module{mod\_configure}}
+\newcommand{\moddisco}{\module{mod\_disco}}
+\newcommand{\modecho}{\module{mod\_echo}}
+\newcommand{\modirc}{\module{mod\_irc}}
+\newcommand{\modlast}{\module{mod\_last}}
+\newcommand{\modlastodbc}{\module{mod\_last\_odbc}}
+\newcommand{\modmuc}{\module{mod\_muc}}
+\newcommand{\modmuclog}{\module{mod\_muc\_log}}
+\newcommand{\modoffline}{\module{mod\_offline}}
+\newcommand{\modofflineodbc}{\module{mod\_offline\_odbc}}
+\newcommand{\modprivacy}{\module{mod\_privacy}}
+\newcommand{\modprivate}{\module{mod\_private}}
+\newcommand{\modpubsub}{\module{mod\_pubsub}}
+\newcommand{\modregister}{\module{mod\_register}}
+\newcommand{\modroster}{\module{mod\_roster}}
+\newcommand{\modrosterodbc}{\module{mod\_roster\_odbc}}
+\newcommand{\modservicelog}{\module{mod\_service\_log}}
+\newcommand{\modsharedroster}{\module{mod\_shared\_roster}}
+\newcommand{\modstats}{\module{mod\_stats}}
+\newcommand{\modtime}{\module{mod\_time}}
+\newcommand{\modvcard}{\module{mod\_vcard}}
+\newcommand{\modvcardldap}{\module{mod\_vcard\_ldap}}
+\newcommand{\modvcardodbc}{\module{mod\_vcard\_odbc}}
+\newcommand{\modversion}{\module{mod\_version}}
+
+%% Title page
+\include{version}
+\title{Ejabberd \version\ Developers Guide}
+\author{Alexey Shchepin \\
+  \ahrefurl{mailto:alexey@sevcom.net} \\
+  \ahrefurl{xmpp:aleksey@jabber.ru}}
+
+%% Options
+\newcommand{\marking}[1]{#1} % Marking disabled
+\newcommand{\quoting}[2][yozhik]{} % Quotes disabled
+\newcommand{\new}{\begin{latexonly}\marginpar{\textsc{new}}\end{latexonly}} % Highlight new features
+\newcommand{\improved}{\begin{latexonly}\marginpar{\textsc{improved}}\end{latexonly}} % Highlight improved features
+\newcommand{\moreinfo}[1]{} % Hide details
+
+%% Footnotes
+\newcommand{\txepref}[2]{\footahref{http://www.xmpp.org/extensions/xep-#1.html}{#2}}
+\newcommand{\xepref}[1]{\txepref{#1}{XEP-#1}}
+
+\begin{document}
+
+\label{titlepage}
+\begin{titlepage}
+  \maketitle{}
+
+  \begin{center}
+  {\insscaleimg{\logoscale}{logo.png}
+    \par
+  }
+  \end{center}
+
+  \begin{quotation}\textit{I can thoroughly recommend ejabberd for ease of setup --
+  Kevin Smith, Current maintainer of the Psi project}\end{quotation}
+
+\end{titlepage}
+
+\tableofcontents{}
+
+% Input introduction.tex
+\input{introduction}
+
+\section{How it Works}
+\label{howitworks}
+
+
+A \XMPP{} domain is served by one or more \ejabberd{} nodes.  These nodes can
+be run on different machines that are connected via a network.  They all must
+have the ability to connect to port 4369 of all another nodes, and must have
+the same magic cookie (see Erlang/OTP documentation, in other words the file
+\texttt{\~{}ejabberd/.erlang.cookie} must be the same on all nodes). This is
+needed because all nodes exchange information about connected users, S2S
+connections, registered services, etc\ldots
+
+
+
+Each \ejabberd{} node have following modules:
+\begin{itemize}
+\item router;
+\item local router.
+\item session manager;
+\item S2S manager;
+\end{itemize}
+
+
+\subsection{Router}
+
+This module is the main router of \XMPP{} packets on each node.  It routes
+them based on their destinations domains.  It has two tables: local and global
+routes.  First, domain of packet destination searched in local table, and if it
+found, then the packet is routed to appropriate process.  If no, then it
+searches in global table, and is routed to the appropriate \ejabberd{} node or
+process.  If it does not exists in either tables, then it sent to the S2S
+manager.
+
+
+\subsection{Local Router}
+
+This module routes packets which have a destination domain equal to this server
+name.  If destination JID has a non-empty user part, then it routed to the
+session manager, else it is processed depending on it's content.
+
+
+\subsection{Session Manager}
+
+This module routes packets to local users.  It searches for what user resource
+packet must be sended via presence table.  If this resource is connected to
+this node, it is routed to C2S process, if it connected via another node, then
+the packet is sent to session manager on that node.
+
+
+\subsection{S2S Manager}
+
+This module routes packets to other \XMPP{} servers.  First, it checks if an
+open S2S connection from the domain of the packet source to the domain of
+packet destination already exists. If it is open on another node, then it
+routes the packet to S2S manager on that node, if it is open on this node, then
+it is routed to the process that serves this connection, and if a connection
+does not exist, then it is opened and registered.
+
+
+\section{Authentication}
+
+\subsubsection{External}
+\label{externalauth}
+\ind{external authentication}
+
+The external authentication script follows
+\footahref{http://www.erlang.org/doc/tutorial/c_portdriver.html}{the erlang port driver API}.
+
+That script is supposed to do theses actions, in an infinite loop:
+\begin{itemize}
+\item read from stdin: AABBBBBBBBB.....
+    \begin{itemize}
+    \item A: 2 bytes of length data (a short in network byte order)
+    \item B: a string of length found in A that contains operation in plain text
+    operation are as follows:
+    \begin{itemize}
+    \item auth:User:Server:Password (check if a username/password pair is correct)
+    \item isuser:User:Server (check if it's a valid user)
+    \item setpass:User:Server:Password (set user's password)
+    \end{itemize}
+    \end{itemize}
+\item write to stdout: AABB
+    \begin{itemize}
+    \item A: the number 2 (coded as a short, which is bytes length of following result)
+    \item B: the result code (coded as a short), should be 1 for success/valid, or 0 for failure/invalid
+    \end{itemize}
+\end{itemize}
+
+Example python script
+\begin{verbatim}
+#!/usr/bin/python
+
+import sys
+from struct import *
+
+def from_ejabberd():
+    input_length = sys.stdin.read(2)
+    (size,) = unpack('>h', input_length)
+    return sys.stdin.read(size).split(':')
+
+def to_ejabberd(bool):
+    answer = 0
+    if bool:
+        answer = 1
+    token = pack('>hh', 2, answer)
+    sys.stdout.write(token)
+    sys.stdout.flush()
+
+def auth(username, server, password):
+    return True
+
+def isuser(username, server):
+    return True
+
+def setpass(username, server, password):
+    return True
+
+while True:
+    data = from_ejabberd()
+    success = False
+    if data[0] == "auth":
+        success = auth(data[1], data[2], data[3])
+    elif data[0] == "isuser":
+        success = isuser(data[1], data[2])
+    elif data[0] == "setpass":
+        success = setpass(data[1], data[2], data[3])
+    to_ejabberd(success)
+\end{verbatim}
+
+\section{XML Representation}
+\label{xmlrepr}
+
+Each XML stanza is represented as the following tuple:
+\begin{verbatim}
+XMLElement = {xmlelement, Name, Attrs, [ElementOrCDATA]}
+        Name = string()
+        Attrs = [Attr]
+        Attr = {Key, Val}
+        Key = string()
+        Val = string()
+        ElementOrCDATA = XMLElement | CDATA
+        CDATA = {xmlcdata, string()}
+\end{verbatim}
+E.\,g. this stanza:
+\begin{verbatim}
+<message to='test@conference.example.org' type='groupchat'>
+  <body>test</body>
+</message>
+\end{verbatim}
+is represented as the following structure:
+\begin{verbatim}
+{xmlelement, "message",
+    [{"to", "test@conference.example.org"},
+     {"type", "groupchat"}],
+    [{xmlelement, "body",
+         [],
+         [{xmlcdata, "test"}]}]}}
+\end{verbatim}
+
+
+
+\section{Module \texttt{xml}}
+\label{xmlmod}
+
+\begin{description}
+\item{\verb|element_to_string(El) -> string()|}
+\begin{verbatim}
+El = XMLElement
+\end{verbatim}
+  Returns string representation of XML stanza \texttt{El}.
+
+\item{\verb|crypt(S) -> string()|}
+\begin{verbatim}
+S = string()
+\end{verbatim}
+  Returns string which correspond to \texttt{S} with encoded XML special
+  characters.
+
+\item{\verb|remove_cdata(ECList) -> EList|}
+\begin{verbatim}
+ECList = [ElementOrCDATA]
+EList = [XMLElement]
+\end{verbatim}
+  \texttt{EList} is a list of all non-CDATA elements of ECList.
+
+
+
+\item{\verb|get_path_s(El, Path) -> Res|}
+\begin{verbatim}
+El = XMLElement
+Path = [PathItem]
+PathItem = PathElem | PathAttr | PathCDATA
+PathElem = {elem, Name}
+PathAttr = {attr, Name}
+PathCDATA = cdata
+Name = string()
+Res = string() | XMLElement
+\end{verbatim}
+  If \texttt{Path} is empty, then returns \texttt{El}.  Else sequentially
+  consider elements of \texttt{Path}.  Each element is one of:
+  \begin{description}
+  \item{\verb|{elem, Name}|} \texttt{Name} is name of subelement of
+    \texttt{El}, if such element exists, then this element considered in
+    following steps, else returns empty string.
+  \item{\verb|{attr, Name}|} If \texttt{El} have attribute \texttt{Name}, then
+    returns value of this attribute, else returns empty string.
+  \item{\verb|cdata|} Returns CDATA of \texttt{El}.
+  \end{description}
+
+\item{TODO:}
+\begin{verbatim}
+         get_cdata/1, get_tag_cdata/1
+         get_attr/2, get_attr_s/2
+         get_tag_attr/2, get_tag_attr_s/2
+         get_subtag/2
+\end{verbatim}
+\end{description}
+
+
+\section{Module \texttt{xml\_stream}}
+\label{xmlstreammod}
+
+\begin{description}
+\item{\verb!parse_element(Str) -> XMLElement | {error, Err}!}
+\begin{verbatim}
+Str = string()
+Err = term()
+\end{verbatim}
+  Parses \texttt{Str} using XML parser, returns either parsed element or error
+  tuple.
+\end{description}
+
+
+\section{Modules}
+\label{emods}
+
+
+%\subsection{gen\_mod behaviour}
+%\label{genmod}
+
+%TBD
+
+\subsection{Module gen\_iq\_handler}
+\label{geniqhandl}
+
+The module \verb|gen_iq_handler| allows to easily write handlers for IQ packets
+of particular XML namespaces that addressed to server or to users bare JIDs.
+
+In this module the following functions are defined:
+\begin{description}
+\item{\verb|add_iq_handler(Component, Host, NS, Module, Function, Type)|}
+\begin{verbatim}
+Component = Module = Function = atom()
+Host = NS = string()
+Type = no_queue | one_queue | parallel
+\end{verbatim}
+  Registers function \verb|Module:Function| as handler for IQ packets on
+  virtual host \verb|Host| that contain child of namespace \verb|NS| in
+  \verb|Component|.  Queueing discipline is \verb|Type|.  There are at least
+  two components defined:
+  \begin{description}
+  \item{\verb|ejabberd_local|} Handles packets that addressed to server JID;
+  \item{\verb|ejabberd_sm|} Handles packets that addressed to users bare JIDs.
+  \end{description}
+\item{\verb|remove_iq_handler(Component, Host, NS)|}
+\begin{verbatim}
+Component = atom()
+Host = NS = string()
+\end{verbatim}
+  Removes IQ handler on virtual host \verb|Host| for namespace \verb|NS| from
+  \verb|Component|.
+\end{description}
+
+Handler function must have the following type:
+\begin{description}
+\item{\verb|Module:Function(From, To, IQ)|}
+\begin{verbatim}
+From = To = jid()
+\end{verbatim}
+\end{description}
+
+
+
+\begin{verbatim}
+-module(mod_cputime).
+
+-behaviour(gen_mod).
+
+-export([start/2,
+         stop/1,
+         process_local_iq/3]).
+
+-include("ejabberd.hrl").
+-include("jlib.hrl").
+
+-define(NS_CPUTIME, "ejabberd:cputime").
+
+start(Host, Opts) ->
+    IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
+    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_CPUTIME,
+                                  ?MODULE, process_local_iq, IQDisc).
+
+stop(Host) ->
+    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_CPUTIME).
+
+process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) ->
+    case Type of
+        set ->
+            {iq, ID, error, XMLNS,
+             [SubEl, ?ERR_NOT_ALLOWED]};
+        get ->
+            CPUTime = element(1, erlang:statistics(runtime))/1000,
+            SCPUTime = lists:flatten(io_lib:format("~.3f", CPUTime)),
+            {iq, ID, result, XMLNS,
+             [{xmlelement, "query",
+               [{"xmlns", ?NS_CPUTIME}],
+               [{xmlelement, "cputime", [], [{xmlcdata, SCPUTime}]}]}]}
+    end.
+\end{verbatim}
+
+
+\subsection{Services}
+\label{services}
+
+%TBD
+
+
+%TODO: use \verb|proc_lib|
+\begin{verbatim}
+-module(mod_echo).
+
+-behaviour(gen_mod).
+
+-export([start/2, init/1, stop/1]).
+
+-include("ejabberd.hrl").
+-include("jlib.hrl").
+
+start(Host, Opts) ->
+    MyHost = gen_mod:get_opt(host, Opts, "echo." ++ Host),
+    register(gen_mod:get_module_proc(Host, ?PROCNAME),
+             spawn(?MODULE, init, [MyHost])).
+
+init(Host) ->
+    ejabberd_router:register_local_route(Host),
+    loop(Host).
+
+loop(Host) ->
+    receive
+        {route, From, To, Packet} ->
+            ejabberd_router:route(To, From, Packet),
+            loop(Host);
+        stop ->
+            ejabberd_router:unregister_route(Host),
+            ok;
+        _ ->
+            loop(Host)
+    end.
+
+stop(Host) ->
+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+    Proc ! stop,
+    {wait, Proc}.
+\end{verbatim}
+
+
+
+\end{document}

doc/features.html

@@ -0,0 +1,132 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+            "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML>
+<HEAD>
+<TITLE>Ejabberd 2.1.2 Feature Sheet
+</TITLE>
+
+<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<META name="GENERATOR" content="hevea 1.10">
+<STYLE type="text/css">
+.li-itemize{margin:1ex 0ex;}
+.li-enumerate{margin:1ex 0ex;}
+.dd-description{margin:0ex 0ex 1ex 4ex;}
+.dt-description{margin:0ex;}
+.toc{list-style:none;}
+.thefootnotes{text-align:left;margin:0ex;}
+.dt-thefootnotes{margin:0em;}
+.dd-thefootnotes{margin:0em 0em 0em 2em;}
+.footnoterule{margin:1em auto 1em 0px;width:50%;}
+.caption{padding-left:2ex; padding-right:2ex; margin-left:auto; margin-right:auto}
+.title{margin:2ex auto;text-align:center}
+.center{text-align:center;margin-left:auto;margin-right:auto;}
+.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
+.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
+DIV TABLE{margin-left:inherit;margin-right:inherit;}
+PRE{text-align:left;margin-left:0ex;margin-right:auto;}
+BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
+TD P{margin:0px;}
+.boxed{border:1px solid black}
+.textboxed{border:1px solid black}
+.vbar{border:none;width:2px;background-color:black;}
+.hbar{border:none;height:2px;width:100%;background-color:black;}
+.hfill{border:none;height:1px;width:200%;background-color:black;}
+.vdisplay{border-collapse:separate;border-spacing:2px;width:auto; empty-cells:show; border:2px solid red;}
+.vdcell{white-space:nowrap;padding:0px;width:auto; border:2px solid green;}
+.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
+.dcell{white-space:nowrap;padding:0px;width:auto; border:none;}
+.dcenter{margin:0ex auto;}
+.vdcenter{border:solid #FF8000 2px; margin:0ex auto;}
+.minipage{text-align:left; margin-left:0em; margin-right:auto;}
+.marginpar{border:solid thin black; width:20%; text-align:left;}
+.marginparleft{float:left; margin-left:0ex; margin-right:1ex;}
+.marginparright{float:right; margin-left:1ex; margin-right:0ex;}
+.theorem{text-align:left;margin:1ex auto 1ex 0ex;}
+.part{margin:2ex auto;text-align:center}
+SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
+</STYLE>
+</HEAD>
+<BODY >
+<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
+<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
+
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.2 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
+ <A HREF="mailto:s.devrieze@pandora.be"><TT>mailto:s.devrieze@pandora.be</TT></A><BR>
+ <A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A></H3></TD></TR>
+</TABLE><DIV CLASS="center">
+
+<IMG SRC="logo.png" ALT="logo.png">
+
+
+</DIV><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>I can thoroughly recommend ejabberd for ease of setup &#X2013;
+Kevin Smith, Current maintainer of the Psi project</I></FONT></BLOCKQUOTE><P>Introduction
+<A NAME="intro"></A></P><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. &#X2014;
+Joeri</I></FONT></BLOCKQUOTE><P><TT>ejabberd</TT> is a <B><FONT SIZE=4><FONT COLOR="#001376">free and open source</FONT></FONT></B> instant messaging server written in <A HREF="http://www.erlang.org/">Erlang/OTP</A>.</P><P><TT>ejabberd</TT> is <B><FONT SIZE=4><FONT COLOR="#001376">cross-platform</FONT></FONT></B>, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</P><P><TT>ejabberd</TT> is designed to be a <B><FONT SIZE=4><FONT COLOR="#001376">rock-solid and feature rich</FONT></FONT></B> XMPP server.</P><P><TT>ejabberd</TT> is suitable for small deployments, whether they need to be <B><FONT SIZE=4><FONT COLOR="#001376">scalable</FONT></FONT></B> or not, as well as extremely big deployments.</P><!--TOC section Key Features-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc1"></A>Key Features</H2><!--SEC END --><P>
+<A NAME="keyfeatures"></A>
+</P><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>Erlang seems to be tailor-made for writing stable, robust servers. &#X2014;
+Peter Saint-Andr&#XE9;, Executive Director of the Jabber Software Foundation</I></FONT></BLOCKQUOTE><P><TT>ejabberd</TT> is:
+</P><UL CLASS="itemize"><LI CLASS="li-itemize">
+<B><FONT SIZE=4><FONT COLOR="#001376">Cross-platform:</FONT></FONT></B> <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Distributed:</FONT></FONT></B> You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.</LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Fault-tolerant:</FONT></FONT></B> You can deploy an <TT>ejabberd</TT> cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced &#X2018;on the fly&#X2019;.</LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Administrator Friendly:</FONT></FONT></B> <TT>ejabberd</TT> is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Comprehensive documentation.
+</LI><LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows. </LI><LI CLASS="li-itemize">Web Administration.
+</LI><LI CLASS="li-itemize">Shared Roster Groups.
+</LI><LI CLASS="li-itemize">Command line administration tool. </LI><LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
+</LI><LI CLASS="li-itemize">Capability to send announce messages.
+</LI></UL></LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Internationalized:</FONT></FONT></B> <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Translated to 25 languages. </LI><LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
+</LI></UL></LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Open Standards:</FONT></FONT></B> <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Fully XMPP compliant.
+</LI><LI CLASS="li-itemize">XML-based protocol.
+</LI><LI CLASS="li-itemize"><A HREF="http://www.ejabberd.im/protocols">Many protocols supported</A>.
+</LI></UL></LI></UL><!--TOC section Additional Features-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc2"></A>Additional Features</H2><!--SEC END --><P>
+<A NAME="addfeatures"></A>
+</P><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>ejabberd is making inroads to solving the "buggy incomplete server" problem &#X2014;
+Justin Karneges, Founder of the Psi and the Delta projects</I></FONT></BLOCKQUOTE><P>Moreover, <TT>ejabberd</TT> comes with a wide range of other state-of-the-art features:
+</P><UL CLASS="itemize"><LI CLASS="li-itemize">
+Modular
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Load only the modules you want.
+</LI><LI CLASS="li-itemize">Extend <TT>ejabberd</TT> with your own custom modules.
+</LI></UL>
+</LI><LI CLASS="li-itemize">Security
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+SASL and STARTTLS for c2s and s2s connections.
+</LI><LI CLASS="li-itemize">STARTTLS and Dialback s2s connections.
+</LI><LI CLASS="li-itemize">Web Admin accessible via HTTPS secure access.
+</LI></UL>
+</LI><LI CLASS="li-itemize">Databases
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Internal database for fast deployment (Mnesia).
+</LI><LI CLASS="li-itemize">Native MySQL support.
+</LI><LI CLASS="li-itemize">Native PostgreSQL support.
+</LI><LI CLASS="li-itemize">ODBC data storage support.
+</LI><LI CLASS="li-itemize">Microsoft SQL Server support. </LI></UL>
+</LI><LI CLASS="li-itemize">Authentication
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Internal Authentication.
+</LI><LI CLASS="li-itemize">PAM, LDAP and ODBC. </LI><LI CLASS="li-itemize">External Authentication script.
+</LI></UL>
+</LI><LI CLASS="li-itemize">Others
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Support for virtual hosting.
+</LI><LI CLASS="li-itemize">Compressing XML streams with Stream Compression (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>).
+</LI><LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</A>).
+</LI><LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
+</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0045.html">Multi-User Chat</A> module with support for clustering and HTML logging. </LI><LI CLASS="li-itemize">Users Directory based on users vCards.
+</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0060.html">Publish-Subscribe</A> component with support for <A HREF="http://www.xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</A>.
+</LI><LI CLASS="li-itemize">Support for web clients: <A HREF="http://www.xmpp.org/extensions/xep-0025.html">HTTP Polling</A> and <A HREF="http://www.xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</A> services.
+</LI><LI CLASS="li-itemize">IRC transport.
+</LI><LI CLASS="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
+</LI></UL>
+</LI></UL><!--CUT END -->
+<!--HTMLFOOT-->
+<!--ENDHTML-->
+<!--FOOTER-->
+<HR SIZE=2><BLOCKQUOTE CLASS="quote"><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
+</EM><A HREF="http://hevea.inria.fr/index.html"><EM>H</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>V</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>A</EM></A><EM>.</EM></BLOCKQUOTE></BODY>
+</HTML>

doc/features.tex

@@ -0,0 +1,136 @@
+\documentclass[a4paper,10pt]{article}
+
+%% Packages
+\usepackage{epsfig}
+\usepackage{fancyhdr}
+\usepackage{graphics}
+\usepackage{hevea}
+\usepackage[pdftex,colorlinks,unicode,urlcolor=blue,linkcolor=blue,pdftitle=Ejabberd\
+        Feature\ Sheet,pdfauthor=Sander\
+        Devrieze,pdfsubject=ejabberd,pdfkeywords=ejabberd]{hyperref}
+\usepackage{verbatim}
+\usepackage{color}
+
+%% Index
+% Remove the index anchors from the HTML version to save size and bandwith.
+\newcommand{\ind}[1]{\begin{latexonly}\index{#1}\end{latexonly}}
+
+%% Images
+\newcommand{\logoscale}{0.7}
+\newcommand{\imgscale}{0.58}
+\newcommand{\insimg}[1]{\insscaleimg{\imgscale}{#1}}
+\newcommand{\insscaleimg}[2]{
+  \imgsrc{#2}{}
+  \begin{latexonly}
+    \scalebox{#1}{\includegraphics{#2}}
+  \end{latexonly}
+}
+
+%% Various
+\newcommand{\bracehack}{\def\{{\char"7B}\def\}{\char"7D}}
+\newcommand{\titem}[1]{\item[\bracehack\texttt{#1}]}
+\newcommand{\ns}[1]{\texttt{#1}}
+\newcommand{\jid}[1]{\texttt{#1}}
+\newcommand{\option}[1]{\texttt{#1}}
+\newcommand{\poption}[1]{{\bracehack\texttt{#1}}}
+\newcommand{\node}[1]{\texttt{#1}}
+\newcommand{\term}[1]{\texttt{#1}}
+\newcommand{\shell}[1]{\texttt{#1}}
+\newcommand{\ejabberd}{\texttt{ejabberd}}
+\newcommand{\Jabber}{Jabber}
+
+%% Title page
+\include{version}
+\title{Ejabberd \version\ Feature Sheet}
+\author{Sander Devrieze \\
+  \ahrefurl{mailto:s.devrieze@pandora.be} \\
+  \ahrefurl{xmpp:sander@devrieze.dyndns.org}}
+
+% Options
+\newcommand{\marking}[1]{\textbf{\begin{large}\textcolor{ejblue}{#1}\end{large}}} % Marking enabled
+\newcommand{\quoting}[2][yozhik]{\begin{quotation}\textcolor{#1}{\textit{#2}}\end{quotation}} % Quotes enabled
+\newcommand{\new}{\marginpar{\textcolor{red}{\textsc{new}}}} % Highlight new features
+\newcommand{\improved}{\marginpar{\textcolor{orange}{\textsc{improved}}}} % Highlight improved features
+\setcounter{secnumdepth}{-1} % Disable section numbering
+
+%% To by-pass errors in the HTML version.
+\newstyle{SPAN}{width:20\%; float:right; text-align:left; margin-left:auto;}
+\definecolor{orange}       {cmyk}{0.000,0.333,1.000,0.000}
+
+%% Footnotes
+\begin{latexonly}
+\global\parskip=9pt plus 3pt minus 1pt
+\global\parindent=0pt
+\gdef\ahrefurl#1{\href{#1}{\texttt{#1}}}
+\gdef\footahref#1#2{#2\footnote{\href{#1}{\texttt{#1}}}}
+\end{latexonly}
+\newcommand{\txepref}[2]{\footahref{http://www.xmpp.org/extensions/xep-#1.html}{#2}}
+\newcommand{\xepref}[1]{\txepref{#1}{XEP-#1}}
+
+%% Fancy header
+\fancyhf{}
+\pagestyle{fancy}
+\rhead{\textcolor{ejblue}{The Expandable Jabber/XMPP Daemon.}}
+\renewcommand{\headrule}{{\color{ejblue}%
+\hrule width\headwidth height\headrulewidth \vskip-\headrulewidth}}
+\lhead{\setlength{\unitlength}{-6mm}
+  \begin{picture}(0,0)
+    \put(5.8,3.25){\includegraphics[width=1.3\textwidth]{yozhikheader.png}}
+  \end{picture}}
+
+% Official ejabberd colours
+\definecolor{ejblue}       {cmyk}{1.000,0.831,0.000,0.537} %RGB: 0,0,118	HTML: 000076
+\definecolor{ejgreenyellow}{cmyk}{0.079,0.000,0.275,0.102} %RGB: 209,229,159	HTML: d1e59f
+\definecolor{ejgreendark}  {cmyk}{0.131,0.000,0.146,0.220} %RGB: 166,199,162	HTML: a6c7a2
+\definecolor{ejgreen}      {cmyk}{0.077,0.000,0.081,0.078} %RGB: 216,236,215	HTML: d8ecd7
+\definecolor{ejgreenwhite} {cmyk}{0.044,0.000,0.048,0.020} %RGB: 239,250,238	HTML: effaee
+\definecolor{yozhik}       {cmyk}{0.000,0.837,1.000,0.424} %RGB: 147,0,0	HTML: 930000
+
+\begin{document}
+
+\label{titlepage}
+\begin{titlepage}
+  \maketitle{}
+
+  \thispagestyle{empty}
+
+  \begin{center}
+  {\insscaleimg{\logoscale}{logo.png}
+    \par
+  }
+  \end{center}
+  \quoting{I can thoroughly recommend ejabberd for ease of setup --
+  Kevin Smith, Current maintainer of the Psi project}
+
+\end{titlepage}
+
+\newpage
+% Set the page counter to 2 so that the titlepage and the second page do not
+% have the same page number. This fixes the PDFLaTeX warning "destination with
+% the same identifier".
+\begin{latexonly}
+\setcounter{page}{2}
+\pagecolor{ejgreenwhite}
+\end{latexonly}
+
+% Input introduction.tex
+\input{introduction}
+
+\end{document}
+
+%% TODO
+% * illustrations (e.g. screenshot from web interface)
+% * commented parts
+% * slides, guide and html version
+% * cleaning and improving LaTeX code
+% * key features: something like this (shorter)? (more focussed on Erlang now): "To reach the goal of high
+%   availability, performance and clustering, ejabberd is written in Erlang, a programming language perfectly
+%   suited for this. Besides that, some parts are written in C to also incude the advantages of this language. In
+%   short, ejabberd is a perfect mix of mainly Erlang code, peppered with some C code to get the final touch!"
+%   <picture of a cocktail>
+% * key features: saying that ejabberd the only XMPP server is that can do real clustering:
+%   http://www.jivesoftware.org/forums/thread.jspa?threadID=14602
+%   "What I find interesting is that *no* XMPP servers truly provide clustering. This includes all the commercial
+%   servers. The one partial exception appears to be ejabberd, which can cluster certain data such as sessions,
+%   but not all services such as MUC."
+% * try it today: links to migration tutorials

doc/flow.dot

@@ -0,0 +1,105 @@
+digraph messages {
+	//concentrate=true;
+	subgraph clusterclients {
+		client1 [shape = box];
+		client2 [shape = box];
+		client3 [shape = box];
+
+		style = dashed;
+		label = "Clients";
+	}
+
+	subgraph clusternode1 {
+		subgraph clusterc2s1 {
+			c2s11;
+			c2s12;
+			style = invis;
+		}
+		subgraph clusterservices1 {
+			service11;
+			service12;
+			service13;
+			style = invis;
+		}
+		//subgraph clusters2s1 {
+			//s2s11;
+			//s2s12;
+			//style = invis;
+		//}
+		c2s11     -> auth1;
+		c2s12     -> auth1;
+		auth1     -> c2s11;
+		auth1     -> c2s12;
+		c2s11     -> sm1;
+		c2s11     -> router1;
+		c2s12     -> sm1;
+		c2s12     -> router1;
+		router1   -> local1;
+		router1   -> service11;
+		router1   -> service12;
+		router1   -> service13;
+		router1   -> s2s11;
+		router1   -> s2s12;
+		service11 -> router1;
+		service12 -> router1;
+		service13 -> router1;
+		s2s11     -> router1;
+		s2s12     -> router1;
+		local1    -> sm1;
+		sm1       -> c2s11;
+		sm1       -> c2s12;
+
+		style = dashed;
+		label = "Node1";
+	}
+
+	subgraph clusternode2 {
+		c2s2      -> auth2;
+		auth2     -> c2s2;
+		c2s2      -> sm2;
+		c2s2      -> router2;
+		router2   -> local2;
+		router2   -> service21;
+		router2   -> s2s21;
+		service21 -> router2;
+		s2s21     -> router2;
+		local2    -> sm2;
+		sm2       -> c2s2;
+
+		style = dashed;
+		label = "Node2";
+	}
+
+
+
+	subgraph clusterservers {
+		server1 [shape = box];
+		server2 [shape = box];
+		server3 [shape = box];
+
+		style = dashed;
+		label = "Servers";
+	}
+
+
+	client1 -> c2s11;
+	client2 -> c2s12;
+	client3 -> c2s2;
+	c2s11 -> client1 [constraint=false];
+	c2s12 -> client2 [constraint=false];
+	c2s2  -> client3 [constraint=false];
+
+	s2s11 -> server1 [minlen = 2];
+	s2s12 -> server2 [minlen = 2];
+	s2s21 -> server3 [minlen = 2];
+	server1 -> s2s11 [constraint=false];
+	server2 -> s2s12 [constraint=false];
+	server3 -> s2s21 [constraint=false];
+
+	router1 -> router2;
+	router2 -> router1;
+	sm1     -> sm2;
+	sm2     -> sm1;
+
+	label = "Data Flows";
+}

doc/introduction.tex

@@ -0,0 +1,133 @@
+\chapter{Introduction}
+\label{intro}
+
+%% TODO: improve the feature sheet with a nice table to highlight new features.
+
+\quoting{I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. ---
+Joeri} 
+
+%ejabberd is a free and open source instant messaging server written in Erlang. ejabberd is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication (Jabber/XMPP).
+
+\ejabberd{} is a \marking{free and open source} instant messaging server written in \footahref{http://www.erlang.org/}{Erlang/OTP}.
+
+\ejabberd{} is \marking{cross-platform}, distributed, fault-tolerant, and based on open standards to achieve real-time communication.
+
+\ejabberd{} is designed to be a \marking{rock-solid and feature rich} XMPP server.
+
+\ejabberd{} is suitable for small deployments, whether they need to be \marking{scalable} or not, as well as extremely big deployments.
+
+%\subsection{Layout with example deployment (title needs a better name)}
+%\label{layout}
+
+%In this section there will be a graphical overview like these:\\
+%\verb|http://www.tipic.com/var/timp/timp_dep.gif| \\
+%\verb|http://www.jabber.com/images/jabber_Com_Platform.jpg| \\
+%\verb|http://www.antepo.com/files/OPN45systemdatasheet.pdf| \\
+
+%A page full with names of Jabber client that are known to work with ejabberd. \begin{tiny}tiny font\end{tiny}
+
+%\subsection{Try It Today}
+%\label{trytoday}
+
+%(Not sure if I will include/finish this section for the next version.)
+
+%\begin{itemize}
+%\item Erlang REPOS
+%\item Packages in distributions
+%\item Windows binary
+%\item source tar.gz
+%\item Migration from Jabberd14 (and so also Jabberd2 because you can migrate from version 2 back to 14) and Jabber Inc. XCP possible.
+%\end{itemize}
+
+\newpage
+\section{Key Features}
+\label{keyfeatures}
+\ind{features!key features}
+
+\quoting{Erlang seems to be tailor-made for writing stable, robust servers. ---
+Peter Saint-Andr\'e, Executive Director of the Jabber Software Foundation}
+
+\ejabberd{} is:
+\begin{itemize}
+\item \marking{Cross-platform:} \ejabberd{} runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.
+
+\item \marking{Distributed:} You can run \ejabberd{} on a cluster of machines and all of them will serve the same \Jabber{} domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.
+
+\item \marking{Fault-tolerant:} You can deploy an \ejabberd{} cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced `on the fly'.
+
+\item \marking{Administrator Friendly:} \ejabberd{} is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
+\begin{itemize}
+\item Comprehensive documentation.
+\item Straightforward installers for Linux, Mac OS X, and Windows. %%\improved{}
+\item Web Administration.
+\item Shared Roster Groups.
+\item Command line administration tool. %%\improved{}
+\item Can integrate with existing authentication mechanisms.
+\item Capability to send announce messages.
+\end{itemize}
+
+\item \marking{Internationalized:} \ejabberd{} leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
+\begin{itemize}
+\item Translated to 25 languages. %%\improved{}
+\item Support for \footahref{http://www.ietf.org/rfc/rfc3490.txt}{IDNA}.
+\end{itemize}
+
+\item \marking{Open Standards:} \ejabberd{} is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
+\begin{itemize}
+\item Fully XMPP compliant.
+\item XML-based protocol.
+\item \footahref{http://www.ejabberd.im/protocols}{Many protocols supported}.
+\end{itemize}
+
+\end{itemize}
+
+\newpage
+
+\section{Additional Features}
+\label{addfeatures}
+\ind{features!additional features}
+
+\quoting{ejabberd is making inroads to solving the "buggy incomplete server" problem ---
+Justin Karneges, Founder of the Psi and the Delta projects}
+
+Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features:
+\begin{itemize}
+\item Modular
+\begin{itemize}
+\item Load only the modules you want.
+\item Extend \ejabberd{} with your own custom modules.
+\end{itemize}
+\item Security
+\begin{itemize}
+\item SASL and STARTTLS for c2s and s2s connections.
+\item STARTTLS and Dialback s2s connections.
+\item Web Admin accessible via HTTPS secure access.
+\end{itemize}
+\item Databases
+\begin{itemize}
+\item Internal database for fast deployment (Mnesia).
+\item Native MySQL support.
+\item Native PostgreSQL support.
+\item ODBC data storage support.
+\item Microsoft SQL Server support. %%\new{}
+\end{itemize}
+\item Authentication
+\begin{itemize}
+\item Internal Authentication.
+\item PAM, LDAP and ODBC.  %%\improved{}
+\item External Authentication script.
+\end{itemize}
+\item Others
+\begin{itemize}
+\item Support for virtual hosting.
+\item Compressing XML streams with Stream Compression (\xepref{0138}).
+\item Statistics via Statistics Gathering (\xepref{0039}).
+\item IPv6 support both for c2s and s2s connections.
+\item \txepref{0045}{Multi-User Chat} module with support for clustering and HTML logging. %%\improved{}
+\item Users Directory based on users vCards.
+\item \txepref{0060}{Publish-Subscribe} component with support for \txepref{0163}{Personal Eventing via Pubsub}.
+\item Support for web clients: \txepref{0025}{HTTP Polling} and \txepref{0206}{HTTP Binding (BOSH)} services.
+\item IRC transport.
+\item Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
+\end{itemize}
+\end{itemize}

doc/release_notes_0.9.1.txt

@@ -0,0 +1,62 @@
+			    Release notes
+			    ejabberd 0.9.1
+
+   This document describes the main changes from [25]ejabberd 0.9.
+
+   The code can be downloaded from the [26]download page.
+
+   For more detailed information, please refer to ejabberd [27]User Guide.
+
+
+Groupchat (Multi-user chat and IRC) improvements
+
+   The multi-user chat code has been improved to comply with the latest version
+   of Jabber Enhancement Proposal 0045.
+
+   The IRC (Internet Relay Chat) features now support WHOIS and USERINFO
+   requests.
+
+
+Web interface
+
+   ejabberd modules management features have been added to the web interface.
+   They now allow to start or stop extension module without restarting the
+   ejabberd server.
+
+
+Publish and subscribe
+
+   It is now possible to a subscribe node with a JabberID that includes a
+   resource.
+
+
+Translations
+
+   A new script has been included to help translate ejabberd into new languages
+   and maintain existing translations.
+
+   As a result, ejabberd is now translating into 10 languages:
+     * Dutch
+     * English
+     * French
+     * German
+     * Polish
+     * Portuguese
+     * Russian
+     * Spanish
+     * Swedish
+     * Ukrainian
+
+
+Migration
+
+   No changes have been made to the database. No particular conversion steps
+   are needed. However, you should backup your database before upgrading to a
+   new ejabberd version.
+
+
+Bugfixes
+
+   This release contains several bugfixes and architectural changes. Please
+   refer to the Changelog file supplied with this release for details of all
+   improvements in the ejabberd code.

doc/release_notes_0.9.8.txt

@@ -0,0 +1,99 @@
+			    Release notes
+			    ejabberd 0.9.8
+			      2005-08-01
+
+   This document describes the main changes in ejabberd 0.9.8. This
+   version prepares the way for the release of ejabberd 1.0, which 
+   is due later this year.
+
+   The code can be downloaded from the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/
+
+   For more detailed information, please refer to ejabberd User Guide
+   on the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/docs.html
+
+
+   Recent changes include....
+
+
+Enhanced virtual hosting
+
+   Virtual hosting applies to many more setting options and
+   features and is transparent. Virtual hosting accepts different
+   parameters for different virtual hosts regarding the following
+   features: authentication method, access control lists and access
+   rules, users management, statistics, and shared roster. The web
+   interface gives access to each virtual host's parameters.
+
+
+Enhanced Publish-Subscribe module
+
+   ejabberd's Publish-Subscribe module integrates enhancements
+   coming from J-EAI, an XMPP-based integration server built on
+   ejabberd. ejabberd thus supports Publish-Subscribe node
+   configuration. It is possible to define nodes that should be
+   persistent, and the number of items to persist. Besides that, it
+   is also possible to define various notification parameters, such
+   as the delivery of the payload with the notifications, and the
+   notification of subscribers when some changes occur on items.
+   Other examples are: the maximum size of the items payload, the
+   subscription approvers, the limitation of the notification to
+   online users only, etc.
+
+
+Code reorganisation and update
+
+   - The mod_register module has been cleaned up.
+   - ODBC support has been updated and several bugs have been fixed.
+
+
+Development API
+
+   To ease the work of Jabber/XMPP developers, a filter_packet hook
+   has been added. As a result it is possible to develop plugins to
+   filter or modify packets flowing through ejabberd.
+
+
+Translations
+
+   - Translations have been updated to support the new Publish-Subscribe features.
+   - A new Brazilian Portuguese translation has been contributed.
+
+
+Web interface
+
+   - The CSS stylesheet from the web interface is W3C compliant.
+
+
+Installers
+
+   Installers are provided for Microsoft Windows and Linux/x86. The
+   Linux installer includes Erlang ASN.1 modules for LDAP
+   authentication support.
+
+
+Bugfixes
+
+   - This release contains several bugfixes and architectural
+     changes. Among other bugfixes include improvements in LDAP
+     authentication. Please refer to the ChangeLog file supplied 
+     with this release regarding all improvements in ejabberd.
+
+
+References
+
+   The ejabberd feature sheet helps comparing with other Jabber/XMPP 
+   servers:
+   http://www.process-one.net/en/projects/ejabberd/docs/features.pdf
+
+   Contributed tutorials of interest are:
+   - Migration from Jabberd1.4 to ejabberd:
+     http://ejabberd.jabber.ru/jabberd1-to-ejabberd
+   - Migration from Jabberd2 to ejabberd:
+     http://ejabberd.jabber.ru/jabberd2-to-ejabberd
+   - Transport configuration for connecting to other networks:
+     http://ejabberd.jabber.ru/tutorials-transports
+
+END
+

doc/release_notes_0.9.txt

@@ -0,0 +1,88 @@
+			    Release notes
+			     ejabberd 0.9
+
+    This document describes the major new features of and changes to
+    ejabberd 0.9, compared to latest public release ejabber 0.7.5.
+
+    For more detailed information, please refer to ejabberd User
+    Guide.
+
+
+Virtual Hosting
+
+    ejabberd now can host several domain on the same instance.
+    This option is enabled by using:
+
+      {hosts, ["erlang-projects.org", "erlang-fr.org"]}.
+
+    instead of the previous host directive.
+
+    Note that you are now using a list of hosts. The main one should
+    be the first listed. See migration section further in this release
+    note for details.
+      
+
+Shared Roster
+
+    Shared roster is a new feature that allow the ejabberd
+    administrator to add jabber user that will be present in the
+    roster of every users on the server.
+    Shared roster are enabled by adding:
+
+            {mod_shared_roster, []}
+
+    at the end of your module list in your ejabberd.cfg file.
+
+
+PostgreSQL (ODBC) support
+
+    This feature is experimental and not yet properly documented. This
+    feature is released for testing purpose.
+
+    You need to have Erlang/OTP R10 to compile with ODBC on various
+    flavour of *nix. You should use Erlang/OTP R10B-4, as this task
+    has became easier with this release. It comes already build in
+    Erlang/OTP Microsoft Windows binary.
+
+    PostgreSQL support is enabled by using the following module in
+    ejabberd.cfg instead of their standard counterpart:
+
+     mod_last_odbc.erl
+     mod_offline_odbc.erl
+     mod_roster_odbc.erl
+
+    The database schema is located in the src/odbc/pq.sql file.
+
+    Look at the src/ejabberd.cfg.example file for more information on
+    how to configure ejabberd with odbc support. You can get support
+    on how to configure ejabberd with a relational database.
+
+
+Migration from ejabberd 0.7.5
+
+    Migration is pretty straightforward as Mnesia database schema
+    conversions is handled automatically. Remember however that you
+    must backup your ejabberd database before migration.
+
+    Here are the following steps to proceed:
+
+    1. Stop your instance of ejabberd.
+
+    2. In ejabberd.cfg, define the host lists. Change the host
+    directive to the hosts one:
+    Before:
+      {host, "erlang-projects.org"}.
+    After:
+      {hosts, ["erlang-projects.org", "erlang-fr.org"]}.
+    Note that when you restart the server the existing users will be
+    affected to the first virtual host, so the order is important. You
+    should keep the previous hostname as the first virtual host.
+
+    3. Restart ejabberd.
+
+
+Bugfixes
+
+    This release contains several bugfixes and architectural changes.
+    Please refer to the Changelog file supplied with this release for
+    details of all improvements in the ejabberd code.

doc/release_notes_1.0.0.txt

@@ -0,0 +1,120 @@
+			    Release Notes
+			    ejabberd 1.0.0
+			    14 December 2005
+
+   This document describes the main changes in ejabberd 1.0.0. Unique in this
+   version is the compliancy with the XMPP (eXtensible Messaging and Presence
+   Protocol) standard. ejabberd is the first Open Source Jabber server claiming
+   to fully comply to the XMPP standard.
+
+   ejabberd can be downloaded from the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/
+
+   Detailed information can be found in the ejabberd Feature Sheet and User
+   Guide which are available on the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/docs.html
+
+
+   Recent changes include:
+
+
+Server-to-server Encryption for Enhanced Security
+
+  - Support for STARTTLS and SASL EXTERNAL to secure server-to-server traffic
+    has been added.
+  - Also, STARTTLS and Dialback has been implemented for server-to-server (s2s)
+    connections. Detailed information about these new features can be found on
+    http://ejabberd.jabber.ru/s2s-encryption
+  - commonName and dNSName fields matching were introduced to ease the process
+    of retrieving certificates.
+  - Different certificates can be defined for each virtual host.
+
+ODBC Support
+
+  - ODBC support has been improved to allow production use of ejabberd with
+    relational databases.
+  - Support for vCard storage in ODBC has been added.
+  - ejd2odbc.erl is a tool to convert an installation from Erlang's database
+    Mnesia to an ODBC compatible relational database.
+
+Native PostgreSQL Support
+
+  - Native PostgreSQL support gives you a better performance when you use
+    PostgreSQL.
+
+Shared Roster groups
+
+  - Shared Roster groups support has been enhanced. New is the ability to add
+    all registered users to everyone's roster. Detailed information about this
+    new feature can be found on http://ejabberd.jabber.ru/shared-roster-all
+
+Web Interface
+
+   - The web interface internal code has been modified for better integration
+     and compliancy with J-EAI, an ejabberd-based Enterprise Application
+     Integration platform.
+   - More XHTML 1.0 Transitional compliancy work was done.
+
+Transports
+
+   - A transport workaround can be enabled during compilation. To do this, you
+     can pass the "--enable-roster-gateway-workaround" option to the configure
+     script. (./configure --enable-roster-gateway-workaround)
+     This option allows transports to add items with subscription "to" in the
+     roster by sending <presence type='subscribed'/> stanza to user. This option
+     is only needed for JIT ICQ transport.
+     Warning: by enabling this option, ejabberd will not be fully XMPP compliant
+              anymore.
+
+Documentation and Internationalization
+
+   - Documentation has been extended to cover more topics.
+   - Translations have been updated.
+
+Bugfixes
+
+   - This release contains several bugfixes.
+   - Among other bugfixes include improvements to the client-to-server (c2s)
+     connection management module.
+   - Please refer to the ChangeLog file supplied
+     with this release regarding all improvements in ejabberd.
+
+
+   Installation Notes
+
+
+Supported Erlang Version
+
+   - You need at least Erlang/OTP R9C to run ejabberd 1.0.0.
+
+Installation
+
+   Installers are provided for Microsoft Windows and Linux/x86.
+   Installers can be retrieved from:
+   http://www.process-one.net/en/projects/ejabberd/download.html
+
+Migration Notes
+
+   - Before any migration, ejabberd system and database must be properly
+     backed up.
+   - When upgrading an ODBC-based installation, you will need to change the
+     relational database schema. The following SQL commands must be run on the
+     database:
+       CREATE SEQUENCE spool_seq_seq;
+       ALTER TABLE spool ADD COLUMN seq integer;
+       ALTER TABLE spool ALTER COLUMN seq SET DEFAULT nextval('spool_seq_seq');
+       UPDATE spool SET seq = DEFAULT;
+       ALTER TABLE spool ALTER COLUMN seq SET NOT NULL;
+
+References
+
+   Contributed tutorials of interest are:
+   - Migration from Jabberd1.4 to ejabberd:
+     http://ejabberd.jabber.ru/jabberd1-to-ejabberd
+   - Migration from Jabberd2 to ejabberd:
+     http://ejabberd.jabber.ru/jabberd2-to-ejabberd
+   - Transport configuration for connecting to other networks:
+     http://ejabberd.jabber.ru/tutorials-transports
+
+END
+

doc/release_notes_1.1.0.txt

@@ -0,0 +1,115 @@
+				Release Notes
+				ejabberd 1.1.0
+				24 April 2006
+
+   This document describes the main changes in ejabberd 1.1.0. This version
+   introduce new features including support for new Jabber Enhancement
+   Proposals and several performance improvements enabling deployments on an
+   even larger scale than already possible.
+
+   ejabberd can be downloaded from the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/
+
+   Detailed information can be found in the ejabberd Feature Sheet and User
+   Guide which are available on the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/docs.html
+
+   A complete list of changes is available from:
+   http://support.process-one.net/secure/ReleaseNote.jspa?projectId=10011&styleName=Html&version=10025
+
+
+   Recent changes include:
+
+
+New Jabber Enhancement Proposal support:
+
+  - JEP-0050: Ad-Hoc Commands.
+  - JEP-0138: Stream Compression.
+  - JEP-0175: SASL anonymous.
+
+Anonymous login
+
+  - SASL anonymous.
+  - Anonymous login for clients that do not yet support SASL Anonymous.
+  
+Relational database Support
+
+  - MySQL is now fully supported through ODBC and in native mode.
+  - Various improvements to the native database interfaces.
+  - The migration tool can use relational databases.
+
+Multi-User Chat improvements
+
+  - Logging of room discussion to text file is now supported.
+  - Better reconfiguration support.
+  - Security oriented fixes.
+  - Several improvements and updates to latest JEP-0045.
+
+Performance scalability improvements for large clusters
+
+  - Improved session synchronisation management between cluster nodes.
+  - Internal architecture has been reworked to use generalize Erlang/OTP
+    framework usage.
+  - Speed improvement on logger.
+  - TCP/IP packet reception change for better network throttling and
+    regulation.
+  As a result, these improvements will reduce load on large scale deployments.
+
+XMPP Protocol related improvements
+
+  - XML stanza size can be limited.
+  - Messages are send to all resources with the same highest priority.
+
+Documentation and Internationalization
+
+   - Documentation has been extended to cover more topics.
+   - Translations have been updated.
+
+Web interface
+
+   - XHTML 1.0 compliance.
+
+Bugfixes
+
+   - This release contains many bugfixes on various areas such as Publish-Subscribe, build
+     chain, installers, IRC gateway, ejabberdctl, amongst others.
+   - Please refer to the ChangeLog file supplied with this release regarding
+     all improvements in ejabberd.
+
+
+
+   Installation Notes
+
+Supported Erlang Version
+
+   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.0.
+
+Installation
+
+   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
+   Installers can be retrieved from:
+   http://www.process-one.net/en/projects/ejabberd/download.html
+
+Migration Notes
+
+   - Before any migration, ejabberd system and database must be properly
+     backed up.
+   - The database schema has not been changed comparing to version 1.0.0 and
+     consequently it does not require any migration.
+
+
+References
+
+   Contributed tutorials and documents of interest are:
+   - Migration from Jabberd1.4, Jabberd2 and WPJabber to ejabberd:
+     http://ejabberd.jabber.ru/migrate-to-ejabberd     
+   - Transport configuration for connecting to other networks:
+     http://ejabberd.jabber.ru/tutorials-transports
+   - Using ejabberd with MySQL native driver:
+     http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver
+   - Anonymous User Support:
+     http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support
+   - Frequently Asked Questions:
+     http://ejabberd.jabber.ru/faq
+
+END

doc/release_notes_1.1.1.txt

@@ -0,0 +1,119 @@
+				Release Notes
+				ejabberd 1.1.1 
+				28 April 2006
+
+   This document describes the main changes in ejabberd 1.1.x. This version
+   introduce new features including support for new Jabber Enhancement
+   Proposals and several performance improvements enabling deployments on an
+   even larger scale than already possible.
+
+   This release fix a security issue introduced in ejabberd 1.1.0. In SASL
+   mode, anonymous login was enabled as a default. Upgrading ejabberd 1.1.0 to
+   ejabberd 1.1.1 is highly recommended.
+
+   ejabberd can be downloaded from the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/
+
+   Detailed information can be found in the ejabberd Feature Sheet and User
+   Guide which are available on the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/docs.html
+
+   A complete list of changes is available from:
+   http://support.process-one.net/secure/ReleaseNote.jspa?projectId=10011&styleName=Html&version=10025
+
+
+   Recent changes include:
+
+
+New Jabber Enhancement Proposal support:
+
+  - JEP-0050: Ad-Hoc Commands.
+  - JEP-0138: Stream Compression.
+  - JEP-0175: SASL anonymous.
+
+Anonymous login
+
+  - SASL anonymous.
+  - Anonymous login for clients that do not yet support SASL Anonymous.
+  
+Relational database Support
+
+  - MySQL is now fully supported through ODBC and in native mode.
+  - Various improvements to the native database interfaces.
+  - The migration tool can use relational databases.
+
+Multi-User Chat improvements
+
+  - Logging of room discussion to text file is now supported.
+  - Better reconfiguration support.
+  - Security oriented fixes.
+  - Several improvements and updates to latest JEP-0045.
+
+Performance scalability improvements for large clusters
+
+  - Improved session synchronisation management between cluster nodes.
+  - Internal architecture has been reworked to use generalize Erlang/OTP
+    framework usage.
+  - Speed improvement on logger.
+  - TCP/IP packet reception change for better network throttling and
+    regulation.
+  As a result, these improvements will reduce load on large scale deployments.
+
+XMPP Protocol related improvements
+
+  - XML stanza size can be limited.
+  - Messages are send to all resources with the same highest priority.
+
+Documentation and Internationalization
+
+   - Documentation has been extended to cover more topics.
+   - Translations have been updated.
+
+Web interface
+
+   - XHTML 1.0 compliance.
+
+Bugfixes
+
+   - This release contains many bugfixes on various areas such as Publish-Subscribe, build
+     chain, installers, IRC gateway, ejabberdctl, amongst others.
+   - Please refer to the ChangeLog file supplied with this release regarding
+     all improvements in ejabberd.
+
+
+
+   Installation Notes
+
+Supported Erlang Version
+
+   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.0.
+
+Installation
+
+   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
+   Installers can be retrieved from:
+   http://www.process-one.net/en/projects/ejabberd/download.html
+
+Migration Notes
+
+   - Before any migration, ejabberd system and database must be properly
+     backed up.
+   - The database schema has not been changed comparing to version 1.0.0 and
+     consequently it does not require any migration.
+
+
+References
+
+   Contributed tutorials and documents of interest are:
+   - Migration from Jabberd1.4, Jabberd2 and WPJabber to ejabberd:
+     http://ejabberd.jabber.ru/migrate-to-ejabberd     
+   - Transport configuration for connecting to other networks:
+     http://ejabberd.jabber.ru/tutorials-transports
+   - Using ejabberd with MySQL native driver:
+     http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver
+   - Anonymous User Support:
+     http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support
+   - Frequently Asked Questions:
+     http://ejabberd.jabber.ru/faq
+
+END

doc/release_notes_1.1.2.txt

@@ -0,0 +1,119 @@
+				Release Notes
+				ejabberd 1.1.2
+			      27 September 2006
+
+   This document describes the main changes in ejabberd 1.1.2.
+
+   This version is a major improvement over ejabberd 1.1.1, improving the
+   overall behaviour of the server in many areas. Users of ejabberd 1.1.1
+   should upgrade to this new release for improved robustness and compliance.
+
+   ejabberd can be downloaded from the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/
+
+   Detailed information can be found in the Feature Sheet and in the
+   Installation and Operation Guide which are both available on the
+   Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/docs.html
+
+   ejabberd includes 44 improvements. A complete list of changes can be
+   retrieved from:
+   http://redir.process-one.net/ejabberd-1.1.2
+
+
+   Recent changes include:
+
+LDAP Improvements
+
+  - Major improvements have been made on the LDAP module. It is now more
+    flexible and more robust.
+
+HTTP Polling Fixes
+
+  - The HTTP polling modules have been fixed and improved: the connections are
+    closed properly and polled messages cannot be lost anymore.
+
+Roster Management Improvement
+
+  - Roster management improvements increase reliability, especially in cases
+  where users are on different servers.
+  - Shared rosters are more reliable.
+
+Improved Robustness
+
+  - It is now possible to limit the number of opened connections for a single
+  user.
+
+Relational databases
+
+  - Database support: Microsoft SQL Server is now officially supported in ODBC
+  mode.
+
+Publish-Subscribe Improvement
+
+  - Restricting node creation with a dedicated ACL rule is now possible.
+
+Localization
+
+  - A Czech translation has been added.
+  - Translations have been updated.
+
+Binary Installer
+
+  - New binary installer for Windows including all requirements.
+  - Improved installers for Linux and MacOSX (PowerPC)
+
+XMPP Compliancy
+
+  - Some protocol compliance fix have been added, after the Portland XMPP
+    Interop Meeting in July.
+
+Miscelanous
+
+  - MUC have been improved (logging rendering).
+  - The command line tool ejabberdctl has been improved.
+  - The build chain has been improved, including MacOSX support.
+  - The documentation has been improved and updated to describe the new
+    features.
+
+Bugfixes
+
+   - Anonymous login bugfixes.
+   - Please refer to the ChangeLog file supplied with this release regarding
+     all improvements in ejabberd.
+
+
+   Installation Notes
+
+Supported Erlang Version
+
+   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.2.
+   - The recommanded version is Erlang/OTP R10B-10.
+   - Erlang/OTP R11B has not yet been fully certified for ejabberd.
+
+Installation
+
+   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
+   They can be retrieved from:
+   http://www.process-one.net/en/projects/ejabberd/download.html
+
+Migration Notes
+
+   - Before any migration, ejabberd system and database must be properly
+   backed up.
+   - The relational database schema has changed between version 1.1.1 and
+   1.1.2. An "askmessage" column needs to be added in the "rosterusers" table
+   to perform the migration.
+
+
+References
+
+   Contributed tutorials and documents of interest are:
+   - Migration from other XMPP servers to ejabberd:
+     http://ejabberd.jabber.ru/migrate-to-ejabberd     
+   - Transport configuration for connecting to other networks:
+     http://ejabberd.jabber.ru/tutorials-transports
+   - Frequently Asked Questions:
+     http://ejabberd.jabber.ru/faq
+
+END

doc/release_notes_1.1.3.txt

@@ -0,0 +1,14 @@
+			    Release Notes
+			    ejabberd 1.1.3
+			   2 February 2007
+
+  ejabberd 1.1.3 is a security fix release for ejabberd roster ODBC
+  module.
+
+  The upgrade is only necessary if you are using ejabberd with the
+  mod_roster_odbc.
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/projects/ejabberd/
+
+END

doc/release_notes_1.1.4.txt

@@ -0,0 +1,31 @@
+			      Release Notes
+			      ejabberd 1.1.4
+			   3 september 2007
+
+  ejabberd 1.1.4 is a bugfix release for ejabberd 1.1.x branch.
+
+  ejabberd 1.1.4 includes 10 improvements. A complete list of changes
+  can be retrieved from:
+   http://redir.process-one.net/ejabberd-1.1.4
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/projects/ejabberd/
+
+
+   Recent changes include:
+
+- Better LDAP support.
+- Support for UTF-8 with MySQL 5.
+- Roster migration script bugfixes.
+- Performance improvements on user removal.
+- Traffic shapers bugfix.
+- Configuration: host value is now case insensitive.
+- Build: ejabberd.cfg file is not overwritten with 'make install' command.
+
+
+Bugs report
+
+  You can officially report bugs on Process-one support site:
+  http://support.process-one.net/
+
+END

doc/release_notes_2.0.0.txt

@@ -0,0 +1,208 @@
+
+                              Release Notes
+                             ejabberd 2.0.0
+                            21 February 2008
+
+  ejabberd 2.0.0 is a major new version for ejabberd adding plenty of
+  new features, performance and scalability improvements and
+  architectural changes.
+
+  ejabberd 2.0.0 includes more than 200 improvements over ejabberd
+  1.1.x. A complete list of changes can be retrieved from:
+   http://redir.process-one.net/ejabberd-2.0.0
+
+  The new code can be downloaded from ejabberd downloads page:
+     http://www.process-one.net/en/ejabberd/
+
+
+   Recent changes include:
+
+
+* Clustering and Architecture
+
+- New front-end and back-end cluster architecture for better
+  scalability and robustness. Back-end nodes are able to run a fully
+  fault-tolerant XMPP router and services, but you can now deploy
+  many front-end nodes to share the load without needing to synchronize
+  any state with the back-ends.
+- All components now run in cluster mode (For example, Multi-User chat
+  service and file transfer proxy).
+- New load balancing algorithm to support Multi-User chat and gateways
+  clustering. More generally it supports any external component load
+  balancing.
+- ejabberd watchdog to receive warning on suspicious resources consumption.
+- Traffic shapers are now supported on components. This protect
+  ejabberd from components and gateways abuses.
+
+
+* Publish and Subscribe
+
+- Complete rewrite of the PubSub module. The new PubSub module is
+  plugin-based, allowing developers to create new nodes type. Any
+  application can be plugged to ejabberd and can provide rich presence
+  as a pubsub plugin.
+- Personal Eventing via Pubsub support (XEP-0163). This module is
+  implemented as a PubSub service. It supports user mood (XEP-107),
+  User Tune (XEP-118), user location (XEP-0080) or user avatar
+  (XEP-0084) for example.
+
+
+* Server to Server (s2s)
+
+- More robust code with connection timeout implementation.
+- Support for multiple s2s connections per domain.
+- s2s whitelist and blacklist support.
+- s2s retrial interval.
+
+
+* LDAP
+
+- Many enterprise-class enhancements such as better behaviour under
+  heavy load.
+- Support for LDAP servers pool.
+- Simplified use of virtual hosting with LDAP with domain substitution
+  in config.
+- Ability to match on several userid attributes.
+
+
+* Multi-User Chat
+
+- Clustering and load balancing support.
+- Ability to define default room configuration in ejabberd config file.
+- Many anti abuse features have been added:
+  . New ACL to limit the creation of persistent room to authorized users.
+  . Ability to define the maximum number of users per room.
+  . Limitation of the rate of message and presence packets.
+  . Limitation of the maximum number of room a user can join at the same time.
+
+
+* File Transfer
+
+- XEP-0065 - Proxy65 file transfer proxy. The proxy can run in
+  cluster mode.
+
+
+* Authentication
+
+- PAM (Pluggable Authentication Modules) support on *nix systems.
+- External Authentication protocol is now fully documented.
+
+
+* Web Client Support
+
+- XEP-0124 - BOSH support: BOSH (Bidirectional-streams Over
+  Synchronous HTTP) was formerly known as "HTTP binding". It provides
+  an efficient alternative to HTTP polling for scalable Web based chat
+  solutions.
+- HTTP module can now serve static documents (with
+  mod_http_fileserver). It is needed for high-performance Web 2.0 chat
+  / IM application. System administrators can now avoid using a proxy
+  (like Apache) that handles much less simultaneous than ejabberd HTTP
+  module.
+- Added limitations enforcement on HTTP poll and HTTP bind modules
+  (bandwidth, packet size).
+
+
+* System Administration
+
+- XEP-0133 - Service administration support. System administrators can
+  now perform lot of ejabberd related admin tasks from their XMPP
+  client, through adhoc commands.
+- Dynamic log levels: Improved logging with more log levels. You can
+  now change the loglevel at run time. No performance penalty is
+  involved when less verbose levels are used.
+- The ejabberdctl command-line administration script now can start 
+  and stop ejabberd. It also includes other useful options.
+
+
+* Localization
+
+- ejabberd is now translated to 24 languages: Catalan, Chinese, Czech,
+  Dutch, English, Esperanto, French, Galician, German, Italian, Japanese, 
+  Norwegian, Polish, Portuguese, Portuguese (Brazil), Russian, Slovak, 
+  Spanish, Swedish, Thai, Turkish, Ukrainian, Vietnamese, Walloon.
+
+
+* Build and Installer
+
+- Many launch script improvements.
+- New translations. The binary installer is now available in Chinese,
+  Dutch, English, French, German, Spanish, Russian.
+- Makefile now implements uninstall command.
+- Full MacOSX compliance in Makefile.
+- Configure script is clever at finding libraries in unusual places.
+
+
+* Development API
+
+- Several hooks have been added for module developers (most notably
+  presence related hooks).
+- HTTP request handler to write HTTP based plugins.
+- Manage connections IP address.
+
+
+* Bugfixes
+
+- ejabberd 2.0.0 also fixes numerous small bugs :) Read the full
+  changelog for details.
+
+
+
+   Important Note:
+
+- Since this release, ejabberd requires Erlang R10B-5 or higher. 
+  R11B-5 is the recommended version. R12 is not yet officially 
+  supported, and is not recommended for production servers.
+
+
+
+   Upgrading From ejabberd 1.x:
+
+- If you upgrade from a version older than 1.1.4, please check the
+  Release Notes of the intermediate versions for additional
+  information about database or configuration changes.
+
+- The database schemas didn't change since ejabberd 1.1.4. Of course,
+  you are encouraged to make a database backup of your SQL database,
+  or your Mnesia spool directory before upgrading ejabberd.
+
+- The ejabberdctl command line administration script is improved in
+  ejabberd 2.0.0, and now it can start and stop ejabberd. If you
+  already wrote your own start script for ejabberd 1.x, you can
+  continue using it, or try ejabberdctl. For your convenience, the
+  ejabberd Guide describes all the ejabberd and Erlang options used by
+  ejabberdctl.
+
+- The example ejabberd.cfg file has been reorganized, but its format
+  and syntax rules are the same. So, you can continue using your
+  ejabberd.cfg file from 1.x if you want. The most important changes
+  are described now.
+
+- The 'ssl' option is no longer available in the listening ports. For
+  legacy SSL encryption use the option 'tls'. For STARTTLS encryption
+  as defined in RFC 3920 XMPP-CORE use the option 'starttls'. Check
+  the ejabberd Guide for more information about configuring listening
+  ports.
+
+- The options 'welcome_message' and 'registration_watchers' are now
+  options of the module mod_register. Check in the ejabberd Guide how
+  to configure that module.
+
+- To enable PEP support in mod_pubsub, you need to enable it in the
+  mod_pubsub configuration, and also enable the new module
+  mod_caps. Check the section about mod_pubsub in the ejabberd Guide.
+
+- Other new features and improvements also require changes in the
+  ejabberd.cfg, like mod_http_bind, mod_http_fileserver, mod_proxy65,
+  loglevel, pam_service, and watchdog_admins. Search for those words
+  in the ejabberd Guide and the example ejabberd.cfg.
+
+
+
+   Bug Reports
+
+  You can officially report bugs on Process-one support site:
+  https://support.process-one.net/
+
+
+END

doc/release_notes_2.0.1.txt

@@ -0,0 +1,30 @@
+
+                              Release Notes
+                             ejabberd 2.0.1
+                               20 May 2008
+
+  ejabberd 2.0.1 is a bugfix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.1 includes 10 improvements and 32 bugfixes.
+  A complete list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.1
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/projects/ejabberd/
+
+
+   Recent changes include:
+
+- Erlang R12 support.
+- Better LDAP handling.
+- PubSub bugfixes.
+- Documentation improvements.
+- inband registration limitation per IP.
+- s2s improvements.
+
+Bugs report
+
+  You can officially report bugs on Process-one support site:
+  http://support.process-one.net/
+
+END

doc/release_notes_2.0.2.txt

@@ -0,0 +1,34 @@
+
+                              Release Notes
+                             ejabberd 2.0.2
+                             28 August 2008
+
+  ejabberd 2.0.2 is the second bug fix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.2 includes many bugfixes and a few improvements.
+  A complete list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.2
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  Recent changes include:
+
+- Anti-abuse feature: client blacklist support by IP.
+- Guide: new section Securing ejabberd; improved usability.
+- LDAP filter optimisation: ability to filter user in ejabberd and not LDAP.
+- MUC improvements: room options to restrict visitors; broadcast reasons.
+- Privacy rules: fix MySQL storage.
+- Pub/Sub and PEP: many improvements in implementation and protocol compliance.
+- Proxy65: send valid SOCKS5 reply (removed support for Psi < 0.10).
+- Web server embedded: better support for HTTPS.
+- Binary installers: SMP on Windows; don't remove config when uninstalling.
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/
+
+END

doc/release_notes_2.0.3.txt

@@ -0,0 +1,35 @@
+
+                              Release Notes
+                             ejabberd 2.0.3
+                             14 January 2009
+
+  ejabberd 2.0.3 is the third bugfix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.3 includes several bugfixes and a few improvements.
+  A complete list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.3
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  Recent changes include:
+
+- Do not ask certificate for client (c2s)
+- Check digest-uri in SASL digest authentication
+- Use send timeout to avoid locking on gen_tcp:send
+- Fix ejabberd reconnection to database
+- HTTP-Bind: handle wrong order of packets
+- MUC: Improve traffic regulation management
+- PubSub: Several bugfixes and improvements for best coverage of XEP-0060 v1.12
+- Shared Roster Groups: push immediately membership changes
+- Rotate also sasl.log on "reopen-log" command
+- Binary Windows installer: better detect "Error running Post Install Script"
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/
+
+END

doc/release_notes_2.0.4.txt

@@ -0,0 +1,44 @@
+
+                              Release Notes
+                             ejabberd 2.0.4
+
+  ejabberd 2.0.4 is the fourth bugfix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.4 includes several bugfixes.
+  A detailed list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.4
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  The changes are:
+
+- Ensure ID attribute in roster push is unique
+- Authentication: Fix Anonymous auth when enabled with broken ODBC
+- Authentication: Unquote correctly backslash in DIGEST-MD5 SASL responses
+- Authentication: Cancel presence subscriptions on account deletion
+- LDAP: Close a connection on tcp_error
+- LDAP: Implemented queue for pending queries
+- LDAP: On failure of LDAP connection, waiting is done on pending queue
+- MUC: Owner of a password protected room must also provide the password
+- MUC: Prevent XSS in MUC logs by linkifying only a few known protocols
+- Privacy rules: Items are now processed in the specified order
+- Privacy rules: Fix to correctly block subscription requests
+- Proxy65: If ip option is not defined, take an IP address of a local hostname
+- PubSub: Add roster subscription handling; send PEP events to all resources
+- PubSub: Allow node creation without configure item
+- PubSub: Requesting items on a node which exists, but empty returns an error
+- PEP: Fix sending notifications to other domains and s2s
+- S2S: Fix problem with encrypted connection to Gtalk and recent Openfire
+- S2S: Workaround to get DNS SRV lookup to work on Windows machine
+- Shared Roster Groups: Fix to not resend authorization request
+- WebAdmin: Fix encryption problem for ejabberd_http after timeout
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/
+
+END

doc/release_notes_2.0.5.txt

@@ -0,0 +1,33 @@
+
+                              Release Notes
+                             ejabberd 2.0.5
+
+  ejabberd 2.0.5 is the fifth bugfix release in ejabberd 2.0.x branch.
+
+  ejabberd 2.0.5 includes three bugfixes.
+  More details of those fixes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.5
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  The changes are:
+
+- Fix two problems introduced in ejabberd 2.0.4: subscription request
+  produced many authorization requests with some clients and
+  transports; and subscription requests were not stored for later
+  delivery when receiver was offline.
+
+- Fix warning in expat_erl.c about implicit declaration of x_fix_buff
+
+- HTTP-Bind (BOSH): Fix a missing stream:error in the returned
+  remote-stream-error stanza
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/
+
+END

doc/release_notes_2.1.0.txt

@@ -0,0 +1,281 @@
+
+                              Release Notes
+                             ejabberd 2.1.0
+
+  ejabberd 2.1.0 is a major new version for ejabberd adding many
+  new features, performance and scalability improvements.
+
+  ejabberd 2.1.0 includes many new features, improvements and bug fixes.
+  A complete list of changes can be retrieved from:
+   http://redir.process-one.net/ejabberd-2.1.0
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  New features and improvements:
+
+* Anti-abuse
+- Captcha support (XEP-0158). The example script uses ImageMagick.
+- New option: registration_timeout to limit registrations by time
+- Use send timeout to avoid locking on gen_tcp:send
+- mod_ip_blacklist: client blacklist support by IP
+
+* API
+- ejabberd_http provides Host, Port, Headers and Protocol in HTTP requests
+- Export function to create MUC room
+- New events: s2s_send_packet and s2s_receive_packet
+- New event: webadmin_user_parse_query when POST in web admin user page
+- Support distributed hooks over the cluster
+
+* Authentification
+- Extauth responses: log strange responses and add timeout
+
+* Binary Installer
+- Includes exmpp library to support import/export XML files
+
+* Caps
+- Remove useless caps tables entries
+- mod_caps must handle correctly external contacts with several resources
+- Complain if mod_caps disabled and mod_pubsub has PEP plugin enabled
+
+* Clustering and Architecture
+
+* Configuration
+- Added option access_max_user_messages for mod_offline
+- Added option backlog for ejabberd_listener to increase TCP backlog
+- Added option define_macro and use_macro
+- Added option include_config_file to include additional configuration files
+- Added option max_fsm_queue
+- Added option outgoing_s2s_options to define IP address families and timeout
+- Added option registration_timeout to ejabberd.cfg.example
+- Added option s2s_dns_options to define DNS timeout and retries
+- Added option ERL_OPTIONS to ejabberdctl.cfg
+- Added option FIREWALL_WINDOW to ejabberdctl.cfg
+- Added option EJABBERD_PID_PATH to ejabberdctl.cfg
+- Deleted option user_max_messages of mod_offline
+- Check certfiles are readable on server start and listener start
+- Config file management mix file reading and sanity check
+- Include example PAM configuration file: ejabberd.pam
+- New ejabberd listener: ejabberd_stun
+- Support to bind the same port to multiple interfaces
+- New syntax to specify the IP address and IPv6 in listeners
+  configuration. The old options {ip,{1,2,3,4}} and inet6 are
+  supported even if they aren't documented.
+- New syntax to specify the network protocol: tcp or udp
+- Report error at startup if a listener module isn't available
+- Only listen in a port when actually ready to serve requests
+- In default config, only local accounts can create rooms and PubSub nodes
+
+* Core architecture
+- More verbose error reporting for xml:element_to_string
+- Deliver messages when first presence is Invisible
+- Better log message when config file is not found
+- Include original timestamp on delayed presences
+
+* Crypto
+- Do not ask certificate for client (c2s)
+- SSL code remove from ejabberd in favor of TLS
+- Support Zlib compression after STARTTLS encryption
+- tls v1 client hello
+
+* Documentation
+- Document possible default MUC room options
+- Document service_check_from in the Guide
+- Document s2s_default_policy and s2s_host in the Guide
+- new command and guide instructions to change node name in a Mnesia database
+
+* ejabberd commands
+- ejabberd commands: separate command definition and calling interface
+- access_commands restricts who can execute what commands and arguments
+- ejabberdctl script now displays help and categorization of commands
+
+* HTTP Binding and HTTP Polling
+- HTTP-Bind: module optimization and clean-up
+- HTTP-Bind: allow configuration of max_inactivity timeout
+- HTTP-Poll: turn session timeout into a config file parameter
+
+* Jingle
+- STUN server that facilitates the client-to-client negotiation process
+
+* LDAP
+- Faster reconnection to LDAP servers
+- LDAP filter optimisation: Add ability to filter user in ejabberd and not LDAP
+- LDAP differentiates failed auth and unavailable auth service
+- Improve LDAP logging
+- LDAPS support using TLS.
+
+* Localization
+- Use Gettext PO for translators, export to ejabberd MSG
+- Support translation files for additional projects
+- Most translations are updated to latest code
+- New translation to Greek language
+
+* Multi-User Chat (MUC)
+- Allow admins to send messages to rooms
+- Allow to store room description
+- Captcha support in MUC: the admin of a room can configure it to
+  require participants to fill a captcha to join the room.
+- Limit number of characters in Room ID, Name and Description
+- Prevent unvoiced occupants from changing nick
+- Support Result Set Management (XEP-0059) for listing rooms
+- Support for decline of invitation to MUC room
+- mod_muc_log options: plaintext format; filename with only room name
+
+* Performance
+- Run roster_get_jid_info only if privacy list has subscription or group item
+- Significant PubSub performance improvements
+
+* Publish-Subscribe
+- Add nodetree filtering/authorization
+- Add subscription option support for collection nodes
+- Allow Multiple Subscriptions
+- Check option of the nodetree instead of checking configuration
+- Implement whitelist authorize and roster access model
+- Implicit item deletion is not notified when deleting node
+- Make PubSub x-data configuration form handles list value
+- Make default node name convention XEP-compatible, document usage of hierarchy
+- Node names are used verbatim, without separating by slash, unless a
+  node plugin uses its own separator
+- Send authorization update event (XEP-0060, 8.6)
+- Support of collection node subscription options
+- Support ODBC storage. Experimental, needs more testing.
+
+* Relational databases:
+- Added MSSQL 2000 and 2005
+- Privacy rules storage in MySQL
+- Implement reliable ODBC transaction nesting
+
+* Source Package
+- Default installation directories changed. Please see the upgrade notes below.
+- Allow more environment variable overrides in ejabberdctl
+- ChangeLog is not edited manually anymore; it's generated automatically.
+- Install the ejabberd Guide
+- Install the ejabberd include files
+- New option for the 'configure' script: --enable-user which installs
+  ejabberd granting permission to manage it to a regular system user;
+  no need to use root account to.
+- Only try to install epam if pam was enabled in configure script
+- Spool, config and log dirs: owner writes, group reads, others do nothing.
+- Provides an example ejabberd.init file
+
+* S2S
+- Option to define s2s outgoing behaviour: IPv4, IPv6 and timeout
+- DNS timeout and retries, configurable with s2s_dns_options.
+
+* Shared rosters
+- When a member is added/removed to group, send roster upgrade to group members
+
+* Users management
+- When account is deleted, cancel presence subscription for all roster items
+
+* XEP Support
+- Added XEP-0059 Result Set Management (for listing rooms)
+- Added XEP-0082 Date Time
+- Added XEP-0085 Chat State Notifications
+- Added XEP-0157 Contact Addresses for XMPP Services
+- Added XEP-0158 CAPTCHA Forms (in MUC rooms)
+- Added STUN server, for XEP-0176: Jingle ICE-UDP Transport Method
+- Added XEP-0199 XMPP Ping
+- Added XEP-0202 Entity Time
+- Added XEP-0203 Delayed Delivery
+- Added XEP-0227 Portable Import/Export Format for XMPP-IM Servers
+- Added XEP-0237 Roster Versioning
+
+* Web Admin
+- Display the connection method of user sessions
+- Cross link of ejabberd users in the list of users and rosters
+- Improved the browsing menu: don't disappear when browsing a host or node
+- Include Last-Modified HTTP header in responses to allow caching
+- Make some Input areas multiline: options of listening ports and modules
+- Support PUT and DELETE methods in ejabberd_http
+- WebAdmin serves Guide and links to related sections
+
+* Web plugins
+- mod_http_fileserver: new option directory_indices, and improve logging
+
+
+   Important Notes:
+
+- ejabberd 2.1.0 requires Erlang R10B-9 or higher.
+  R12B-5 is the recommended version. Support for R13B is experimental.
+
+
+   Upgrading From ejabberd 1.x.x:
+
+- Check the Release Notes of the intermediate versions for additional
+  information about database or configuration changes.
+
+
+   Upgrading From ejabberd 2.0.x:
+
+- The database schemas have three changes since ejabberd 2.0.x.
+  Check the database creation SQL files and update your database.
+  1) New table roster_version to support roster versioning.
+  2) Six new tables for optional pubsub ODBC storage.
+  3) Some tables in the MySQL database have a new created_at column.
+
+- As usual, it is recommended to backup the Mnesia spool directory and
+  your SQL database (if used) before upgrading ejabberd.
+
+- Between ejabberd 2.0.0 and 2.0.5, mod_pubsub used "default" as the
+  default node plugin. But in 2.1.0 this is renamed to "hometree".
+  You have to edit your ejabberd config file and replace those names.
+  If you used ejabberd 2.0.5 or older, the database will be updated
+  automatically. But if you were using ejabberd from SVN, you must
+  manually run ejabberdctl with the command: rename_default_nodeplugin.
+  Running this command on already updated database does nothing.
+
+- The listener options 'ip' and 'inet6' are not documented anymore
+  but they are supported and you can continue using them.
+  There is a new syntax to define IP address and IP version.
+  As usual, check the ejabberd Guide for more information.
+
+- The log file sasl.log is now called erlang.log
+
+- ejabberdctl commands now have _ characters instead of -.
+  For backwards compatibility, it is still supported -.
+
+- mod_offline has a new option: access_max_user_messages.
+  The old option user_max_messages is no longer supported.
+
+- If you upgrade from ejabberd trunk SVN, you must execute this:
+  $ ejabberdctl rename_default_nodeplugin
+
+- Default installation directories changed a bit:
+  * The Mnesia spool files that were previously stored in
+      /var/lib/ejabberd/db/NODENAME/*
+    are now stored in
+      /var/lib/ejabberd/*
+  * The directories
+      /var/lib/ejabberd/ebin
+      /var/lib/ejabberd/priv
+    and their content is now installed as
+      /lib/ejabberd/ebin
+      /lib/ejabberd/priv
+  * There is a new directory with Erlang header files:
+      /lib/ejabberd/include
+  * There is a new directory for ejabberd documentation,
+    which includes the Admin Guide and the release notes::
+      /share/doc/ejabberd
+
+- How to upgrade from previous version to ejabberd 2.1.0:
+  1. Stop the old instance of ejabberd.
+  2. Run 'make install' of new ejabberd 2.1.0 to create the new directories.
+  3. Copy the content of your old directory:
+       /var/lib/ejabberd/db/NODENAME/
+     to the new location:
+       /var/lib/ejabberd/
+     so you will have the files like this:
+       /var/lib/ejabberd/acl.DCD ...
+  4. You can backup the content of those directories and delete them:
+       /var/lib/ejabberd/ebin
+       /var/lib/ejabberd/priv
+       /var/lib/ejabberd/db
+  5. Now try to start your new ejabberd 2.1.0.
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/

doc/release_notes_2.1.1.txt

@@ -0,0 +1,47 @@
+
+                              Release Notes
+                             ejabberd 2.1.1
+
+  ejabberd 2.1.1 is the first bugfix release in ejabberd 2.1.x branch.
+
+  ejabberd 2.1.1 includes several important bugfixes.
+  More details of those fixes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.1.1
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  The changes are:
+
+* Core
+- Call ejabberd_router:route/3 instead of sending a message
+- Can't connect if starttls_required and zlib are set
+- Routes vCard request to the occupant full JID, but should to bare JID
+- S2S: fix allow_host/2 on subdomains. added hook s2s_allow_host
+
+* MUC
+- Support converting one-to-one chat to MUC
+- Add support for serving a Unique Room Name
+
+* Publish Subscribe
+- Receive same last published PEP items at reconnect if several resources online
+- Typo in mod_pubsub_odbc breaks Service Discovery and more
+
+* Web
+- Fix memory and port leak when TLS is enabled in HTTP
+- WebAdmin doesn't report correct last activity with postgresql backend
+- Option to define custom HTTP headers in mod_http_fileserver
+- Show informative webpage when browsing the HTTP-Poll page
+
+* Other
+- Change captcha.sh to not depend on bash
+- Generate main XML file also when exporting only a vhost
+- Fix last newline in ejabberdctl result
+- Guide: fix -setcookie, mod_pubsub_odbc host, content_types
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/

doc/release_notes_2.1.2.txt

@@ -0,0 +1,51 @@
+
+                              Release Notes
+                             ejabberd 2.1.2
+
+  ejabberd 2.1.2 is the second bugfix release in ejabberd 2.1.x branch.
+
+  ejabberd 2.1.2 includes several bugfixes.
+  More details of those fixes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.1.2
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  The major changes are:
+
+* Core
+- Close sessions that were half connected
+- Fix SASL PLAIN authentication message for RFC4616 compliance
+- Fix support for old Erlang/OTP R10 and R11
+- Return proper error (not 'conflict') when register is forbidden by ACL
+- When ejabberd stops, send stream close to clients
+
+* ejabberdctl
+- Check for EGID in ejabberdctl command
+- Command to stop ejabberd informing users, with grace period
+- If there's a problem in config file, display config lines and stop node
+
+* MUC
+- Kick occupants with reason when room is stopped due to MUC shutdown
+- Write in room log when a room is created, destroyed, started, stopped
+
+* PubSub and PEP
+- Don't call gen_server on internal event (improves performance and scalability)
+- Fix duplicate SHIM header in Pubsub message
+- Notification messages of Pubsub node config change contained a SHIM header
+- SubID SHIM header missing in Pubsub message with multiple
+  subscriptions on the same node
+- PEP: last published item not sent from unavailable users when the
+  subscription is implicit (XEP-0115)
+- pep_mapping not working due to Node type mismatch
+
+* WebAdmin
+- If big offline message queue, show only subset on WebAdmin
+- Support in user list page of WebAdmin when mod_offline is disabled
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/

doc/version.tex

@@ -0,0 +1,2 @@
+% ejabberd version (automatically generated).
+\newcommand{\version}{2.1.2}

docker/README.md

@@ -1,402 +0,0 @@
-ejabberd container
-
-- [Introduction](#introduction)
-    - [Version](#version)
-- [Quick Start](#quick-start)
-- [Usage](#usage)
-    - [Persistence](#persistence)
-    - [SSL Certificates](#ssl-certificates)
-    - [Base Image](#base-image)
-    - [Cluster Example](#cluster-example)
-- [Runtime Configuration](#runtime-configuration)
-    - [Served Hostnames](#served-hostnames)
-    - [Authentication](#authentication)
-    - [Admins](#admins)
-    - [Users](#users)
-    - [SSL](#ssl)
-    - [Erlang](#erlang)
-    - [Modules](#modules)
-    - [Logging](#logging)
-    - [Mount Configurations](#mount-configurations)
-- [Maintenance](#maintenance)
-    - [Register Users](#register-users)
-    - [Creating Backups](#creating-backups)
-    - [Restoring Backups](#restoring-backups)
-- [Debug](#debug)
-    - [Erlang Shell](#erlang-shell)
-    - [System Shell](#system-shell)
-    - [System Commands](#system-commands)
-- [Exposed Ports](#exposed-ports)
-
-# Introduction
-
-This [ejabberd][] docker container is based on the work done by [rroemhild][]. See more [in this blogpost][].
-This container includes the necessary files to build your own containerized ejabberd,
-but *IT IS NOT* used to generate official images on the docker [hub][].
-This container is not maintained by [ProcessOne][].
-
-[ProcessOne][] provides and maintain official containers on the docker [hub][], which targets developers for now and will becomes production ready in a near future.
-These [new containers] allow to build and run ejabberd in a simple and lightweight environment.
-
-[ejabberd]: https://www.ejabberd.im/
-[rroemhild]: https://github.com/rroemhild/docker-ejabberd/
-[in this blogpost]: https://blog.process-one.net/ejabberd-16-12/
-[hub]: https://hub.docker.com/r/ejabberd/ecs/
-[new containers]: https://github.com/processone/docker-ejabberd/
-[ProcessOne]: https://www.process-one.net/
-
-## Version
-
-Current Version: `17.08`
-
-Docker Tag Names are based on ejabberd versions in git [branches][] and [tags][]. The image tag `:latest` is based on the master branch.
-
-[tags]: https://github.com/rroemhild/docker-ejabberd/tags
-[branches]: https://github.com/rroemhild/docker-ejabberd/branches
-
-# Quick Start
-
-You can start of with the following container:
-
-```bash
-docker run -d \
-    --name "ejabberd" \
-    -p 5222:5222 \
-    -p 5269:5269 \
-    -p 5280:5280 \
-    -h 'xmpp.example.de' \
-    -e "XMPP_DOMAIN=example.de" \
-    -e "ERLANG_NODE=ejabberd" \
-    -e "EJABBERD_ADMINS=admin@example.de admin2@example.de" \
-    -e "EJABBERD_USERS=admin@example.de:password1234 admin2@example.de" \
-    -e "TZ=Europe/Berlin" \
-    rroemhild/ejabberd
-```
-
-or with the [docker-compose](examples/docker-compose/docker-compose.yml) example
-
-```bash
-wget https://raw.githubusercontent.com/rroemhild/docker-ejabberd/master/examples/docker-compose/docker-compose.yml
-docker-compose up
-```
-
-# Usage
-
-## Persistence
-
-For storage of the application data, you can mount volumes at
-
-* `/opt/ejabberd/ssl`
-* `/opt/ejabberd/backup`
-* `/opt/ejabberd/upload`
-* `/opt/ejabberd/database`
-
-or use a data container
-
-```bash
-docker create --name ejabberd-data rroemhild/ejabberd-data
-docker run -d --name ejabberd --volumes-from ejabberd-data rroemhild/ejabberd
-```
-
-## SSL Certificates
-
-TLS is enabled by default and the run script will auto-generate two snake-oil certificates during boot if you don't provide your SSL certificates.
-
-To use your own certificates, there are two options.
-
-1. Mount the volume `/opt/ejabberd/ssl` to a local directory with the `.pem` files:
-
-    * /tmp/ssl/host.pem (SERVER_HOSTNAME)
-    * /tmp/ssl/xmpp_domain.pem (XMPP_DOMAIN)
-
-    Make sure that the certificate and private key are in one `.pem` file. If one file is missing it will be auto-generated. I.e. you can provide your certificate for your **XMMP_DOMAIN** and use a snake-oil certificate for the `SERVER_HOSTNAME`.
-
-2. Specify the certificates via environment variables: **EJABBERD_SSLCERT_HOST** and **EJABBERD_SSLCERT_EXAMPLE_COM**. For the
-domain certificates, make sure you match the domain names given in **XMPP_DOMAIN** and replace dots and dashes with underscore.
-
-## Base Image
-
-Build your own ejabberd container image and add your config templates, certificates or [extend](#cluster-example) it for your needs.
-
-```
-FROM rroemhild/ejabberd
-ADD ./ejabberd.yml.tpl /opt/ejabberd/conf/ejabberd.yml.tpl
-ADD ./ejabberdctl.cfg.tpl /opt/ejabberd/conf/ejabberdctl.cfg.tpl
-ADD ./example.com.pem /opt/ejabberd/ssl/example.com.pem
-```
-
-If you need root privileges switch to `USER root` and go back to `USER ejabberd` when you're done.
-
-## Cluster Example
-
-The [docker-compose-cluster](examples/docker-compose-cluster) example demonstrates how to extend this container image to setup a multi-master cluster.
-
-# Runtime Configuration
-
-You can additionally provide extra runtime configuration in a downstream image by replacing the config template `ejabberd.yml.tpl` with one based on this image's template and include extra interpolation of environment variables. The template is parsed by Jinja2 with the runtime environment (equivalent to Python's `os.environ` available as `env`).
-
-## Served Hostnames
-
-By default the container will serve the XMPP domain `localhost`. In order to serve a different domain at runtime, provide the **XMPP_DOMAIN** variable with a domain name. You can add more domains separated with whitespace.
-
-```
-XMPP_DOMAIN=example.ninja xyz.io test.com
-```
-
-## Authentication
-
-Authentication methods can be set with the **EJABBERD_AUTH_METHOD** environment variable. The default authentication mode is `internal`.
-
-Supported authentication methods:
-
-* anonymous
-* internal
-* external
-* ldap
-
-Internal and anonymous authentication example:
-
-```
-EJABBERD_AUTH_METHOD=internal anonymous
-```
-
-[External authentication](http://docs.ejabberd.im/admin/guide/configuration/#external-script) example:
-```
-EJABBERD_AUTH_METHOD=external
-EJABBERD_EXTAUTH_PROGRAM="/opt/ejabberd/scripts/authenticate-user.sh"
-EJABBERD_EXTAUTH_INSTANCES=3
-EJABBERD_EXTAUTH_CACHE=600
-```
-**EJABBERD_EXTAUTH_INSTANCES** must be an integer with a minimum value of 1. **EJABBERD_EXTAUTH_CACHE** can be set to "false" or an integer value representing cache time in seconds. Note that caching should not be enabled if internal auth is also enabled.
-
-### Password format
-
-The variable `EJABBERD_AUTH_PASSWORD_FORMAT` controls in which format user passwords are
-stored. Possible values are `plain` and `scram`. The default is to store
-[SCRAM](https://en.wikipedia.org/wiki/Salted_Challenge_Response_Authentication_Mechanism)bled
-passwords, meaning that it is impossible to obtain the original plain password from the
-stored information.
-
-NOTE: SCRAM does not work with SIP/TURN foreign authentication methods. In this case, you
-may have to disable the option. More details can be found here:
-https://docs.ejabberd.im/admin/configuration/#internal
-
-If using SCRAM with an SQL database that has plaintext passwords stored, use the command
-
-```
-ejabberdctl convert_to_scram example.org
-```
-
-to convert all your existing plaintext passwords to scrambled format.
-
-### MySQL Authentication
-
-Set `EJABBERD_AUTH_METHOD=external` and `EJABBERD_EXTAUTH_PROGRAM=/opt/ejabberd/scripts/lib/auth_mysql.py` to enable MySQL authentication. Use the following environment variables to configure the database connection and the layout of the database. Password changing, registration, and unregistration are optional features and are enabled only if the respective queries are provided.
-
-- **AUTH_MYSQL_HOST**: The MySQL host
-- **AUTH_MYSQL_USER**: Username to connect to the MySQL host
-- **AUTH_MYSQL_PASSWORD**: Password to connect to the MySQL host
-- **AUTH_MYSQL_DATABASE**: Database name where to find the user information
-- **AUTH_MYSQL_HASHALG**: Format of the password in the database. Default is cleartext. Options are `crypt`, `md5`, `sha1`, `sha224`, `sha256`, `sha384`, `sha512`. `crypt` is recommended, as it is salted. When setting the password, `crypt` uses SHA-512 (prefix `$6$`).
-- **AUTH_MYSQL_QUERY_GETPASS**: Get the password for a user. Use the placeholders `%(user)s`, `%(host)s`. Example: `SELECT password FROM users WHERE username = CONCAT(%(user)s, '@', %(host)s)`
-- **AUTH_MYSQL_QUERY_SETPASS**: Update the password for a user. Leave empty to disable. Placeholder `%(password)s` contains the hashed password. Example: `UPDATE users SET password = %(password)s WHERE username = CONCAT(%(user)s, '@', %(host)s)`
-- **AUTH_MYSQL_QUERY_REGISTER**: Register a new user. Leave empty to disable. Example: `INSERT INTO users ( username, password ) VALUES ( CONCAT(%(user)s, '@', %(host)s), %(password)s )`
-- **AUTH_MYSQL_QUERY_UNREGISTER**: Removes a user. Leave empty to disable. Example: `DELETE FROM users WHERE username = CONCAT(%(user)s, '@', %(host)s)`
-
-Note that the MySQL authentication script writes a debug log into the file `/var/log/ejabberd/extauth.log`. To get its content, execute the following command:
-
-```bash
-docker exec -ti ejabberd tail -n50 -f /var/log/ejabberd/extauth.log
-```
-
-To find out more about the mysql authentication script, check out the [ejabberd-auth-mysql](https://github.com/rankenstein/ejabberd-auth-mysql) repository.
-
-### LDAP Auth
-
-Full documentation http://docs.ejabberd.im/admin/guide/configuration/#ldap.
-
-Connection
-
-- **EJABBERD_LDAP_SERVERS**: List of IP addresses or DNS names of your LDAP servers. This option is required.
-- **EJABBERD_LDAP_ENCRYPT**: The value `tls` enables encryption by using LDAP over SSL. The default value is: `none`.
-- **EJABBERD_LDAP_TLS_VERIFY**: `false|soft|hard` This option specifies whether to verify LDAP server certificate or not when TLS is enabled. The default is `false` which means no checks are performed.
-- **EJABBERD_LDAP_TLS_CACERTFILE**: Path to file containing PEM encoded CA certificates.
-- **EJABBERD_LDAP_TLS_DEPTH**: Specifies the maximum verification depth when TLS verification is enabled. The default value is 1.
-- **EJABBERD_LDAP_PORT**: The default port is `389` if encryption is disabled; and `636` if encryption is enabled.
-- **EJABBERD_LDAP_ROOTDN**: Bind DN. The default value is "" which means ‘anonymous connection’.
-- **EJABBERD_LDAP_PASSWORD**: Bind password. The default value is "".
-- **EJABBERD_LDAP_DEREF_ALIASES**: `never|always|finding|searching`
-   Whether or not to dereference aliases. The default is `never`.
-
-Authentication
-
-- **EJABBERD_LDAP_BASE**: LDAP base directory which stores users accounts. This option is required.
-- **EJABBERD_LDAP_UIDS**: `ldap_uidattr:ldap_uidattr_format` The default attributes are `uid:%u`.
-- **EJABBERD_LDAP_FILTER**: RFC 4515 LDAP filter. The default Filter value is undefined.
-- **EJABBERD_LDAP_DN_FILTER**: `{ Filter: FilterAttrs }` This filter is applied on the results returned by the main filter. By default ldap_dn_filter is undefined.
-
-## Admins
-
-Set one or more admin user (seperated by whitespace) with the **EJABBERD_ADMINS** environment variable. You can register admin users with the **EJABBERD_USERS** environment variable during container startup, use you favorite XMPP client or the `ejabberdctl` command line utility.
-
-```
-EJABBERD_ADMINS=admin@example.ninja
-```
-
-## Users
-
-Automatically register users during container startup. Uses random password if you don't provide a password for the user. Format is `JID:PASSWORD`. Register more users separated with whitespace.
-
-Register the admin user from **EJABBERD_ADMINS** with a give password:
-
-```
-EJABBERD_USERS=admin@example.ninja:password1234
-```
-
-Or without a random password printed to stdout (check container logs):
-
-```
-EJABBERD_USERS=admin@example.ninja
-```
-
-Register more than one user:
-
-```
-EJABBERD_USERS=admin@example.ninja:password1234 user1@test.com user1@xyz.io
-```
-
-## SSL
-- **EJABBERD_SKIP_MAKE_SSLCERT**: Skip generating ssl certificates. Default: false
-- **EJABBERD_SSLCERT_HOST**: SSL Certificate for the hostname.
-- **EJABBERD_SSLCERT_EXAMPLE_COM**: SSL Certificates for XMPP domains.
-- **EJABBERD_STARTTLS**: Set to `false` to disable StartTLS for client to server connections. Defaults
- to `true`.
-- **EJABBERD_S2S_SSL**: Set to `false` to disable SSL in server 2 server connections. Defaults to `true`.
-- **EJABBERD_HTTPS**: If your proxy terminates SSL you may want to disable HTTPS on port 5280 and 5443. Defaults to `true`.
-- **EJABBERD_PROTOCOL_OPTIONS_TLSV1**: Allow TLSv1 protocol. Defaults to `false`.
-- **EJABBERD_PROTOCOL_OPTIONS_TLSV1_1**: Allow TLSv1.1 protocol. Defaults to `true`.
-- **EJABBERD_CIPHERS**: Cipher suite. Defaults to `HIGH:!aNULL:!3DES`.
-- **EJABBERD_DHPARAM**: Set to `true` to use or generate custom DH parameters. Defaults to `false`.
-- **EJABBERD_SKIP_MAKE_DHPARAM**: Skip generating DH params. Default: false
-
-## Erlang
-- **ERLANG_NODE**: Allows to explicitly specify erlang node for ejabberd. Set to `ejabberd` lets erlang add the hostname. Defaults to `ejabberd@localhost`.
-- **ERLANG_COOKIE**: Set erlang cookie. Defaults to auto-generated cookie.
-- **ERLANG_OPTIONS**: Overwrite additional options passed to erlang while starting ejabberd.
-
-## Modules
-- **EJABBERD_SKIP_MODULES_UPDATE**: If you do not need to update ejabberd modules specs, skip the update task and speedup start. Defaults to `false`.
-- **EJABBERD_MOD_MUC_ADMIN**: Activate the mod_muc_admin module. Defaults to `false`.
-- **EJABBERD_MOD_ADMIN_EXTRA**: Activate the mod_muc_admin module. Defaults to `true`.
-- **EJABBERD_REGISTER_TRUSTED_NETWORK_ONLY**: Only allow user registration from the trusted_network access rule. Defaults to `true`.
-- **EJABBERD_MOD_VERSION**: Activate the mod_version module. Defaults to `true`.
-- **EJABBERD_SOURCE_MODULES**: List of modules, which will be installed from sources localized in ${EJABBERD_HOME}/module_source.
-- **EJABBERD_CONTRIB_MODULES**: List of modules, which will be installed from contrib repository.
-- **EJABBERD_RESTART_AFTER_MODULE_INSTALL**: If any modules were installed, restart the server, if the option is enabled.
-- **EJABBERD_CUSTOM_AUTH_MODULE_OVERRIDE**: If a custom module was defined for handling auth, we need to override the pre-defined auth methods in the config.
-
-## Logging
-
-Use the **EJABBERD_LOGLEVEL** environment variable to set verbosity. Defaults to `4` (Info).
-
-```
-loglevel: Verbosity of log files generated by ejabberd.
-0: No ejabberd log at all (not recommended)
-1: Critical
-2: Error
-3: Warning
-4: Info
-5: Debug
-```
-
-## Mount Configurations
-
-If you prefer to use your own configuration files and avoid passing docker environment variables (```-e```), you can do so by mounting a host directory.
-Pass in an additional ```-v``` to the ```docker run``` command, like so:
-```
-docker run -d \
-    --name "ejabberd" \
-    -p 5222:5222 \
-    -p 5269:5269 \
-    -p 5280:5280 \
-    -h 'xmpp.example.de' \
-    -v /<host_path>/conf:/opt/ejabberd/conf \
-    rroemhild/ejabberd
-```
-
-Your ```/<host_path>/conf``` folder should look like so:
-
-```
-/<host_path>/conf/
-├── ejabberdctl.cfg
-├── ejabberd.yml
-└── inetrc
-```
-
-Example configuration files can be downloaded from the ejabberd [github](https://github.com/rroemhild/ejabberd) page.
-
-When these files exist in ```/opt/ejabberd/conf```, the run script will ignore the configuration templates.
-
-# Maintenance
-
-The `ejabberdctl` command is in the search path and can be run by:
-
-```bash
-docker exec CONTAINER ejabberdctl help
-```
-
-## Register Users
-
-```bash
-docker exec CONTAINER ejabberdctl register user XMPP_DOMAIN PASSWORD
-```
-
-## Creating Backups
-
-Create a backupfile with ejabberdctl and copy the file from the container to localhost
-
-```bash
-docker exec CONTAINER ejabberdctl backup /opt/ejabberd/backup/ejabberd.backup
-docker cp CONTAINER:/opt/ejabberd/backup/ejabberd.backup /tmp/ejabberd.backup
-```
-
-## Restoring Backups
-
-Copy the backupfile from localhost to the running container and restore with ejabberdctl
-
-```bash
-docker cp /tmp/ejabberd.backup CONTAINER:/opt/ejabberd/backup/ejabberd.backup
-docker exec CONTAINER ejabberdctl restore /opt/ejabberd/backup/ejabberd.backup
-```
-
-# Debug
-
-## Erlang Shell
-
-Set `-i` and `-t` option and append `live` to get an interactive erlang shell:
-
-```bash
-docker run -i -t -P rroemhild/ejabberd live
-```
-
-You can terminate the erlang shell with `q().`.
-
-## System Shell
-
-```bash
-docker run -i -t rroemhild/ejabberd shell
-```
-
-## System Commands
-
-```bash
-docker run -i -t rroemhild/ejabberd env
-```
-
-# Exposed Ports
-
-* 4560 (XMLRPC)
-* 5222 (Client 2 Server)
-* 5269 (Server 2 Server)
-* 5280 (HTTP admin/websocket/http-bind)
-* 5443 (HTTP Upload)

docker/conf/ejabberd.yml.tpl

@@ -1,441 +0,0 @@
-###
-###               ejabberd configuration file
-###
-###
-
-### The parameters used in this configuration file are explained in more detail
-### in the ejabberd Installation and Operation Guide.
-### Please consult the Guide in case of doubts, it is included with
-### your copy of ejabberd, and is also available online at
-### http://www.process-one.net/en/ejabberd/docs/
-
-###   =======
-###   LOGGING
-
-loglevel: {{ env['EJABBERD_LOGLEVEL'] or 4 }}
-log_rotate_size: 10485760
-log_rotate_count: 0
-log_rate_limit: 100
-
-## watchdog_admins:
-##   - "bob@example.com"
-
-###   ================
-###   SERVED HOSTNAMES
-
-hosts:
-{%- for xmpp_domain in env['XMPP_DOMAIN'].split() %}
-  - "{{ xmpp_domain }}"
-{%- endfor %}
-
-##
-## route_subdomains: Delegate subdomains to other XMPP servers.
-## For example, if this ejabberd serves example.org and you want
-## to allow communication with an XMPP server called im.example.org.
-##
-## route_subdomains: s2s
-
-###   ===============
-###   LISTENING PORTS
-
-listen:
-  -
-    port: 5222
-    module: ejabberd_c2s
-    {%- if env['EJABBERD_STARTTLS'] == "true" %}
-    starttls_required: true
-    {%- endif %}
-    protocol_options:
-      - "no_sslv3"
-    {%- if env.get('EJABBERD_PROTOCOL_OPTIONS_TLSV1', "false") == "false" %}
-      - "no_tlsv1"
-    {%- endif %}
-    {%- if env.get('EJABBERD_PROTOCOL_OPTIONS_TLSV1_1', "true") == "false" %}
-      - "no_tlsv1_1"
-    {%- endif %}
-    max_stanza_size: 65536
-    shaper: c2s_shaper
-    access: c2s
-    ciphers: "{{ env.get('EJABBERD_CIPHERS', 'HIGH:!aNULL:!3DES') }}"
-    {%- if env.get('EJABBERD_DHPARAM', false) == "true" %}
-    dhfile: "/opt/ejabberd/ssl/dh.pem"
-    {%- endif %}
-  -
-    port: 5269
-    module: ejabberd_s2s_in
-  -
-    port: 4560
-    module: ejabberd_xmlrpc
-    access_commands:
-      configure:
-        all: []
-
-  -
-    port: 5280
-    module: ejabberd_http
-    request_handlers:
-      "/websocket": ejabberd_http_ws
-    ##  "/pub/archive": mod_http_fileserver
-    web_admin: true
-    http_bind: true
-    ## register: true
-    captcha: true
-    {%- if env['EJABBERD_HTTPS'] == "true" %}
-    tls: true
-    certfile: "/opt/ejabberd/ssl/host.pem"
-    {% endif %}
-  -
-    port: 5443
-    module: ejabberd_http
-    request_handlers:
-      "": mod_http_upload
-    {%- if env['EJABBERD_HTTPS'] == "true" %}
-    tls: true
-    certfile: "/opt/ejabberd/ssl/host.pem"
-    {% endif %}
-
-
-###   SERVER TO SERVER
-###   ================
-
-{%- if env['EJABBERD_S2S_SSL'] == "true" %}
-s2s_use_starttls: required
-s2s_certfile: "/opt/ejabberd/ssl/host.pem"
-s2s_protocol_options:
-  - "no_sslv3"
-  {%- if env.get('EJABBERD_PROTOCOL_OPTIONS_TLSV1', "false") == "false" %}
-  - "no_tlsv1"
-  {%- endif %}
-  {%- if env.get('EJABBERD_PROTOCOL_OPTIONS_TLSV1_1', "true") == "false" %}
-  - "no_tlsv1_1"
-  {%- endif %}
-s2s_ciphers: "{{ env.get('EJABBERD_CIPHERS', 'HIGH:!aNULL:!3DES') }}"
-{%- if env.get('EJABBERD_DHPARAM', false) == "true" %}
-s2s_dhfile: "/opt/ejabberd/ssl/dh.pem"
-{%- endif %}
-{% endif %}
-
-###   ==============
-###   AUTHENTICATION
-
-auth_method:
-{%- for auth_method in env.get('EJABBERD_AUTH_METHOD', 'internal').split() %}
-  - {{ auth_method }}
-{%- endfor %}
-
-auth_password_format: {{ env.get('EJABBERD_AUTH_PASSWORD_FORMAT', 'scram') }}
-
-{%- if 'anonymous' in env.get('EJABBERD_AUTH_METHOD', 'internal').split() %}
-anonymous_protocol: both
-allow_multiple_connections: true
-{%- endif %}
-
-
-## LDAP authentication
-
-{%- if 'ldap' in env.get('EJABBERD_AUTH_METHOD', 'internal').split() %}
-
-ldap_servers:
-{%- for ldap_server in env.get('EJABBERD_LDAP_SERVERS', 'internal').split() %}
-  - "{{ ldap_server }}"
-{%- endfor %}
-
-ldap_encrypt: {{ env.get('EJABBERD_LDAP_ENCRYPT', 'none') }}
-ldap_tls_verify: {{ env.get('EJABBERD_LDAP_TLS_VERIFY', 'false') }}
-
-{%- if env['EJABBERD_LDAP_TLS_CACERTFILE'] %}
-ldap_tls_cacertfile: "{{ env['EJABBERD_LDAP_TLS_CACERTFILE'] }}"
-{%- endif %}
-
-ldap_tls_depth: {{ env.get('EJABBERD_LDAP_TLS_DEPTH', 1) }}
-
-{%- if env['EJABBERD_LDAP_PORT'] %}
-ldap_port: {{ env['EJABBERD_LDAP_PORT'] }}
-{%- endif %}
-
-{%- if env['EJABBERD_LDAP_ROOTDN'] %}
-ldap_rootdn: "{{ env['EJABBERD_LDAP_ROOTDN'] }}"
-{%- endif %}
-
-{%- if env['EJABBERD_LDAP_PASSWORD'] %}
-ldap_password: "{{ env['EJABBERD_LDAP_PASSWORD'] }}"
-{%- endif %}
-
-ldap_deref_aliases: {{ env.get('EJABBERD_LDAP_DEREF_ALIASES', 'never') }}
-ldap_base: "{{ env['EJABBERD_LDAP_BASE'] }}"
-
-{%- if env['EJABBERD_LDAP_UIDS'] %}
-ldap_uids:
-{%- for ldap_uid in env['EJABBERD_LDAP_UIDS'].split() %}
-  "{{ ldap_uid.split(':')[0] }}": "{{ ldap_uid.split(':')[1] }}"
-{%- endfor %}
-{%- endif %}
-
-{%- if env['EJABBERD_LDAP_FILTER'] %}
-ldap_filter: "{{ env['EJABBERD_LDAP_FILTER'] }}"
-{%- endif %}
-
-{%- if env['EJABBERD_LDAP_DN_FILTER'] %}
-ldap_dn_filter:
-{%- for dn_filter in env['EJABBERD_LDAP_DN_FILTER'].split() %}
-  "{{ dn_filter.split(':')[0] }}": ["{{ dn_filter.split(':')[1] }}"]
-{%- endfor %}
-{%- endif %}
-
-{%- endif %}
-
-{%- if 'external' in env.get('EJABBERD_AUTH_METHOD', 'internal').split() %}
-  {%- if env['EJABBERD_EXTAUTH_PROGRAM'] %}
-extauth_program: "{{ env['EJABBERD_EXTAUTH_PROGRAM'] }}"
-  {%- endif %}
-  {%- if env['EJABBERD_EXTAUTH_INSTANCES'] %}
-extauth_instances: {{ env['EJABBERD_EXTAUTH_INSTANCES'] }}
-  {%- endif %}
-  {%- if 'internal' in env.get('EJABBERD_AUTH_METHOD').split() %}
-extauth_cache: false
-  {%- elif env['EJABBERD_EXTAUTH_CACHE'] %}
-extauth_cache: {{ env['EJABBERD_EXTAUTH_CACHE'] }}
-  {%- endif %}
-{% endif %}
-
-###   ===============
-###   TRAFFIC SHAPERS
-
-shaper:
-  normal: 1000
-  fast: 50000
-max_fsm_queue: 1000
-
-###   ====================
-###   ACCESS CONTROL LISTS
-
-acl:
-  admin:
-    user:
-    {%- if env['EJABBERD_ADMINS'] %}
-      {%- for admin in env['EJABBERD_ADMINS'].split() %}
-      - "{{ admin.split('@')[0] }}": "{{ admin.split('@')[1] }}"
-      {%- endfor %}
-    {%- else %}
-      - "admin": "{{ env['XMPP_DOMAIN'].split()[0] }}"
-    {%- endif %}
-  local:
-    user_regexp: ""
-
-###   ============
-###   ACCESS RULES
-
-access:
-  ## Maximum number of simultaneous sessions allowed for a single user:
-  max_user_sessions:
-    all: 10
-  ## Maximum number of offline messages that users can have:
-  max_user_offline_messages:
-    admin: 5000
-    all: 100
-  ## This rule allows access only for local users:
-  local:
-    local: allow
-  ## Only non-blocked users can use c2s connections:
-  c2s:
-    blocked: deny
-    all: allow
-  ## For C2S connections, all users except admins use the "normal" shaper
-  c2s_shaper:
-    admin: none
-    all: normal
-  ## All S2S connections use the "fast" shaper
-  s2s_shaper:
-    all: fast
-  ## Only admins can send announcement messages:
-  announce:
-    admin: allow
-  ## Only admins can use the configuration interface:
-  configure:
-    admin: allow
-  ## Admins of this server are also admins of the MUC service:
-  muc_admin:
-    admin: allow
-  ## Only accounts of the local ejabberd server, or only admins can create rooms, depending on environment variable:
-  muc_create:
-    {%- if env['EJABBERD_MUC_CREATE_ADMIN_ONLY'] == "true" %}
-    admin: allow
-    {% else %}
-    local: allow
-    {% endif %}
-  ## All users are allowed to use the MUC service:
-  muc:
-    all: allow
-  ## Only accounts on the local ejabberd server can create Pubsub nodes:
-  pubsub_createnode:
-    local: allow
-  ## In-band registration allows registration of any possible username.
-  register:
-    {%- if env['EJABBERD_REGISTER_ADMIN_ONLY'] == "true" %}
-    all: deny
-    admin: allow
-    {% else %}
-    all: allow
-    {% endif %}
-  ## Only allow to register from localhost
-  trusted_network:
-    loopback: allow
-  soft_upload_quota:
-    all: 400 # MiB
-  hard_upload_quota:
-    all: 500 # MiB
-
-
-language: "en"
-
-###   =======
-###   MODULES
-
-modules:
-  mod_adhoc: {}
-  {%- if env['EJABBERD_MOD_ADMIN_EXTRA'] == "true" %}
-  mod_admin_extra: {}
-  {% endif %}
-  mod_announce: # recommends mod_adhoc
-    access: announce
-  mod_blocking: {} # requires mod_privacy
-  mod_caps: {}
-  mod_carboncopy: {}
-  mod_client_state:
-    queue_chat_states: true
-    queue_presence: false
-  mod_configure: {} # requires mod_adhoc
-  mod_disco: {}
-  ## mod_echo: {}
-  mod_irc: {}
-  mod_http_bind: {}
-  ## mod_http_fileserver:
-  ##   docroot: "/var/www"
-  ##   accesslog: "/var/log/ejabberd/access.log"
-  mod_last: {}
-  mod_mam:
-    default: always
-  mod_muc:
-    host: "conference.@HOST@"
-    access: muc
-    access_create: muc_create
-    access_persistent: muc_create
-    access_admin: muc_admin
-    history_size: 50
-    default_room_options:
-      persistent: true
-  {%- if env['EJABBERD_MOD_MUC_ADMIN'] == "true" %}
-  mod_muc_admin: {}
-  {% endif %}
-  ## mod_muc_log: {}
-  ## mod_multicast: {}
-  mod_offline:
-    access_max_user_messages: max_user_offline_messages
-  mod_ping: {}
-  ## mod_pres_counter:
-  ##   count: 5
-  ##   interval: 60
-  mod_privacy: {}
-  mod_private: {}
-  ## mod_proxy65: {}
-  mod_pubsub:
-    access_createnode: pubsub_createnode
-    ## reduces resource comsumption, but XEP incompliant
-    ignore_pep_from_offline: true
-    ## XEP compliant, but increases resource comsumption
-    ## ignore_pep_from_offline: false
-    last_item_cache: false
-    plugins:
-      - "flat"
-      - "hometree"
-      - "pep" # pep requires mod_caps
-  mod_push: {}
-  mod_push_keepalive: {}
-  mod_register:
-    ##
-    ## Protect In-Band account registrations with CAPTCHA.
-    ##
-    ## captcha_protected: true
-
-    ##
-    ## Set the minimum informational entropy for passwords.
-    ##
-    ## password_strength: 32
-
-    ##
-    ## After successful registration, the user receives
-    ## a message with this subject and body.
-    ##
-    welcome_message:
-      subject: "Welcome!"
-      body: |-
-        Hi.
-        Welcome to this XMPP server.
-
-    ##
-    ## Only clients in the server machine can register accounts
-    ##
-    {%- if env['EJABBERD_REGISTER_TRUSTED_NETWORK_ONLY'] == "true" %}
-    ip_access: trusted_network
-    {% endif %}
-
-    access: register
-  mod_roster: {}
-  mod_shared_roster: {}
-  mod_stats: {}
-  mod_time: {}
-  mod_vcard: {}
-  {% if env.get('EJABBERD_MOD_VERSION', true) == "true" %}
-  mod_version: {}
-  {% endif %}
-  mod_http_upload:
-    docroot: "/opt/ejabberd/upload"
-    {%- if env['EJABBERD_HTTPS'] == "true" %}
-    put_url: "https://@HOST@:5443"
-    {%- else %}
-    put_url: "http://@HOST@:5443"
-    {% endif %}
-  mod_http_upload_quota:
-    max_days: 10
-
-###   ============
-###   HOST CONFIG
-
-host_config:
-{%- for xmpp_domain in env['XMPP_DOMAIN'].split() %}
-  "{{ xmpp_domain }}":
-    domain_certfile: "/opt/ejabberd/ssl/{{ xmpp_domain }}.pem"
-{%- endfor %}
-
-{%- if env['EJABBERD_CONFIGURE_ODBC'] == "true" %}
-###   ====================
-###   ODBC DATABASE CONFIG
-sql_type: {{ env['EJABBERD_ODBC_TYPE'] }}
-sql_server: "{{ env['EJABBERD_ODBC_SERVER'] }}"
-sql_database: "{{ env['EJABBERD_ODBC_DATABASE'] }}"
-sql_username: "{{ env['EJABBERD_ODBC_USERNAME'] }}"
-sql_password: "{{ env['EJABBERD_ODBC_PASSWORD'] }}"
-
-default_db: sql
-{% endif %}
-
-{%- if env['EJABBERD_DEFAULT_DB'] is defined %}
-default_db: {{ env['EJABBERD_DEFAULT_DB'] }}
-{% endif %}
-
-###   =====================
-###   SESSION MANAGEMENT DB
-sm_db_type: {{ env['EJABBERD_SESSION_DB'] or "mnesia" }}
-
-{%- if env['EJABBERD_CONFIGURE_REDIS'] == "true" %}
-###   ====================
-###   REDIS DATABASE CONFIG
-redis_server: {{ env['EJABBERD_REDIS_SERVER'] or "localhost" }}
-redis_port: {{ env['EJABBERD_REDIS_PORT'] or 6379 }}
-{%- if env['EJABBERD_REDIS_PASSWORD'] is defined %}
-redis_password: {{ env['EJABBERD_REDIS_PASSWORD'] }}
-{% endif %}
-redis_db: {{ env['EJABBERD_REDIS_DB'] or 0}}
-redis_reconnect_timeout: {{ env['EJABBERD_REDIS_RECONNECT_TIMEOUT'] or 1 }}
-redis_connect_timeout: {{ env['EJABBERD_REDIS_CONNECT_TIMEOUT'] or 1 }}
-{% endif %}

docker/conf/ejabberdctl.cfg.tpl

@@ -1,187 +0,0 @@
-#
-# In this file you can configure options that are passed by ejabberdctl
-# to the erlang runtime system when starting ejabberd
-#
-
-#' POLL: Kernel polling ([true|false])
-#
-# The kernel polling option requires support in the kernel.
-# Additionally, you need to enable this feature while compiling Erlang.
-#
-# Default: true
-#
-#POLL=true
-
-#.
-#' SMP: SMP support ([enable|auto|disable])
-#
-# Explanation in Erlang/OTP documentation:
-# enable: starts the Erlang runtime system with SMP support enabled.
-#   This may fail if no runtime system with SMP support is available.
-# auto: starts the Erlang runtime system with SMP support enabled if it
-#   is available and more than one logical processor are detected.
-# disable: starts a runtime system without SMP support.
-#
-# Default: auto
-#
-#SMP=auto
-
-#.
-#' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports
-#
-# ejabberd consumes two or three ports for every connection, either
-# from a client or from another Jabber server. So take this into
-# account when setting this limit.
-#
-# Default: 32000
-# Maximum: 268435456
-#
-#ERL_MAX_PORTS=32000
-
-#.
-#' FIREWALL_WINDOW: Range of allowed ports to pass through a firewall
-#
-# If Ejabberd is configured to run in cluster, and a firewall is blocking ports,
-# it's possible to make Erlang use a defined range of port (instead of dynamic
-# ports) for node communication.
-#
-# Default: not defined
-# Example: 4200-4210
-#
-#FIREWALL_WINDOW=
-
-#.
-#' INET_DIST_INTERFACE: IP address where this Erlang node listens other nodes
-#
-# This communication is used by ejabberdctl command line tool,
-# and in a cluster of several ejabberd nodes.
-#
-# Default: 127.0.0.1
-#
-#INET_DIST_INTERFACE=127.0.0.1
-
-#.
-#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
-#
-# IMPORTANT: This option works only in Erlang/OTP R14B03 and newer.
-#
-# This environment variable may be set to a comma-separated
-# list of IP addresses, in which case the epmd daemon
-# will listen only on the specified address(es) and on the
-# loopback address (which is implicitly added to the list if it
-# has not been specified). The default behaviour is to listen on
-# all available IP addresses.
-#
-# Default: 0.0.0.0
-#
-#ERL_EPMD_ADDRESS=127.0.0.1
-
-#.
-#' ERL_PROCESSES: Maximum number of Erlang processes
-#
-# Erlang consumes a lot of lightweight processes. If there is a lot of activity
-# on ejabberd so that the maximum number of processes is reached, people will
-# experience greater latency times. As these processes are implemented in
-# Erlang, and therefore not related to the operating system processes, you do
-# not have to worry about allowing a huge number of them.
-#
-# Default: 250000
-# Maximum: 268435456
-#
-#ERL_PROCESSES=250000
-
-#.
-#' ERL_MAX_ETS_TABLES: Maximum number of ETS and Mnesia tables
-#
-# The number of concurrent ETS and Mnesia tables is limited. When the limit is
-# reached, errors will appear in the logs:
-#   ** Too many db tables **
-# You can safely increase this limit when starting ejabberd. It impacts memory
-# consumption but the difference will be quite small.
-#
-# Default: 1400
-#
-#ERL_MAX_ETS_TABLES=1400
-
-#.
-#' ERL_OPTIONS: Additional Erlang options
-#
-# The next variable allows to specify additional options passed to erlang while
-# starting ejabberd. Some useful options are -noshell, -detached, -heart. When
-# ejabberd is started from an init.d script options -noshell and -detached are
-# added implicitly. See erl(1) for more info.
-#
-# It might be useful to add "-pa /usr/local/lib/ejabberd/ebin" if you
-# want to add local modules in this path.
-#
-# Default: ""
-#
-ERL_OPTIONS="{{ env['ERL_OPTIONS'] or "-noshell" }}"
-
-#.
-#' ERLANG_NODE: Erlang node name
-#
-# The next variable allows to explicitly specify erlang node for ejabberd
-# It can be given in different formats:
-# ERLANG_NODE=ejabberd
-#   Lets erlang add hostname to the node (ejabberd uses short name in this case)
-# ERLANG_NODE=ejabberd@hostname
-#   Erlang uses node name as is (so make sure that hostname is a real
-#   machine hostname or you'll not be able to control ejabberd)
-# ERLANG_NODE=ejabberd@hostname.domainname
-#   The same as previous, but erlang will use long hostname
-#   (see erl (1) manual for details)
-#
-# Default: ejabberd@localhost
-#
-ERLANG_NODE={{ env['ERLANG_NODE'] or "ejabberd@localhost" }}
-
-#.
-#' EJABBERD_PID_PATH: ejabberd PID file
-#
-# Indicate the full path to the ejabberd Process identifier (PID) file.
-# If this variable is defined, ejabberd writes the PID file when starts,
-# and deletes it when stops.
-# Remember to create the directory and grant write permission to ejabberd.
-#
-# Default: don't write PID file
-#
-#EJABBERD_PID_PATH=/var/run/ejabberd/ejabberd.pid
-
-#.
-#' EJABBERD_CONFIG_PATH: ejabberd configuration file
-#
-# Specify the full path to the ejabberd configuration file. If the file name has
-# yml or yaml extension, it is parsed as a YAML file; otherwise, Erlang syntax is
-# expected.
-#
-# Default: $ETC_DIR/ejabberd.yml
-#
-#EJABBERD_CONFIG_PATH=/etc/ejabberd/ejabberd.yml
-
-#.
-#' CONTRIB_MODULES_PATH: contributed ejabberd modules path
-#
-# Specify the full path to the contributed ejabberd modules. If the path is not
-# defined, ejabberd will use ~/.ejabberd-modules in home of user running ejabberd.
-#
-# Default: $HOME/.ejabberd-modules
-#
-#CONTRIB_MODULES_PATH=/opt/ejabberd-modules
-
-#.
-#' EJABBERD_BYPASS_WARNINGS: Bypass LIVE warning
-#
-# Default: don't bypass the warning
-#
-EJABBERD_BYPASS_WARNINGS=true
-
-#.
-#' SPOOL_DIR: Database spool dir
-#
-# Specify the full path to the database spool dir used in binary installer for
-# backwards compatibility.
-#
-# Docker: rroemhild/ejabberd
-#
-SPOOL_DIR=$EJABBERD_HOME/database/$ERLANG_NODE

docker/examples/docker-compose-cluster/Dockerfile

@@ -1,3 +0,0 @@
-FROM rroemhild/ejabberd
-ENV EJABBERD_HOME /opt/ejabberd
-COPY ./scripts $EJABBERD_HOME/scripts

docker/examples/docker-compose-cluster/README.md

@@ -1,23 +0,0 @@
-# Ejabberd cluster with docker compose
-
-This example uses [dnsdocker](https://github.com/tonistiigi/dnsdock) to discover other nodes and setup a multi-master cluster.
-
-Build the ejabberd cluster image:
-
-```bash
-git clone https://github.com/rroemhild/docker-ejabberd.git
-cd docker-ejabberd/examples/docker-compose-cluster
-docker-compose build
-```
-
-Start dnsdocker and the first ejabberd node:
-
-```bash
-docker-compose up -d
-```
-
-Wait until the first ejabberd node is up and running `docker-compose logs ejabberd`, then add some ejabberd nodes to the cluster:
-
-```bash
-docker-compose scale ejabberd=4
-```

docker/examples/docker-compose-cluster/docker-compose.yml

@@ -1,25 +0,0 @@
-dnsdock:
-  image: tonistiigi/dnsdock
-  volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
-  ports:
-    - 172.17.42.1:53:53/udp
-
-ejabberd:
-  build: .
-  ports:
-    - 5222
-    - 5269
-    - 5280
-  environment:
-    - XMPP_DOMAIN=example.com
-    - ERLANG_NODE=ejabberd
-    - EJABBERD_ADMINS=admin@example.com
-    - EJABBERD_USERS=admin@example.com:test321 user@example.com
-    - ERLANG_COOKIE=testCluster
-    - SKIP_MODULES_UPDATE=true
-    - EJABBERD_CLUSTER=true
-    - USE_DNS=true
-  dns: 172.17.42.1
-  domainname: dockercomposecluster_ejabberd.docker
-  tty: true

docker/examples/docker-compose-cluster/scripts/lib/functions.sh

@@ -1,37 +0,0 @@
-# overwrite get_nodename to discover hostname from DNS
-get_nodename() {
-    local hostname=${HOSTNAME}
-
-    # get hostname from dns
-    if ( is_true ${USE_DNS} ); then
-        # wait for dns registration
-        sleep 1
-
-        nodename=$(discover_dns_hostname ${HOSTIP})
-
-        is_set ${nodename} \
-            && hostname=${nodename}
-    fi
-
-    echo $hostname
-    return 0
-}
-
-
-# discover hostname from dns with a reverse lookup
-discover_dns_hostname() {
-    local hostip=$1
-
-    # try to get the hostname from dns
-    local dnsname=$(drill -x ${hostip} \
-        | grep PTR \
-        | awk '{print $5}' \
-        | grep -E "^[a-zA-Z0-9]+([-._]?[a-zA-Z0-9]+)*.[a-zA-Z]+\.$" \
-        | cut -d '.' -f1 \
-        | tail -1)
-
-    is_set ${dnsname} \
-        && echo ${dnsname}
-
-    return 0
-}

docker/examples/docker-compose-cluster/scripts/pre/30_join_cluster.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-get_cluster_node_from_dns() {
-    local cluster_host=$(drill ${DOMAINNAME} \
-        | grep ${DOMAINNAME} \
-        | grep -v ${HOSTIP} \
-        | awk '{print $5}' \
-        | grep -v "^$" \
-        | head -1)
-    echo $(discover_dns_hostname ${cluster_host})
-}
-
-
-file_exist ${FIRST_START_DONE_FILE} \
-    && exit 0
-
-
-join_cluster $(get_cluster_node_from_dns)
-
-
-exit 0

docker/examples/docker-compose/README.md

@@ -1 +0,0 @@
-# simple docker-compose example

docker/examples/docker-compose/docker-compose.yml

@@ -1,11 +0,0 @@
-ejabberd:
-  image: rroemhild/ejabberd
-  ports:
-    - 5222:5222
-    - 5269:5269
-    - 5280:5280
-  environment:
-    - ERLANG_NODE=ejabberd
-    - XMPP_DOMAIN=example.com xyz.io
-    - EJABBERD_ADMINS=admin@example.com
-    - EJABBERD_USERS=admin@example.com:password4321 user1@xyz.io

docker/run.sh

@@ -1,99 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-# discover hostname
-readonly nodename=$(get_nodename)
-
-is_zero ${ERLANG_NODE} \
-    && export ERLANG_NODE="ejabberd@localhost"
-
-## backward compatibility
-# if ERLANG_NODE is true reset it to "ejabberd" and add
-# hostname to the nodename.
-# else: export ${ERLANG_NODE} with nodename
-if (is_true ${ERLANG_NODE}); then
-    export ERLANG_NODE="ejabberd@${nodename}"
-fi
-
-
-run_scripts() {
-    local run_script_dir="${EJABBERD_HOME}/scripts/${1}"
-    for script in ${run_script_dir}/*.sh ; do
-        if [ -f ${script} -a -x ${script} ] ; then
-            ${script}
-        fi
-    done
-}
-
-
-pre_scripts() {
-    run_scripts "pre"
-}
-
-
-post_scripts() {
-    run_scripts "post"
-}
-
-stop_scripts() {
-    run_scripts "stop"
-}
-
-
-ctl() {
-    local action="$1"
-    ${EJABBERDCTL} ${action} >/dev/null
-}
-
-
-_trap() {
-    echo "Stopping ejabberd..."
-    stop_scripts
-    if ctl stop ; then
-        local cnt=0
-        sleep 1
-        while ctl status || test $? = 1 ; do
-            cnt=`expr $cnt + 1`
-            if [ $cnt -ge 60 ] ; then
-                break
-            fi
-            sleep 1
-        done
-    fi
-}
-
-
-# Catch signals and shutdown ejabberd
-trap _trap SIGTERM SIGINT
-
-## run ejabberd
-case "$@" in
-    start)
-        pre_scripts
-        tail -n 0 -F ${LOGDIR}/crash.log \
-                ${LOGDIR}/error.log \
-                ${LOGDIR}/erlang.log &
-        echo "Starting ejabberd..."
-        exec ${EJABBERDCTL} "foreground" &
-        child=$!
-        ${EJABBERDCTL} "started"
-        post_scripts
-        wait $child
-    ;;
-    live)
-        pre_scripts
-        echo "Starting ejabberd in 'live' mode..."
-        exec ${EJABBERDCTL} "live"
-    ;;
-    shell)
-        exec "/bin/bash"
-    ;;
-    *)
-        exec $@
-    ;;
-esac

docker/scripts/lib/base_config.sh

@@ -1,53 +0,0 @@
-readonly HOSTIP=$(hostname -i)
-readonly HOSTNAME=$(hostname -f)
-readonly DOMAINNAME=$(hostname -d)
-
-readonly ERLANGCOOKIEFILE="${EJABBERD_HOME}/.erlang.cookie"
-readonly EJABBERDCTL="/usr/local/sbin/ejabberdctl"
-readonly CONFIGFILE="${EJABBERD_HOME}/conf/ejabberd.yml"
-readonly CONFIGTEMPLATE="${EJABBERD_HOME}/conf/ejabberd.yml.tpl"
-readonly CTLCONFIGFILE="${EJABBERD_HOME}/conf/ejabberdctl.cfg"
-readonly CTLCONFIGTEMPLATE="${EJABBERD_HOME}/conf/ejabberdctl.cfg.tpl"
-readonly SSLCERTDIR="${EJABBERD_HOME}/ssl"
-readonly SSLCERTHOST="${SSLCERTDIR}/host.pem"
-readonly SSLDHPARAM="${SSLCERTDIR}/dh.pem"
-readonly LOGDIR="/usr/local/var/log/ejabberd"
-readonly FIRST_START_DONE_FILE="/${EJABBERD_HOME}/first-start-done"
-readonly CLUSTER_NODE_FILE="/${EJABBERD_HOME}/cluster-done"
-
-readonly PYTHON_JINJA2="import os;
-import sys;
-import jinja2;
-sys.stdout.write(
-    jinja2.Template
-        (sys.stdin.read()
-    ).render(env=os.environ))"
-
-# backward compatibility environment variables
-set +e
-
-[[ -n $EJABBERD_ADMIN ]] \
-    && export EJABBERD_ADMINS=${EJABBERD_ADMIN}
-
-[[ -n $AUTH_METHOD ]] \
-    && export EJABBERD_AUTH_METHOD=${AUTH_METHOD}
-
-[[ -n $SKIP_MODULES_UPDATE ]] \
-    && export EJABBERD_SKIP_MODULES_UPDATE=${SKIP_MODULES_UPDATE}
-
-[[ -n $ERL_OPTIONS ]] \
-    && export ERLANG_OPTIONS=${ERL_OPTIONS}
-
-[[ -n $SSLCERT_HOST ]] \
-    && export EJABBERD_SSLCERT_HOST=${SSLCERT_HOST}
-
-[[ -n $SSLCERT_EXAMPLE_COM ]] \
-    && export EJABBERD_SSLCERT_EXAMPLE_COM=${SSLCERT_EXAMPLE_COM}
-
-[[ -n $LOGLEVEL ]] \
-    && export EJABBERD_LOGLEVEL=${LOGLEVEL}
-
-[[ -n $EJABBERD_WEB_ADMIN_SSL ]] \
-    && export EJABBERD_HTTPS=${EJABBERD_WEB_ADMIN_SSL}
-
-set -e

docker/scripts/lib/base_functions.sh

@@ -1,66 +0,0 @@
-is_set() {
-    local var=$1
-
-    [[ -n $var ]]
-}
-
-
-is_zero() {
-    local var=$1
-
-    [[ -z $var ]]
-}
-
-
-file_exist() {
-    local file=$1
-
-    [[ -e $file ]]
-}
-
-
-is_true() {
-    local var=${1,,}
-    local choices=("yes" "1" "y" "true")
-    for ((i=0;i < ${#choices[@]};i++)) {
-        [[ "${choices[i]}" == $var ]] && return 0
-    }
-    return 1
-}
-
-
-# overwrite this function to get hostname from other sources
-# like dns or etcd
-get_nodename() {
-    echo ${HOSTNAME}
-}
-
-
-join_cluster() {
-    local cluster_node=$1
-
-    is_zero ${cluster_node} \
-        && exit 0
-
-    echo "Join cluster..."
-
-    local erlang_node_name=${ERLANG_NODE%@*}
-    local erlang_cluster_node="${erlang_node_name}@${cluster_node}"
-
-    response=$(${EJABBERDCTL} ping ${erlang_cluster_node})
-    while [ "$response" != "pong" ]; do
-        echo "Waiting for ${erlang_cluster_node}..."
-        sleep 2
-        response=$(${EJABBERDCTL} ping ${erlang_cluster_node})
-    done
-
-    echo "Join cluster at ${erlang_cluster_node}... "
-    NO_WARNINGS=true ${EJABBERDCTL} join_cluster $erlang_cluster_node
-
-    if [ $? -eq 0 ]; then
-        touch ${CLUSTER_NODE_FILE}
-    else
-        echo "cloud not join cluster"
-        exit 1
-    fi
-}

docker/scripts/lib/config.sh

@@ -1 +0,0 @@
-# Overridable file

docker/scripts/lib/functions.sh

@@ -1 +0,0 @@
-# Overridable file

docker/scripts/post/10_ejabberd_modules_update_specs.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-set -e
-
-# Updates the known modules as to be found in https://github.com/processone/ejabberd-contrib
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-run_modules_update_specs() {
-    echo -n 'Updating module specs... '
-    ${EJABBERDCTL} modules_update_specs
-}
-
-
-is_true ${EJABBERD_SKIP_MODULES_UPDATE} \
-    && exit 0
-
-run_modules_update_specs
-
-
-exit 0

docker/scripts/post/11_ejabberd_install_modules.sh

@@ -1,143 +0,0 @@
-#!/bin/bash
-set -e
-
-# Installs modules as defined in environment variables
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-install_module_from_source() {
-    local module_name=$1
-    local module_source_path=${EJABBERD_HOME}/module_source/${module_name}
-    local module_install_folder=${EJABBERD_HOME}/.ejabberd-modules/sources
-    
-    echo "Analyzing module ${module_name} for installation"
-    # Make sure that the module exists in the source folder before attempting a copy
-
-    if [ ! -d ${module_source_path} ]; then
-        echo "Error: Module ${module_name} not found in ${EJABBERD_HOME}/module_source"
-        echo "Please use a shared volume to populate your module in ${EJABBERD_HOME}/module_source"
-        return 1;
-    fi
-
-    # Check to see if the module is already installed
-    local install_count=$(${EJABBERDCTL} modules_installed | grep -ce "^${module_name}[[:space:]]")
-    if [ $install_count -gt 0 ]; then
-        echo "Error: Module already installed: ${module_name}"
-        return 1;
-    fi
-
-    # Copy the module into the shared folder
-    echo "Copying module to ejabberd folder ${module_install_folder}"
-    mkdir -p ${module_install_folder}
-    cp -R ${module_source_path} ${module_install_folder}
-
-    # Run the ejabberdctl module_check on the module
-    echo "Running module_check on ${module_name}"
-    ${EJABBERDCTL} module_check ${module_name}
-    if [ $? -ne 0 ]; then
-        echo "Module check failed for ${module_name}"
-        return 1;
-    fi
-    echo "Module check succeeded for ${module_name}"
-
-    # Install the module
-    echo "Running module_install on ${module_name}"
-    ${EJABBERDCTL} module_install ${module_name}
-    if [ $? -ne 0 ]; then
-        echo "Module installation failed for ${module_name}"
-        return 1;
-    fi
-    echo "Module installation succeeded for ${module_name}"
-
-    return 0;
-}
-
-install_module_from_ejabberd_contrib() {
-    local module_name=$1
-
-    # Check to see if the module is already installed
-    local install_count=$(${EJABBERDCTL} modules_installed | grep -ce "^${module_name}[[:space:]]")
-    if [ $install_count -gt 0 ]; then
-        echo "Error: Module already installed: ejabberd_contrib ${module_name}"
-        return 1;
-    fi
-
-    # Install the module
-    echo "Running module_install on ejabberd_contrib ${module_name}"
-    ${EJABBERDCTL} module_install ${module_name}
-    if [ $? -ne 0 ]; then
-        echo "Module installation failed for ejabberd_contrib ${module_name}"
-        return 1;
-    fi
-    echo "Module installation succeeded for ejabberd_contrib ${module_name}"
-
-    return 0;
-}
-
-enable_custom_auth_module_override() {
-    module_name=$1;
-    # When using custom authentication modules, the module name must be
-    # in the following pattern: ejabberd_auth_foo, where foo is the
-    # value you will use for your auth_method yml configuration.
-    required_prefix="ejabberd_auth_"
-
-    if [[ "${module_name}" != "${required_prefix}"* ]]; then
-        echo "Error: module_name must begin with ${required_prefix}"
-        exit 1;
-    fi
-
-    echo "Checking custom auth module: ${module_name}"
-    # Make sure the auth module is installed
-    local install_count=$(${EJABBERDCTL} modules_installed | grep -ce "^${module_name}[[:space:]]")
-    if [ $install_count -eq 0  ]; then
-        echo "Error: custom auth_module not installed: ${module_name}"
-        return 1;
-    fi
-
-    custom_auth_method=${module_name#$required_prefix}
-    echo -e "\nauth_method: [${custom_auth_method}]" >> ${CONFIGFILE}
-    echo "Custom auth module ${module_name} configuration complete."
-}
-
-file_exist ${FIRST_START_DONE_FILE} \
-    && exit 0
-
-is_restart_needed=0;
-
-if [ -n "${EJABBERD_SOURCE_MODULES}" ]; then
-    for module_name in ${EJABBERD_SOURCE_MODULES} ; do
-        install_module_from_source ${module_name}
-    done
-    is_restart_needed=1;
-fi
-
-# Check the EJABBERD_CONTRIB_MODULES variable for any ejabberd_contrib modules
-if [ -n "${EJABBERD_CONTRIB_MODULES}" ]; then
-    for module_name in ${EJABBERD_CONTRIB_MODULES} ; do
-        install_module_from_ejabberd_contrib ${module_name}
-    done
-    is_restart_needed=1;
-fi
-
-# If a custom module was defined for handling auth, we need to override
-# the pre-defined auth methods in the config.
-if [ -n "${EJABBERD_CUSTOM_AUTH_MODULE_OVERRIDE}" ]; then
-    enable_custom_auth_module_override "${EJABBERD_CUSTOM_AUTH_MODULE_OVERRIDE}"
-    is_restart_needed=1;
-fi
-
-# If any modules were installed, restart the server, if the option is enabled
-if [ ${is_restart_needed} -eq 1 ]; then
-    if is_true ${EJABBERD_RESTART_AFTER_MODULE_INSTALL} ; then
-        echo "Restarting ejabberd after successful module installation(s)"
-        ${EJABBERDCTL} restart
-        child=$!
-        ${EJABBERDCTL} "started"
-        wait $child
-    fi
-fi
-
-exit 0

docker/scripts/post/20_ejabberd_register_users.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-# Do not exit if users already registered
-set +e
-
-randpw() {
-    < /dev/urandom tr -dc A-Z-a-z-0-9 | head -c ${1:-16};
-    echo;
-}
-
-
-register_user() {
-    local user=$1
-    local domain=$2
-    local password=$3
-
-    ${EJABBERDCTL} register ${user} ${domain} ${password}
-    return $?
-}
-
-
-register_all_users() {
-    # register users from environment $EJABBERD_USERS with given
-    # password or random password written to stout. Use whitespace
-    # to seperate users.
-    #
-    # sample:
-    # - add a user with an given password:
-    #   -e "EJABBERD_USERS=admin@example.com:adminSecret"
-    # - add a user with a random password:
-    #   -e "EJABBERD_USERS=user@example.com"
-    # - set password for admin and use random for user1:
-    #   -e "EJABBERD_USERS=admin@example.com:adminSecret user@example.com"
-
-    for user in ${EJABBERD_USERS} ; do
-        local jid=${user%%:*}
-        local password=${user#*:}
-
-        local username=${jid%%@*}
-        local domain=${jid#*@}
-
-        [[ "${password}" == "${jid}" ]] \
-            && password=$(randpw)
-
-        register_user ${username} ${domain} ${password}
-        local retval=$?
-
-        [[ ${retval} -eq 0 ]] \
-            && echo "Password for user ${username}@${domain} is ${password}"
-    done
-}
-
-
-file_exist ${FIRST_START_DONE_FILE} \
-    && exit 0
-
-
-file_exist ${CLUSTER_NODE_FILE} \
-    && exit 0
-
-
-is_set ${EJABBERD_USERS} \
-    && register_all_users
-
-
-##################################
-## Keep for backward compatibility
-
-register_all_ejabberd_admins() {
-    # add all admins from environment $EJABBERD_ADMINS with the passwords from
-    # environment $EJABBERD_ADMIN_PASS.
-
-    local passwords
-    local IFS=' '
-    read -a passwords <<< "${EJABBERD_ADMIN_PWD}"
-
-    for admin in ${EJABBERD_ADMINS} ; do
-        local user=${admin%%@*}
-        local domain=${admin#*@}
-        local password=${passwords[0]}
-        passwords=("${passwords[@]:1}")
-        register_user ${user} ${domain} ${password}
-    done
-}
-
-
-register_all_ejabberd_admins_randpw() {
-    # add all admins from environment $EJABBERD_ADMINS with a random
-    # password and write the password to stdout.
-
-    for admin in ${EJABBERD_ADMINS} ; do
-        local user=${admin%%@*}
-        local domain=${admin#*@}
-        local password=$(randpw)
-
-        register_user ${user} ${domain} ${password}
-        local retval=$?
-
-        [[ ${retval} -eq 0 ]] \
-            && echo "Password for user ${user}@${domain} is ${password}"
-    done
-}
-
-
-is_set ${EJABBERD_ADMIN_PWD} \
-    && register_all_ejabberd_admins
-
-
-is_true ${EJABBERD_ADMIN_RANDPWD} \
-    && register_all_ejabberd_admins_randpw
-
-
-exit 0

docker/scripts/post/99_first_start_done.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-
-# Write a first-start-done file
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-if [ ! -e "${FIRST_START_DONE_FILE}" ]; then
-    touch ${FIRST_START_DONE_FILE}
-fi

docker/scripts/pre/00_change_user.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-readonly whoami=$(whoami)
-
-
-change_ejabberd_run_user() {
-    echo "Change ejabberd install user to root..."
-    sed -i "s/INSTALLUSER=${EJABBERD_USER}/INSTALLUSER=${whoami}/" ${EJABBERDCTL}
-}
-
-
-[[ "${whoami}" == "root" ]] \
-    && change_ejabberd_run_user
-
-
-exit 0

docker/scripts/pre/01_write_certifiates_from_env.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-# Instead of having to mount a direction, specify the ssl certs
-# via environment variables:
-# `EJABBERD_SSLCERT_HOST` and `EJABBERD_SSLCERT_{domain_name}`.
-# For example: `EJABBERD_SSLCERT_EXAMPLE_COM`.
-
-write_file_from_env() {
-    echo "Writing $1 to $2"
-    mkdir -p "$(dirname $2)"
-    echo "${!1}" > $2
-}
-
-# Write the host certificate
-is_set ${EJABBERD_SSLCERT_HOST} \
-  && write_file_from_env "EJABBERD_SSLCERT_HOST" ${SSLCERTHOST}
-
-# Write the domain certificates for each XMPP_DOMAIN
-for xmpp_domain in ${XMPP_DOMAIN} ; do
-    var="EJABBERD_SSLCERT_$(echo $xmpp_domain | awk '{print toupper($0)}' | sed 's/\./_/g;s/-/_/g')"
-    if is_set ${!var} ; then
-        file_exist "${SSLCERTDIR}/${xmpp_domain}.pem" \
-          || write_file_from_env "$var" "${SSLCERTDIR}/${xmpp_domain}.pem"
-    fi
-done
-
-exit 0

docker/scripts/pre/02_make_snakeoil_certificates.sh

@@ -1,91 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-make_snakeoil_certificate() {
-    local domain=$1
-    local certfile=$2
-
-    openssl req -subj "/CN=${domain}" \
-                -new \
-                -newkey rsa:4096 \
-                -days 365 \
-                -nodes \
-                -x509 \
-                -keyout /tmp/selfsigned.key \
-                -out /tmp/selfsigned.crt
-
-    echo "Writing ssl cert and private key to '${certfile}'..."
-    cat /tmp/selfsigned.crt /tmp/selfsigned.key > ${certfile}
-    rm /tmp/selfsigned.crt /tmp/selfsigned.key
-}
-
-
-make_host_snakeoil_certificate() {
-    local IFS=@
-    local domain='localhost'
-    local erlang_node=${ERLANG_NODE}
-
-    if is_true ${erlang_node} ; then
-        domain=${HOSTNAME}
-    elif is_set ${erlang_node} ; then
-        set ${erlang_node}
-        local nodehost=$2
-        if is_zero ${nodehost} ; then
-            domain=${HOSTNAME}
-        else
-            domain=${nodehost}
-        fi
-    fi
-
-    echo -n "Missing ssl cert for your host. "
-    echo "Generating snakeoil ssl cert for ${domain}..."
-
-    make_snakeoil_certificate ${domain} ${SSLCERTHOST}
-}
-
-
-make_domain_snakeoil_certificate() {
-    local domain=$1
-    local certfile=$2
-
-    echo -n "Missing ssl cert for your xmpp domain. "
-    echo "Generating snakeoil ssl cert for ${domain}..."
-
-    make_snakeoil_certificate ${domain} ${certfile}
-}
-
-
-## backward compatibility
-# link old xmpp_domain.pem file to the first <domainname>.pem in XMPP_DOMAIN
-readonly SSLCERTDOMAIN="${SSLCERTDIR}/xmpp_domain.pem"
-if file_exist ${SSLCERTDOMAIN} ; then
-    for xmpp_domain in ${XMPP_DOMAIN} ; do
-        file_exist "${SSLCERTDIR}/${xmpp_domain}.pem" \
-          || ln -s ${SSLCERTDOMAIN} "${SSLCERTDIR}/${xmpp_domain}.pem"
-        break
-    done
-fi
-
-
-is_true ${EJABBERD_SKIP_MAKE_SSLCERT} \
-    && echo "Skip certificate generation" \
-    && exit 0
-
-# generate host ssl cert if missing
-file_exist ${SSLCERTHOST} \
-  || make_host_snakeoil_certificate
-
-# generate xmmp domain ssl certificates if missing
-for xmpp_domain in ${XMPP_DOMAIN} ; do
-  domain_certfile="${SSLCERTDIR}/${xmpp_domain}.pem"
-  file_exist ${domain_certfile} \
-    || make_domain_snakeoil_certificate ${xmpp_domain} ${domain_certfile}
-done
-
-exit 0

docker/scripts/pre/03_make_dhparam.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-make_dhparam() {
-	local dhfile=$1
-	local bits=$2
-
-	echo "Writing dh file to '${dhfile}'..."
-	openssl dhparam -out ${dhfile} ${bits}
-}
-
-
-is_true ${EJABBERD_SKIP_MAKE_DHPARAM} \
-	&& echo "Skip DH param generation" \
-    && exit 0
-
-if is_true ${EJABBERD_DHPARAM} ; then
-	file_exist ${SSLDHPARAM} \
-		|| make_dhparam ${SSLDHPARAM} 4096
-fi
-
-exit 0

docker/scripts/pre/10_erlang_cookie.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-set_erlang_cookie() {
-    echo "Set erlang cookie to ${ERLANG_COOKIE}..."
-    echo ${ERLANG_COOKIE} > ${ERLANGCOOKIEFILE}
-    chmod 400 ${ERLANGCOOKIEFILE}
-}
-
-
-file_exist ${FIRST_START_DONE_FILE} \
-    && exit 0
-
-
-# set erlang cookie if ERLANG_COOKIE is set in environemt
-is_set ${ERLANG_COOKIE} \
-    && set_erlang_cookie
-
-exit 0

docker/scripts/pre/20_ejabberd_config.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-make_config() {
-    if [ ! -e ${CONFIGFILE} ]; then
-        echo "Generating ejabberd config file..."
-        cat ${CONFIGTEMPLATE} \
-          | python -c "${PYTHON_JINJA2}" \
-          > ${CONFIGFILE}
-    else
-        echo "ejabberd config file exists."
-    fi
-
-    if [ ! -e ${CTLCONFIGFILE} ]; then
-        echo "Generating ejabberdctl config file..."
-        cat ${CTLCONFIGTEMPLATE} \
-          | python -c "${PYTHON_JINJA2}" \
-          > ${CTLCONFIGFILE}
-    else
-        echo "ejabberdctl config file exists."
-    fi
-}
-
-
-file_exist ${FIRST_START_DONE_FILE} \
-    && exit 0
-
-
-# generate config file
-make_config
-
-exit 0

docker/scripts/stop/10_leave_cluster.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${EJABBERD_HOME}/scripts/lib/base_config.sh"
-source "${EJABBERD_HOME}/scripts/lib/config.sh"
-source "${EJABBERD_HOME}/scripts/lib/base_functions.sh"
-source "${EJABBERD_HOME}/scripts/lib/functions.sh"
-
-
-leave_cluster() {
-    echo "Leave cluster... "
-    rm ${CLUSTER_NODE_FILE}
-    NO_WARNINGS=true ${EJABBERDCTL} leave_cluster
-}
-
-
-file_exist ${CLUSTER_NODE_FILE} \
-    && leave_cluster
-
-
-exit 0

ejabberd.service.template

@@ -1,18 +0,0 @@
-[Unit]
-Description=XMPP Server
-After=network.target
-
-[Service]
-Type=forking
-User=ejabberd
-Group=ejabberd
-LimitNOFILE=65536
-Restart=on-failure
-RestartSec=5
-ExecStart=/bin/sh -c '@ctlscriptpath@/ejabberdctl start && @ctlscriptpath@/ejabberdctl started'
-ExecStop=/bin/sh -c '@ctlscriptpath@/ejabberdctl stop && @ctlscriptpath@/ejabberdctl stopped'
-ExecReload=@ctlscriptpath@/ejabberdctl reload_config
-PrivateDevices=true
-
-[Install]
-WantedBy=multi-user.target

ejabberd.yml.example

@@ -1,842 +0,0 @@
-###
-###'              ejabberd configuration file
-###
-###
-
-### The parameters used in this configuration file are explained in more detail
-### in the ejabberd Installation and Operation Guide.
-### Please consult the Guide in case of doubts, it is included with
-### your copy of ejabberd, and is also available online at
-### http://www.process-one.net/en/ejabberd/docs/
-
-### The configuration file is written in YAML.
-### Refer to http://en.wikipedia.org/wiki/YAML for the brief description.
-### However, ejabberd treats different literals as different types:
-###
-### - unquoted or single-quoted strings. They are called "atoms".
-###   Example: dog, 'Jupiter', '3.14159', YELLOW
-###
-### - numeric literals. Example: 3, -45.0, .0
-###
-### - quoted or folded strings.
-###   Examples of quoted string: "Lizzard", "orange".
-###   Example of folded string:
-###   > Art thou not Romeo,
-###     and a Montague?
-
-###.  =======
-###'  LOGGING
-
-##
-## loglevel: Verbosity of log files generated by ejabberd.
-## 0: No ejabberd log at all (not recommended)
-## 1: Critical
-## 2: Error
-## 3: Warning
-## 4: Info
-## 5: Debug
-##
-loglevel: 4
-
-##
-## rotation: Describe how to rotate logs. Either size and/or date can trigger
-## log rotation. Setting count to N keeps N rotated logs. Setting count to 0
-## does not disable rotation, it instead rotates the file and keeps no previous
-## versions around. Setting size to X rotate log when it reaches X bytes.
-## To disable rotation set the size to 0 and the date to ""
-## Date syntax is taken from the syntax newsyslog uses in newsyslog.conf.
-## Some examples:
-##  $D0     rotate every night at midnight
-##  $D23    rotate every day at 23:00 hr
-##  $W0D23  rotate every week on Sunday at 23:00 hr
-##  $W5D16  rotate every week on Friday at 16:00 hr
-##  $M1D0   rotate on the first day of every month at midnight
-##  $M5D6   rotate on every 5th day of the month at 6:00 hr
-##
-log_rotate_size: 10485760
-log_rotate_date: ""
-log_rotate_count: 1
-
-##
-## overload protection: If you want to limit the number of messages per second
-## allowed from error_logger, which is a good idea if you want to avoid a flood
-## of messages when system is overloaded, you can set a limit.
-## 100 is ejabberd's default.
-log_rate_limit: 100
-
-##
-## watchdog_admins: Only useful for developers: if an ejabberd process
-## consumes a lot of memory, send live notifications to these XMPP
-## accounts.
-##
-## watchdog_admins:
-##   - "bob@example.com"
-
-###.  ===============
-###'  NODE PARAMETERS
-
-##
-## net_ticktime: Specifies net_kernel tick time in seconds. This options must have
-## identical value on all nodes, and in most cases shouldn't be changed at all from
-## default value.
-##
-## net_ticktime: 60
-
-###.  ================
-###'  SERVED HOSTNAMES
-
-##
-## hosts: Domains served by ejabberd.
-## You can define one or several, for example:
-## hosts:
-##   - "example.net"
-##   - "example.com"
-##   - "example.org"
-##
-hosts:
-  - "localhost"
-
-##
-## route_subdomains: Delegate subdomains to other XMPP servers.
-## For example, if this ejabberd serves example.org and you want
-## to allow communication with an XMPP server called im.example.org.
-##
-## route_subdomains: s2s
-
-###.  ============
-###'  Certificates
-
-## List all available PEM files containing certificates for your domains,
-## chains of certificates or certificate keys. Full chains will be built
-## automatically by ejabberd.
-##
-## certfiles:
-##   - "/etc/letsencrypt/live/example.org/*.pem"
-##   - "/etc/letsencrypt/live/example.com/*.pem"
-##
-## If your system provides only a single CA file (CentOS/FreeBSD):
-## ca_file: "/etc/ssl/certs/ca-bundle.pem"
-
-###.  =================
-###'  TLS configuration
-
-## define_macro:
-##   'TLS_CIPHERS': "HIGH:!aNULL:!eNULL:!3DES:@STRENGTH"
-##   'TLS_OPTIONS':
-##      - "no_sslv3"
-##      - "cipher_server_preference"
-##      - "no_compression"
-##   'DH_FILE': "/path/to/dhparams.pem" # generated with: openssl dhparam -out dhparams.pem 2048
-##
-## c2s_dhfile: 'DH_FILE'
-## s2s_dhfile: 'DH_FILE'
-## c2s_ciphers: 'TLS_CIPHERS'
-## s2s_ciphers: 'TLS_CIPHERS'
-## c2s_protocol_options: 'TLS_OPTIONS'
-## s2s_protocol_options: 'TLS_OPTIONS'
-
-###.  ===============
-###'  LISTENING PORTS
-
-##
-## listen: The ports ejabberd will listen on, which service each is handled
-## by and what options to start it with.
-##
-listen:
-  -
-    port: 5222
-    ip: "::"
-    module: ejabberd_c2s
-    ##
-    ## If TLS is compiled in and you installed a SSL
-    ## certificate, uncomment this line:
-    ##
-    ## starttls: true
-    ##
-    ## To enforce TLS encryption for client connections,
-    ## use this instead of the "starttls" option:
-    ##
-    ## starttls_required: true
-    ##
-    ## Stream compression
-    ##
-    ## zlib: true
-    ##
-    max_stanza_size: 65536
-    shaper: c2s_shaper
-    access: c2s
-  -
-    port: 5269
-    ip: "::"
-    module: ejabberd_s2s_in
-  -
-    port: 5280
-    ip: "::"
-    module: ejabberd_http
-    request_handlers:
-      "/ws": ejabberd_http_ws
-      "/bosh": mod_bosh
-      "/api": mod_http_api
-    ##  "/pub/archive": mod_http_fileserver
-    web_admin: true
-    ## register: true
-    captcha: true
-  ##
-  ## ejabberd_service: Interact with external components (transports, ...)
-  ##
-  ## -
-  ##   port: 8888
-  ##   ip: "::"
-  ##   module: ejabberd_service
-  ##   access: all
-  ##   shaper_rule: fast
-  ##   ip: "127.0.0.1"
-  ##   privilege_access:
-  ##      roster: "both"
-  ##      message: "outgoing"
-  ##      presence: "roster"
-  ##   delegations:
-  ##      "urn:xmpp:mam:1":
-  ##        filtering: ["node"]
-  ##      "http://jabber.org/protocol/pubsub":
-  ##        filtering: []
-  ##   hosts:
-  ##     "icq.example.org":
-  ##       password: "secret"
-  ##     "sms.example.org":
-  ##       password: "secret"
-
-  ##
-  ## ejabberd_stun: Handles STUN Binding requests
-  ##
-  ## -
-  ##   port: 3478
-  ##   transport: udp
-  ##   module: ejabberd_stun
-
-  ##
-  ## To handle XML-RPC requests that provide admin credentials:
-  ##
-  ## -
-  ##   port: 4560
-  ##   ip: "::"
-  ##   module: ejabberd_xmlrpc
-  ##   maxsessions: 10
-  ##   timeout: 5000
-  ##   access_commands:
-  ##     admin:
-  ##       commands: all
-  ##       options: []
-
-  ##
-  ## To enable secure http upload
-  ##
-  ## -
-  ##   port: 5444
-  ##   ip: "::"
-  ##   module: ejabberd_http
-  ##   request_handlers:
-  ##     "": mod_http_upload
-  ##   tls: true
-  ##   protocol_options: 'TLSOPTS'
-  ##   dhfile: 'DHFILE'
-  ##   ciphers: 'CIPHERS'
-
-## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text
-## password storage (see auth_password_format option).
-## disable_sasl_mechanisms: "digest-md5"
-
-###.  ==================
-###'  S2S GLOBAL OPTIONS
-
-##
-## s2s_use_starttls: Enable STARTTLS for S2S connections.
-## Allowed values are: false, optional or required
-## You must specify 'certfiles' option
-##
-## s2s_use_starttls: optional
-
-##
-## S2S whitelist or blacklist
-##
-## Default s2s policy for undefined hosts.
-##
-## s2s_access: s2s
-
-##
-## Outgoing S2S options
-##
-## Preferred address families (which to try first) and connect timeout
-## in seconds.
-##
-## outgoing_s2s_families:
-##   - ipv4
-##   - ipv6
-## outgoing_s2s_timeout: 190
-
-###.  ==============
-###'  AUTHENTICATION
-
-##
-## auth_method: Method used to authenticate the users.
-## The default method is the internal.
-## If you want to use a different method,
-## comment this line and enable the correct ones.
-##
-auth_method: internal
-
-##
-## Store the plain passwords or hashed for SCRAM:
-## auth_password_format: plain
-## auth_password_format: scram
-##
-## Define the FQDN if ejabberd doesn't detect it:
-## fqdn: "server3.example.com"
-
-##
-## Authentication using external script
-## Make sure the script is executable by ejabberd.
-##
-## auth_method: external
-## extauth_program: "/path/to/authentication/script"
-
-##
-## Authentication using SQL
-## Remember to setup a database in the next section.
-##
-## auth_method: sql
-
-##
-## Authentication using PAM
-##
-## auth_method: pam
-## pam_service: "pamservicename"
-
-##
-## Authentication using LDAP
-##
-## auth_method: ldap
-##
-## List of LDAP servers:
-## ldap_servers:
-##   - "localhost"
-##
-## Encryption of connection to LDAP servers:
-## ldap_encrypt: none
-## ldap_encrypt: tls
-##
-## Port to connect to on LDAP servers:
-## ldap_port: 389
-## ldap_port: 636
-##
-## LDAP manager:
-## ldap_rootdn: "dc=example,dc=com"
-##
-## Password of LDAP manager:
-## ldap_password: "******"
-##
-## Search base of LDAP directory:
-## ldap_base: "dc=example,dc=com"
-##
-## LDAP attribute that holds user ID:
-## ldap_uids:
-##   - "mail": "%u@mail.example.org"
-##
-## LDAP filter:
-## ldap_filter: "(objectClass=shadowAccount)"
-
-##
-## Anonymous login support:
-##   auth_method: anonymous
-##   anonymous_protocol: sasl_anon | login_anon | both
-##   allow_multiple_connections: true | false
-##
-## host_config:
-##   "public.example.org":
-##     auth_method: anonymous
-##     allow_multiple_connections: false
-##     anonymous_protocol: sasl_anon
-##
-## To use both anonymous and internal authentication:
-##
-## host_config:
-##   "public.example.org":
-##     auth_method:
-##       - internal
-##       - anonymous
-
-###.  ==============
-###'  DATABASE SETUP
-
-## ejabberd by default uses the internal Mnesia database,
-## so you do not necessarily need this section.
-## This section provides configuration examples in case
-## you want to use other database backends.
-## Please consult the ejabberd Guide for details on database creation.
-
-##
-## MySQL server:
-##
-## sql_type: mysql
-## sql_server: "server"
-## sql_database: "database"
-## sql_username: "username"
-## sql_password: "password"
-##
-## If you want to specify the port:
-## sql_port: 1234
-
-##
-## PostgreSQL server:
-##
-## sql_type: pgsql
-## sql_server: "server"
-## sql_database: "database"
-## sql_username: "username"
-## sql_password: "password"
-##
-## If you want to specify the port:
-## sql_port: 1234
-##
-## If you use PostgreSQL, have a large database, and need a
-## faster but inexact replacement for "select count(*) from users"
-##
-## pgsql_users_number_estimate: true
-
-##
-## SQLite:
-##
-## sql_type: sqlite
-## sql_database: "/path/to/database.db"
-
-##
-## ODBC compatible or MSSQL server:
-##
-## sql_type: odbc
-## sql_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
-
-##
-## Number of connections to open to the database for each virtual host
-##
-## sql_pool_size: 10
-
-##
-## Interval to make a dummy SQL request to keep the connections to the
-## database alive. Specify in seconds: for example 28800 means 8 hours
-##
-## sql_keepalive_interval: undefined
-
-###.  ===============
-###'  TRAFFIC SHAPERS
-
-shaper:
-  ##
-  ## The "normal" shaper limits traffic speed to 1000 B/s
-  ##
-  normal: 1000
-
-  ##
-  ## The "fast" shaper limits traffic speed to 50000 B/s
-  ##
-  fast: 50000
-
-##
-## This option specifies the maximum number of elements in the queue
-## of the FSM. Refer to the documentation for details.
-##
-max_fsm_queue: 10000
-
-###.   ====================
-###'   ACCESS CONTROL LISTS
-acl:
-  ##
-  ## The 'admin' ACL grants administrative privileges to XMPP accounts.
-  ## You can put here as many accounts as you want.
-  ##
-  ## admin:
-  ##   user:
-  ##     - "aleksey@localhost"
-  ##     - "ermine@example.org"
-  ##
-  ## Blocked users
-  ##
-  ## blocked:
-  ##   user:
-  ##     - "baduser@example.org"
-  ##     - "test"
-
-  ## Local users: don't modify this.
-  ##
-  local:
-    user_regexp: ""
-
-  ##
-  ## More examples of ACLs
-  ##
-  ## jabberorg:
-  ##   server:
-  ##     - "jabber.org"
-  ## aleksey:
-  ##   user:
-  ##     - "aleksey@jabber.ru"
-  ## test:
-  ##   user_regexp: "^test"
-  ##   user_glob: "test*"
-
-  ##
-  ## Loopback network
-  ##
-  loopback:
-    ip:
-      - "127.0.0.0/8"
-      - "::1/128"
-      - "::FFFF:127.0.0.1/128"
-
-  ##
-  ## Bad XMPP servers
-  ##
-  ## bad_servers:
-  ##   server:
-  ##     - "xmpp.zombie.org"
-  ##     - "xmpp.spam.com"
-
-##
-## Define specific ACLs in a virtual host.
-##
-## host_config:
-##   "localhost":
-##     acl:
-##       admin:
-##         user:
-##           - "bob-local@localhost"
-
-###.  ============
-###'  SHAPER RULES
-
-shaper_rules:
-  ## Maximum number of simultaneous sessions allowed for a single user:
-  max_user_sessions: 10
-  ## Maximum number of offline messages that users can have:
-  max_user_offline_messages:
-    - 5000: admin
-    - 100
-  ## For C2S connections, all users except admins use the "normal" shaper
-  c2s_shaper:
-    - none: admin
-    - normal
-  ## All S2S connections use the "fast" shaper
-  s2s_shaper: fast
-
-###.  ============
-###'  ACCESS RULES
-access_rules:
-  ## This rule allows access only for local users:
-  local:
-    - allow: local
-  ## Only non-blocked users can use c2s connections:
-  c2s:
-    - deny: blocked
-    - allow
-  ## Only admins can send announcement messages:
-  announce:
-    - allow: admin
-  ## Only admins can use the configuration interface:
-  configure:
-    - allow: admin
-  ## Only accounts of the local ejabberd server can create rooms:
-  muc_create:
-    - allow: local
-  ## Only accounts on the local ejabberd server can create Pubsub nodes:
-  pubsub_createnode:
-    - allow: local
-  ## In-band registration allows registration of any possible username.
-  ## To disable in-band registration, replace 'allow' with 'deny'.
-  register:
-    - allow
-  ## Only allow to register from localhost
-  trusted_network:
-    - allow: loopback
-  ## Do not establish S2S connections with bad servers
-  ## If you enable this you also have to uncomment "s2s_access: s2s"
-  ## s2s:
-  ##   - deny:
-  ##     - ip: "XXX.XXX.XXX.XXX/32"
-  ##   - deny:
-  ##     - ip: "XXX.XXX.XXX.XXX/32"
-  ##   - allow
-
-## ===============
-## API PERMISSIONS
-## ===============
-##
-## This section allows you to define who and using what method
-## can execute commands offered by ejabberd.
-##
-## By default "console commands" section allow executing all commands
-## issued using ejabberdctl command, and "admin access" section allows
-## users in admin acl that connect from 127.0.0.1 to  execute all
-## commands except start and stop with any available access method
-## (ejabberdctl, http-api, xmlrpc depending what is enabled on server).
-##
-## If you remove "console commands" there will be one added by
-## default allowing executing all commands, but if you just change
-## permissions in it, version from config file will be used instead
-## of default one.
-##
-api_permissions:
-  "console commands":
-    from:
-      - ejabberd_ctl
-    who: all
-    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"
-
-## By default the frequency of account registrations from the same IP
-## is limited to 1 account every 10 minutes. To disable, specify: infinity
-## registration_timeout: 600
-  
-##
-## Define specific Access Rules in a virtual host.
-##
-## host_config:
-##   "localhost":
-##     access:
-##       c2s:
-##         - allow: admin
-##         - deny
-##       register:
-##         - deny
-
-###.  ================
-###'  DEFAULT LANGUAGE
-
-##
-## language: Default language used for server messages.
-##
-language: "en"
-
-##
-## Set a different default language in a virtual host.
-##
-## host_config:
-##   "localhost":
-##     language: "ru"
-
-###.  =======
-###'  CAPTCHA
-
-##
-## Full path to a script that generates the image.
-##
-## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
-
-##
-## Host for the URL and port where ejabberd listens for CAPTCHA requests.
-##
-## captcha_host: "example.org:5280"
-
-##
-## Limit CAPTCHA calls per minute for JID/IP to avoid DoS.
-##
-## captcha_limit: 5
-
-###.  ====
-###'  ACME
-##
-## In order to use the acme certificate acquiring through "Let's Encrypt"
-## an http listener has to be configured to listen to port 80 so that
-## the authorization challenges posed by "Let's Encrypt" can be solved.
-## 
-## A simple way of doing this would be to add the following in the listening
-## section and to configure port forwarding from 80 to 5280 either via NAT
-## (for ipv4 only) or using frontends such as haproxy/nginx/sslh/etc.
-##   - 
-##    port: 5280
-##    ip: "::"
-##    module: ejabberd_http
-
-acme:
-
-   ## A contact mail that the ACME Certificate Authority can contact in case of
-   ## an authorization issue, such as a server-initiated certificate revocation.
-   ## It is not mandatory to provide an email address but it is highly suggested.
-   contact: "mailto:example-admin@example.com"
-
-
-   ## The ACME Certificate Authority URL.
-   ## This could either be:
-   ##   - https://acme-v01.api.letsencrypt.org - (Default) for the production CA
-   ##   - https://acme-staging.api.letsencrypt.org - for the staging CA
-   ##   - http://localhost:4000 - for a local version of the CA
-   ca_url: "https://acme-v01.api.letsencrypt.org"
-
-###.  =======
-###'  MODULES
-
-##
-## Modules enabled in all ejabberd virtual hosts.
-##
-modules:
-  mod_adhoc: {}
-  mod_admin_extra: {}
-  mod_announce: # recommends mod_adhoc
-    access: announce
-  mod_blocking: {} # requires mod_privacy
-  mod_caps: {}
-  mod_carboncopy: {}
-  mod_client_state: {}
-  mod_configure: {} # requires mod_adhoc
-  ## mod_delegation: {} # for xep0356
-  mod_disco: {}
-  mod_echo: {}
-  mod_irc: {}
-  mod_bosh: {}
-  ## mod_http_fileserver:
-  ##   docroot: "/var/www"
-  ##   accesslog: "/var/log/ejabberd/access.log"
-  ## mod_http_upload:
-  ##   # docroot: "@HOME@/upload"
-  ##   put_url: "https://@HOST@:5444"
-  ##   thumbnail: false # otherwise needs the identify command from ImageMagick installed
-  ## mod_http_upload_quota:
-  ##   max_days: 30
-  mod_last: {}
-  ## XEP-0313: Message Archive Management
-  ## You might want to setup a SQL backend for MAM because the mnesia database is
-  ## limited to 2GB which might be exceeded on large servers
-  ## mod_mam: {} # for xep0313, mnesia is limited to 2GB, better use an SQL backend
-  mod_muc:
-    ## host: "conference.@HOST@"
-    access:
-      - allow
-    access_admin:
-      - allow: admin
-    access_create: muc_create
-    access_persistent: muc_create
-  mod_muc_admin: {}
-  ## mod_muc_log: {}
-  ## mod_multicast: {}
-  mod_offline:
-    access_max_user_messages: max_user_offline_messages
-  mod_ping: {}
-  ## mod_pres_counter:
-  ##   count: 5
-  ##   interval: 60
-  mod_privacy: {}
-  mod_private: {}
-  ## mod_proxy65: {}
-  mod_pubsub:
-    access_createnode: pubsub_createnode
-    ## reduces resource comsumption, but XEP incompliant
-    ignore_pep_from_offline: true
-    ## XEP compliant, but increases resource comsumption
-    ## ignore_pep_from_offline: false
-    last_item_cache: false
-    plugins:
-      - "flat"
-      - "hometree"
-      - "pep" # pep requires mod_caps
-  mod_push: {}
-  mod_push_keepalive: {}
-  ## mod_register:
-    ##
-    ## Protect In-Band account registrations with CAPTCHA.
-    ##
-    ##   captcha_protected: true
-    ##
-    ## Set the minimum informational entropy for passwords.
-    ##
-    ##   password_strength: 32
-    ##
-    ## After successful registration, the user receives
-    ## a message with this subject and body.
-    ##
-    ##   welcome_message:
-    ##     subject: "Welcome!"
-    ##     body: |-
-    ##       Hi.
-    ##       Welcome to this XMPP server.
-    ##
-    ## When a user registers, send a notification to
-    ## these XMPP accounts.
-    ##
-    ##   registration_watchers:
-    ##     - "admin1@example.org"
-    ##
-    ## Only clients in the server machine can register accounts
-    ##
-    ##   ip_access: trusted_network
-    ##
-    ## Local c2s or remote s2s users cannot register accounts
-    ##
-    ##   access_from: deny
-    ##   access: register
-  mod_roster: {}
-  mod_shared_roster: {}
-  mod_stats: {}
-  mod_time: {}
-  mod_vcard:
-    search: false
-  mod_vcard_xupdate: {}
-  ## Convert all avatars posted by Android clients from WebP to JPEG
-  ## mod_avatar:  # this module needs compile option --enable-graphics
-  ##   convert:
-  ##     webp: jpeg
-  mod_version: {}
-  mod_stream_mgmt: {}
-  ##   Non-SASL Authentication (XEP-0078) is now disabled by default
-  ##   because it's obsoleted and is used mostly by abandoned
-  ##   client software
-  ## mod_legacy_auth: {}
-  ##   The module for S2S dialback (XEP-0220). Please note that you cannot
-  ##   rely solely on dialback if you want to federate with other servers,
-  ##   because a lot of servers have dialback disabled and instead rely on
-  ##   PKIX authentication. Make sure you have proper certificates installed
-  ##   and check your accessibility at https://check.messaging.one/
-  mod_s2s_dialback: {}
-  mod_http_api: {}
-
-##
-## Enable modules with custom options in a specific virtual host
-##
-## host_config:
-##   "localhost":
-##     modules:
-##       mod_echo:
-##         host: "mirror.localhost"
-
-##
-## Enable modules management via ejabberdctl for installation and
-## uninstallation of public/private contributed modules
-## (enabled by default)
-##
-
-allow_contrib_modules: true
-
-###.
-###'
-### Local Variables:
-### mode: yaml
-### End:
-### vim: set filetype=yaml tabstop=8 foldmarker=###',###. foldmethod=marker:

ejabberdctl.template

@@ -1,316 +0,0 @@
-#!/bin/sh
-
-# define default configuration
-POLL=true
-SMP=auto
-ERL_MAX_PORTS=32000
-ERL_PROCESSES=250000
-ERL_MAX_ETS_TABLES=1400
-FIREWALL_WINDOW=""
-INET_DIST_INTERFACE=""
-ERLANG_NODE=ejabberd@localhost
-
-# define default environment variables
-SCRIPT_DIR=$(cd "${0%/*}" && pwd)
-ERL="{{erl}}"
-IEX="{{bindir}}/iex"
-EPMD="{{epmd}}"
-INSTALLUSER="{{installuser}}"
-
-# check the proper system user is used
-case $(id -un) in
-    "$INSTALLUSER")
-        EXEC_CMD="as_current_user"
-        ;;
-    root)
-        if [ -n "$INSTALLUSER" ] ; then
-            EXEC_CMD="as_install_user"
-        else
-            EXEC_CMD="as_current_user"
-            echo "WARNING: This is not recommended to run ejabberd as root" >&2
-        fi
-        ;;
-    *)
-        if [ -n "$INSTALLUSER" ] ; then
-            echo "ERROR: This command can only be run by root or the user $INSTALLUSER" >&2
-            exit 7
-        else
-            EXEC_CMD="as_current_user"
-        fi
-        ;;
-esac
-
-# parse command line parameters
-for arg; do
-    case $arg in
-        -n|--node) ERLANG_NODE_ARG=$2; shift;;
-        -s|--spool) SPOOL_DIR=$2; shift;;
-        -l|--logs) LOGS_DIR=$2; shift;;
-        -f|--config) EJABBERD_CONFIG_PATH=$2; shift;;
-        -c|--ctl-config) EJABBERDCTL_CONFIG_PATH=$2; shift;;
-        -d|--config-dir) ETC_DIR=$2; shift;;
-        -t|--no-timeout) NO_TIMEOUT="--no-timeout";;
-        --) :;;
-        *) break;;
-    esac
-    shift
-done
-
-# define ejabberd variables if not already defined from the command line
-: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
-: "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}"
-: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
-: "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
-: "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
-[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
-[ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
-[ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
-: "${EJABBERD_DOC_PATH:="{{docdir}}"}"
-: "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
-
-# define erl parameters
-ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
-if [ -n "$FIREWALL_WINDOW" ] ; then
-    ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
-fi
-if [ -n "$INET_DIST_INTERFACE" ] ; then
-    INET_DIST_INTERFACE2=$("$ERL" -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt)
-    if [ -n "$INET_DIST_INTERFACE2" ] ; then
-        ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
-    fi
-fi
-ERL_LIBS={{libdir}}
-ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
-ERL_INETRC="$ETC_DIR"/inetrc
-
-# define ejabberd parameters
-EJABBERD_OPTS="$EJABBERD_OPTS\
-$(sed '/^log_rate_limit/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_date/!d;s/:[ \t]*\(.[^ ]*\).*/ \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"
-
-# export global variables
-export EJABBERD_CONFIG_PATH
-export EJABBERD_LOG_PATH
-export EJABBERD_DOC_PATH
-export EJABBERD_PID_PATH
-export ERL_CRASH_DUMP
-export ERL_EPMD_ADDRESS
-export ERL_INETRC
-export ERL_MAX_PORTS
-export ERL_MAX_ETS_TABLES
-export CONTRIB_MODULES_PATH
-export CONTRIB_MODULES_CONF_DIR
-export ERL_LIBS
-
-# run command either directly or via su $INSTALLUSER
-exec_cmd()
-{
-    case $EXEC_CMD in
-        as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
-        as_current_user) "$@" ;;
-    esac
-}
-exec_erl()
-{
-    NODE=$1; shift
-    exec_cmd "$ERL" ${S:--}name "$NODE" $ERLANG_OPTS "$@"
-}
-exec_iex()
-{
-    NODE=$1; shift
-    exec_cmd "$IEX" -${S:--}name "$NODE" --erl "$ERLANG_OPTS" "$@"
-}
-
-# usage
-debugwarning()
-{
-    if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
-        echo "--------------------------------------------------------------------"
-        echo ""
-        echo "IMPORTANT: we will attempt to attach an INTERACTIVE shell"
-        echo "to an already running ejabberd node."
-        echo "If an ERROR is printed, it means the connection was not successful."
-        echo "You can interact with the ejabberd node if you know how to use it."
-        echo "Please be extremely cautious with your actions,"
-        echo "and exit immediately if you are not completely sure."
-        echo ""
-        echo "To detach this shell from ejabberd, press:"
-        echo "  control+c, control+c"
-        echo ""
-        echo "--------------------------------------------------------------------"
-        echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
-        echo "  EJABBERD_BYPASS_WARNINGS=true"
-        echo "Press return to continue"
-        read -r input
-        echo ""
-    fi
-}
-
-livewarning()
-{
-    if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
-        echo "--------------------------------------------------------------------"
-        echo ""
-        echo "IMPORTANT: ejabberd is going to start in LIVE (interactive) mode."
-        echo "All log messages will be shown in the command shell."
-        echo "You can interact with the ejabberd node if you know how to use it."
-        echo "Please be extremely cautious with your actions,"
-        echo "and exit immediately if you are not completely sure."
-        echo ""
-        echo "To exit this LIVE mode and stop ejabberd, press:"
-        echo "  q().  and press the Enter key"
-        echo ""
-        echo "--------------------------------------------------------------------"
-        echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
-        echo "  EJABBERD_BYPASS_WARNINGS=true"
-        echo "Press return to continue"
-        read -r input
-        echo ""
-    fi
-}
-
-help()
-{
-    echo ""
-    echo "Commands to start an ejabberd node:"
-    echo "  start      Start an ejabberd node in server mode"
-    echo "  debug      Attach an interactive Erlang shell to a running ejabberd node"
-    echo "  iexdebug   Attach an interactive Elixir shell to a running ejabberd node"
-    echo "  live       Start an ejabberd node in live (interactive) mode"
-    echo "  iexlive    Start an ejabberd node in live (interactive) mode, within an Elixir shell"
-    echo "  foreground Start an ejabberd node in server mode (attached)"
-    echo ""
-    echo "Optional parameters when starting an ejabberd node:"
-    echo "  --config-dir dir   Config ejabberd:    $ETC_DIR"
-    echo "  --config file      Config ejabberd:    $EJABBERD_CONFIG_PATH"
-    echo "  --ctl-config file  Config ejabberdctl: $EJABBERDCTL_CONFIG_PATH"
-    echo "  --logs dir         Directory for logs: $LOGS_DIR"
-    echo "  --spool dir        Database spool dir: $SPOOL_DIR"
-    echo "  --node nodename    ejabberd node name: $ERLANG_NODE"
-    echo ""
-}
-
-# dynamic node name helper
-uid()
-{
-    uuid=$(uuidgen 2>/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=${uuid%%-*}
-    [ $# -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
-stop_epmd()
-{
-    "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
-}
-
-# make sure node not already running and node name unregistered
-# if all ok, ensure runtime directory exists and make it current directory
-check_start()
-{
-    "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
-        pgrep -f "$ERLANG_NODE" >/dev/null && {
-            echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
-            exit 4
-        }
-        pgrep beam >/dev/null && {
-            echo "ERROR: The ejabberd node '$ERLANG_NODE' is registered,"
-            echo "       but no related beam process has been found."
-            echo "Shutdown all other erlang nodes, and call 'epmd -kill'."
-            exit 5
-        }
-        "$EPMD" -kill >/dev/null
-    }
-}
-
-# allow sync calls
-wait_status()
-{
-    # args: status try delay
-    # return: 0 OK, 1 KO
-    timeout="$2"
-    status=4
-    while [ "$status" -ne "$1" ] ; do
-        sleep "$3"
-        timeout=$((timeout - 1))
-        if [ $timeout -eq 0 ] ; then
-            status="$1"
-        else
-            exec_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
-                     -extra "$ERLANG_NODE" $NO_TIMEOUT status > /dev/null
-            status="$?"
-        fi
-    done
-    [ $timeout -gt 0 ]
-}
-
-# ensure we can change current directory to SPOOL_DIR
-[ -d "$SPOOL_DIR" ] || exec_cmd mkdir -p "$SPOOL_DIR"
-cd "$SPOOL_DIR" || {
-    echo "ERROR: can not access directory $SPOOL_DIR"
-    exit 6
-}
-
-# main
-case $1 in
-    start)
-        check_start
-        exec_erl "$ERLANG_NODE" $EJABBERD_OPTS -noinput -detached
-        ;;
-    foreground)
-        check_start
-        exec_erl "$ERLANG_NODE" $EJABBERD_OPTS -noinput
-        ;;
-    live)
-        livewarning
-        check_start
-        exec_erl "$ERLANG_NODE" $EJABBERD_OPTS
-        ;;
-    debug)
-        debugwarning
-        exec_erl "$(uid debug)" -hidden -remsh "$ERLANG_NODE"
-        ;;
-    etop)
-        exec_erl "$(uid top)" -hidden -node "$ERLANG_NODE" -s etop \
-                 -s erlang halt -output text
-        ;;
-    iexdebug)
-        debugwarning
-        exec_iex "$(uid debug)" --remsh "$ERLANG_NODE"
-        ;;
-    iexlive)
-        livewarning
-        exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS" --app ejabberd
-        ;;
-    ping)
-        PEER=${2:-$ERLANG_NODE}
-        [ "$PEER" = "${PEER%.*}" ] && PS="-s"
-        exec_cmd "$ERL" ${PS:--}name "$(uid ping "$(hostname $PS)")" $ERLANG_OPTS \
-                 -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
-                 -s erlang halt -output text
-        ;;
-    started)
-        wait_status 0 30 2 # wait 30x2s before timeout
-        ;;
-    stopped)
-        wait_status 3 30 2 && stop_epmd # wait 30x2s before timeout
-        ;;
-    *)
-        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

examples/extauth/check_pass_null.pl

@@ -42,22 +42,6 @@ while(1)
              # 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;

include/ELDAPv3.hrl

@@ -1,81 +0,0 @@
-%% Generated by the Erlang ASN.1 compiler version:2.0.1
-%% Purpose: Erlang record definitions for each named and unnamed
-%% SEQUENCE and SET, and macro definitions for each value
-%% definition,in module ELDAPv3
-
-
-
--record('LDAPMessage',{
-messageID, protocolOp, controls = asn1_NOVALUE}).
-
--record('AttributeValueAssertion',{
-attributeDesc, assertionValue}).
-
--record('Attribute',{
-type, vals}).
-
--record('LDAPResult',{
-resultCode, matchedDN, errorMessage, referral = asn1_NOVALUE}).
-
--record('Control',{
-controlType, criticality = asn1_DEFAULT, controlValue = asn1_NOVALUE}).
-
--record('BindRequest',{
-version, name, authentication}).
-
--record('SaslCredentials',{
-mechanism, credentials = asn1_NOVALUE}).
-
--record('BindResponse',{
-resultCode, matchedDN, errorMessage, referral = asn1_NOVALUE, serverSaslCreds = asn1_NOVALUE}).
-
--record('SearchRequest',{
-baseObject, scope, derefAliases, sizeLimit, timeLimit, typesOnly, filter, attributes}).
-
--record('SubstringFilter',{
-type, substrings}).
-
--record('MatchingRuleAssertion',{
-matchingRule = asn1_NOVALUE, type = asn1_NOVALUE, matchValue, dnAttributes = asn1_DEFAULT}).
-
--record('SearchResultEntry',{
-objectName, attributes}).
-
--record('PartialAttributeList_SEQOF',{
-type, vals}).
-
--record('ModifyRequest',{
-object, modification}).
-
--record('ModifyRequest_modification_SEQOF',{
-operation, modification}).
-
--record('AttributeTypeAndValues',{
-type, vals}).
-
--record('AddRequest',{
-entry, attributes}).
-
--record('AttributeList_SEQOF',{
-type, vals}).
-
--record('ModifyDNRequest',{
-entry, newrdn, deleteoldrdn, newSuperior = asn1_NOVALUE}).
-
--record('CompareRequest',{
-entry, ava}).
-
--record('ExtendedRequest',{
-requestName, requestValue = asn1_NOVALUE}).
-
--record('ExtendedResponse',{
-resultCode, matchedDN, errorMessage, referral = asn1_NOVALUE, responseName = asn1_NOVALUE, response = asn1_NOVALUE}).
-
--record('PasswdModifyRequestValue',{
-userIdentity = asn1_NOVALUE, oldPasswd = asn1_NOVALUE, newPasswd = asn1_NOVALUE}).
-
--record('PasswdModifyResponseValue',{
-genPasswd = asn1_NOVALUE}).
-
--define('maxInt', 2147483647).
--define('passwdModifyOID', [49,46,51,46,54,46,49,46,52,46,49,46,52,50,48,51,46,49,46,49,49,46,49]).

include/adhoc.hrl

@@ -1,44 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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(adhoc_request,
-{
-    lang = <<"">>      :: binary(),
-    node = <<"">>      :: binary(),
-    sessionid = <<"">> :: binary(),
-    action = <<"">>    :: binary(),
-    xdata = false      :: false | xmlel(),
-    others = []        :: [xmlel()]
-}).
-
--record(adhoc_response,
-{
-    lang = <<"">>          :: binary(),
-    node = <<"">>          :: binary(),
-    sessionid = <<"">>     :: binary(),
-    status                 :: atom(),
-    defaultaction = <<"">> :: binary(),
-    actions       = []     :: [binary()],
-    notes         = []     :: [{binary(), binary()}],
-    elements      = []     :: [xmlel()]
-}).
-
--type adhoc_request() :: #adhoc_request{}.
--type adhoc_response() :: #adhoc_response{}.

include/bosh.hrl

@@ -1,51 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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.
-%%%
-%%%----------------------------------------------------------------------
-
--define(CT_XML,
-	{<<"Content-Type">>, <<"text/xml; charset=utf-8">>}).
-
--define(CT_PLAIN,
-	{<<"Content-Type">>, <<"text/plain">>}).
-
--define(CT_JSON,
-        {<<"Content-Type">>, <<"application/json">>}).
-
--define(AC_ALLOW_ORIGIN,
-	{<<"Access-Control-Allow-Origin">>, <<"*">>}).
-
--define(AC_ALLOW_METHODS,
-	{<<"Access-Control-Allow-Methods">>,
-	 <<"GET, POST, OPTIONS">>}).
-
--define(AC_ALLOW_HEADERS,
-	{<<"Access-Control-Allow-Headers">>,
-	 <<"Content-Type">>}).
-
--define(AC_MAX_AGE,
-	{<<"Access-Control-Max-Age">>, <<"86400">>}).
-
--define(OPTIONS_HEADER,
-	[?CT_PLAIN, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_METHODS,
-	 ?AC_ALLOW_HEADERS, ?AC_MAX_AGE]).
-
--define(HEADER(CType),
-	[CType, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_HEADERS]).
-
--define(BOSH_CACHE, bosh_cache).

include/ejabberd.hrl

@@ -1,72 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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.
-%%%
-%%%----------------------------------------------------------------------
-
--ifndef(EJABBERD_HRL).
--define(EJABBERD_HRL, true).
-
--define(VERSION, ejabberd_config:get_version()).
-
--define(MYHOSTS, ejabberd_config:get_myhosts()).
-
--define(MYNAME, hd(ejabberd_config:get_myhosts())).
-
--define(MYLANG, ejabberd_config:get_mylang()).
-
--define(MSGS_DIR, filename:join(["priv", "msgs"])).
-
--define(SQL_DIR, filename:join(["priv", "sql"])).
-
--define(CONFIG_PATH, <<"ejabberd.yml">>).
-
--define(LOG_PATH, "ejabberd.log").
-
--define(EJABBERD_URI, <<"http://www.process-one.net/en/ejabberd/">>).
-
--define(COPYRIGHT, "Copyright (c) 2002-2017 ProcessOne").
-
-%%-define(DBGFSM, true).
-
--record(scram,
-	{storedkey = <<"">>,
-         serverkey = <<"">>,
-         salt = <<"">>,
-         iterationcount = 0 :: integer()}).
-
--type scram() :: #scram{}.
-
--define(SCRAM_DEFAULT_ITERATION_COUNT, 4096).
-
--ifdef(ERL_DEPRECATED_TYPES).
-
--define(TDICT, dict()).
--define(TGB_TREE, gb_tree()).
--define(TGB_SET, gb_set()).
--define(TQUEUE, queue()).
-
--else.
-
--define(TDICT, dict:dict()).
--define(TGB_TREE, gb_trees:tree()).
--define(TGB_SET, gb_sets:set()).
--define(TQUEUE, queue:queue()).
-
--endif.
-
--endif.

include/ejabberd_acme.hrl

@@ -1,53 +0,0 @@
-
--record(challenge, {
-	  type  = <<"http-01">> :: bitstring(),
-	  status = pending :: pending | valid | invalid,
-	  uri = "" :: url(),
-	  token = <<"">> :: bitstring()
-	 }).
-
--record(data_acc, {
-	  id     :: list(),
-	  ca_url :: url(),
-	  key    :: jose_jwk:key()
-	 }).
--type data_acc() :: #data_acc{}.
-
--record(data_cert, {
-	  domain  :: bitstring(),
-	  pem     :: pem(),
-	  path    :: string()
-	 }).
--type data_cert() :: #data_cert{}.
-
-%%
-%% Types
-%%
-
-%% Acme configuration
--type acme_config() :: [{ca_url, url()} | {contact, bitstring()}].
-
-%% The main data type that ejabberd_acme keeps
--type acme_data() :: proplist().
-
-%% The list of certificates kept in data
--type data_certs() :: proplist(bitstring(), data_cert()).
-
-%% The certificate saved in pem format
--type pem() :: bitstring().
-
--type nonce() :: string().
--type url() :: string().
--type proplist() :: [{_, _}].
--type proplist(X,Y) :: [{X,Y}].
--type dirs() :: #{string() => url()}.
--type jws() :: map().
--type handle_resp_fun() :: fun(({ok, proplist(), proplist()}) -> {ok, _, nonce()}).
-
--type acme_challenge() :: #challenge{}.
-
-%% Options
--type account_opt() :: string().
--type verbose_opt() :: string().
--type domains_opt() :: string().
-

include/ejabberd_commands.hrl

@@ -1,105 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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.
-%%%
-%%%----------------------------------------------------------------------
-
--type aterm() :: {atom(), atype()}.
--type atype() :: integer | string | binary |
-                 {tuple, [aterm()]} | {list, aterm()}.
--type rterm() :: {atom(), rtype()}.
--type rtype() :: integer | string | atom |
-                 {tuple, [rterm()]} | {list, rterm()} |
-                 rescode | restuple.
-
--type oauth_scope() :: atom().
-
-%% ejabberd_commands OAuth ReST ACL definition:
-%% Two fields exist that are used to control access on a command from ReST API:
-%% 1. Policy
-%% If policy is:
-%%  - restricted: command is not exposed as OAuth Rest API.
-%%  - admin: Command is allowed for user that have Admin Rest command enabled by access rule: commands_admin_access
-%%  - user: Command might be called by any server user.
-%%  - open: Command can be called by anyone.
-%%
-%% Policy is just used to control who can call the command. A specific additional access rules can be performed, as
-%% defined by access option.
-%% Access option can be a list of:
-%% - {Module, accessName, DefaultValue}: Reference and existing module access to limit who can use the command.
-%% - AccessRule name: direct name of the access rule to check in config file.
-%% TODO: Access option could be atom command (not a list). In the case, User performing the command, will be added as first parameter
-%% to command, so that the command can perform additional check.
-
--record(ejabberd_commands,
-        {name                    :: atom(),
-         tags = []               :: [atom()] | '_' | '$2',
-         desc = ""               :: string() | '_' | '$3',
-         longdesc = ""           :: string() | '_',
-         version = 0             :: integer(),
-         weight = 1              :: integer(),
-         module                  :: atom() | '_',
-         function                :: atom() | '_',
-         args = []               :: [aterm()] | '_' | '$1' | '$2',
-         policy = restricted     :: open | restricted | admin | user,
-        %% access is: [accessRuleName] or [{Module, AccessOption, DefaultAccessRuleName}]
-         access = []             :: [{atom(),atom(),atom()}|atom()],
-         result = {res, rescode} :: rterm() | '_' | '$2',
-         args_desc = none        :: none | [string()] | '_',
-         result_desc = none      :: none | string() | '_',
-         args_example = none     :: none | [any()] | '_',
-         result_example = none   :: any()}).
-
-%% TODO Fix me: Type is not up to date
--type ejabberd_commands() :: #ejabberd_commands{name :: atom(),
-                                                tags :: [atom()],
-                                                desc :: string(),
-                                                longdesc :: string(),
-                                                version :: integer(),
-                                                module :: atom(),
-                                                function :: atom(),
-                                                args :: [aterm()],
-                                                policy :: open | restricted | admin | user,
-                                                access :: [{atom(),atom(),atom()}|atom()],
-                                                result :: rterm()}.
-
-%% @type ejabberd_commands() = #ejabberd_commands{
-%%    name = atom(),
-%%    tags = [atom()],
-%%    desc = string(),
-%%    longdesc = string(),
-%%    module = atom(),
-%%    function = atom(),
-%%    args = [aterm()],
-%%    result = rterm()
-%%    }.
-%% desc: Description of the command
-%% args: Describe the accepted arguments.
-%% This way the function that calls the command can format the
-%% arguments before calling.
-
-%% @type atype() = integer | string | {tuple, [aterm()]} | {list, aterm()}.
-%% Allowed types for arguments are integer, string, tuple and list.
-
-%% @type rtype() = integer | string | atom | {tuple, [rterm()]} | {list, rterm()} | rescode | restuple.
-%% A rtype is either an atom or a tuple with two elements.
-
-%% @type aterm() = {Name::atom(), Type::atype()}.
-%% An argument term is a tuple with the term name and the term type.
-
-%% @type rterm() = {Name::atom(), Type::rtype()}.
-%% A result term is a tuple with the term name and the term type.

include/ejabberd_config.hrl

@@ -1,30 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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(local_config, {key :: any(), value :: any()}).
-
--type local_config() :: #local_config{}.
-
--record(state,
-	{opts = []               :: [acl:acl() | local_config()],
-         hosts = []              :: [binary()],
-         override_local = false  :: boolean(),
-	 override_global = false :: boolean(),
-         override_acls = false   :: boolean()}).

include/ejabberd_http.hrl

@@ -1,51 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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(request,
-	{method            :: method(),
-	 path = []         :: [binary()],
-	 q = []            :: [{binary() | nokey, binary()}],
-	 us = {<<>>, <<>>} :: {binary(), binary()},
-	 auth              :: {binary(), binary()} | {oauth, binary(), []} | undefined,
-	 lang = <<"">>     :: binary(),
-	 data = <<"">>     :: binary(),
-	 ip                :: {inet:ip_address(), inet:port_number()},
-	 host = <<"">>     :: binary(),
-	 port = 5280       :: inet:port_number(),
-	 opts = []         :: list(),
-	 tp = http         :: protocol(),
-	 headers = []      :: [{atom() | binary(), binary()}]}).
-
--record(ws,
-	{socket                  :: inet:socket() | fast_tls:tls_socket(),
-	 sockmod = gen_tcp       :: gen_tcp | fast_tls,
-	 ip                      :: {inet:ip_address(), inet:port_number()},
-	 host = <<"">>           :: binary(),
-	 port = 5280             :: inet:port_number(),
-	 path = []               :: [binary()],
-	 headers = []            :: [{atom() | binary(), binary()}],
-	 local_path = []         :: [binary()],
-	 q = []                  :: [{binary() | nokey, binary()}],
-	 buf                     :: binary(),
-         http_opts = []          :: list()}).
-
--type method() :: 'GET' | 'HEAD' | 'DELETE' | 'OPTIONS' | 'PUT' | 'POST' | 'TRACE'.
--type protocol() :: http | https.
--type http_request() :: #request{}.

include/ejabberd_oauth.hrl

@@ -1,26 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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(oauth_token, {
-          token = <<"">>           :: binary() | '_',
-          us = {<<"">>, <<"">>}    :: {binary(), binary()} | '_',
-          scope = []               :: [binary()] | '_',
-          expire                   :: integer() | '$1' | '_'
-         }).

include/ejabberd_router.hrl

@@ -1,8 +0,0 @@
--define(ROUTES_CACHE, routes_cache).
-
--type local_hint() :: integer() | {apply, atom(), atom()}.
-
--record(route, {domain :: binary() | '_',
-		server_host :: binary() | '_',
-		pid :: undefined | pid(),
-		local_hint :: local_hint() | undefined | '_'}).

include/ejabberd_sm.hrl

@@ -1,36 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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.
-%%%
-%%%----------------------------------------------------------------------
-
--ifndef(EJABBERD_SM_HRL).
--define(EJABBERD_SM_HRL, true).
-
--define(SM_CACHE, sm_cache).
-
--record(session, {sid, usr, us, priority, info = []}).
--record(session_counter, {vhost, count}).
--type sid() :: {erlang:timestamp(), pid()}.
--type ip() :: {inet:ip_address(), inet:port_number()} | undefined.
--type info() :: [{conn, atom()} | {ip, ip()} | {node, atom()}
-                 | {oor, boolean()} | {auth_module, atom()}
-                 | {num_stanzas_in, non_neg_integer()}
-		 | offline].
--type prio() :: undefined | integer().
-
--endif.

include/ejabberd_sql_pt.hrl

@@ -1,36 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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.
-%%%
-%%%----------------------------------------------------------------------
-
--define(SQL_MARK, sql__mark_).
--define(SQL(SQL), ?SQL_MARK(SQL)).
-
--define(SQL_UPSERT_MARK, sql_upsert__mark_).
--define(SQL_UPSERT(Host, Table, Fields),
-        ejabberd_sql:sql_query(Host, ?SQL_UPSERT_MARK(Table, Fields))).
--define(SQL_UPSERT_T(Table, Fields),
-        ejabberd_sql:sql_query_t(?SQL_UPSERT_MARK(Table, Fields))).
-
--define(SQL_INSERT_MARK, sql_insert__mark_).
--define(SQL_INSERT(Table, Fields), ?SQL_INSERT_MARK(Table, Fields)).
-
--record(sql_query, {hash, format_query, format_res, args, loc}).
-
--record(sql_escape, {string, integer, boolean}).
-

include/ejabberd_web_admin.hrl

@@ -1,104 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2017   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.
-%%%
-%%%----------------------------------------------------------------------
-
--define(X(Name),
-	#xmlel{name = Name, attrs = [], children = []}).
-
--define(XA(Name, Attrs),
-	#xmlel{name = Name, attrs = Attrs, children = []}).
-
--define(XE(Name, Els),
-	#xmlel{name = Name, attrs = [], children = Els}).
-
--define(XAE(Name, Attrs, Els),
-	#xmlel{name = Name, attrs = Attrs, children = Els}).
-
--define(C(Text), {xmlcdata, Text}).
-
--define(XC(Name, Text), ?XE(Name, [?C(Text)])).
-
--define(XAC(Name, Attrs, Text),
-	?XAE(Name, Attrs, [?C(Text)])).
-
--define(T(Text), translate:translate(Lang, Text)).
-
--define(CT(Text), ?C((?T(Text)))).
-
--define(XCT(Name, Text), ?XC(Name, (?T(Text)))).
-
--define(XACT(Name, Attrs, Text),
-	?XAC(Name, Attrs, (?T(Text)))).
-
--define(LI(Els), ?XE(<<"li">>, Els)).
-
--define(A(URL, Els),
-	?XAE(<<"a">>, [{<<"href">>, URL}], Els)).
-
--define(AC(URL, Text), ?A(URL, [?C(Text)])).
-
--define(ACT(URL, Text), ?AC(URL, (?T(Text)))).
-
--define(P, ?X(<<"p">>)).
-
--define(BR, ?X(<<"br">>)).
-
--define(INPUT(Type, Name, Value),
-	?XA(<<"input">>,
-	    [{<<"type">>, Type}, {<<"name">>, Name},
-	     {<<"value">>, Value}])).
-
--define(INPUTT(Type, Name, Value),
-	?INPUT(Type, Name, (?T(Value)))).
-
--define(INPUTS(Type, Name, Value, Size),
-	?XA(<<"input">>,
-	    [{<<"type">>, Type}, {<<"name">>, Name},
-	     {<<"value">>, Value}, {<<"size">>, Size}])).
-
--define(INPUTST(Type, Name, Value, Size),
-	?INPUT(Type, Name, (?T(Value)), Size)).
-
--define(ACLINPUT(Text),
-	?XE(<<"td">>,
-	    [?INPUT(<<"text">>, <<"value", ID/binary>>, Text)])).
-
--define(TEXTAREA(Name, Rows, Cols, Value),
-	?XAC(<<"textarea">>,
-	     [{<<"name">>, Name}, {<<"rows">>, Rows},
-	      {<<"cols">>, Cols}],
-	     Value)).
-
-%% Build an xmlelement for result
--define(XRES(Text),
-	?XAC(<<"p">>, [{<<"class">>, <<"result">>}], Text)).
-
-%% Guide Link
--define(XREST(Text), ?XRES((?T(Text)))).
-
--define(GL(Ref, Title),
-	?XAE(<<"div">>, [{<<"class">>, <<"guidelink">>}],
-	     [?XAE(<<"a">>,
-		   [{<<"href">>, <<"/admin/doc/guide.html#", Ref/binary>>},
-		    {<<"target">>, <<"_blank">>}],
-		   [?C(<<"[Guide: ", Title/binary, "]">>)])])).
-
-%% h1 with a Guide Link
--define(H1GL(Name, Ref, Title),
-	[?XC(<<"h1">>, Name), ?GL(Ref, Title)]).