OK, I finally feel I can show this to people. I'm still not quite sure
it's "perfect", but I can't think at the moment of anything else to
change, and I'm running with it for a couple of days now.
Certainly my changes to ejabberctl need review, seeing I am doing some
heavy modifications to it (which $UPSTREAM got interested in). Please
have a look at it, whether I do things in a sane way, in proper order,
and so on.
README.OpenBSD included with some quick tips how to get this running.
Another thing I'm not sure how I feel about, I tried to keep the way
$UPSTREAM wants it, ie database files now go to /var/db/ejabberd/$NODE/
instead of old /var/db/ejabberd/ (where unless you modify things NODE =
ejabberd). The steps described in README.OpenBSD for migrating the
databse are certainly the safe way to do things, but since both the old
and the new one keep the erlang node name as [EMAIL PROTECTED] -s` I
was able to just copy my old files into the new dir and run that way.
SSL is enabled by default in the sample config file.
During build there's a warning displayed that erlang R12 (what we have
in our tree) is discouraged, but I didn't have any problems with it yet,
and $UPSTREAM says 2.0.1 will have better support for R12.
Apply with patch -E, our own ejabberd is deprecated in favour of
ejabberdctl, and ejabberdctl is now provided with the distribution
(though rather heavily patched by me)
Big thanks to everyone who so far helped, tested and commented! :)
--
viq
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ejabberd/Makefile,v
retrieving revision 1.6
diff -u -d -r1.6 Makefile
--- Makefile 6 Jan 2008 17:13:04 -0000 1.6
+++ Makefile 7 Apr 2008 19:36:26 -0000
@@ -2,13 +2,12 @@
COMMENT= jabber server written in Erlang
-V= 1.1.4
+V= 2.0.0
DISTNAME= ejabberd-$V
-PKGNAME= ${DISTNAME}p2
CATEGORIES= net chat
-HOMEPAGE= http://ejabberd.jabber.ru/
+HOMEPAGE= http://www.ejabberd.im/
MAINTAINER= Wiktor Izdebski <[EMAIL PROTECTED]>
@@ -35,7 +34,8 @@
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
SHARED_ONLY= Yes
-CONFIGURE_ARGS+= --enable-mod_pubsub \
+CONFIGURE_ARGS+= --disable-pam \
+ --enable-mod_pubsub \
--enable-mod_irc \
--enable-mod_muc \
--enable-eldap \
@@ -57,9 +57,6 @@
NO_REGRESS= Yes
post-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/ejabberd ${PREFIX}/sbin/
- ${INSTALL_SCRIPT} ${FILESDIR}/ejabberdctl ${PREFIX}/bin/
- ${INSTALL_DATA} ${FILESDIR}/ejabberd.inetrc
${PREFIX}/share/examples/ejabberd/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ejabberd
cd ${WRKDIST}/examples && \
find . -type d -exec ${INSTALL_DATA_DIR}
${PREFIX}/share/examples/ejabberd/{} \; && \
@@ -70,15 +67,17 @@
find . -type d -exec ${INSTALL_DATA_DIR}
${PREFIX}/share/doc/ejabberd/{} \; && \
find . -name '*.html' -exec ${INSTALL_DATA} {}
${PREFIX}/share/doc/ejabberd/{} \; && \
find . -name '*.png' -exec ${INSTALL_DATA} {}
${PREFIX}/share/doc/ejabberd/{} \;
+ ${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/ejabberd/
perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" \
-e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g;" \
- -e "s,!!EJDBDIR!!,${EJDBDIR},g;" \
- -e "s,!!EJLOGDIR!!,${EJLOGDIR},g;" \
- -e "s,!!JABBERDUSER!!,${JABBERDUSER},g;" \
- ${PREFIX}/sbin/ejabberd
+ ${PREFIX}/share/doc/ejabberd/README.OpenBSD
+ perl -pi -e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g;" \
+ ${PREFIX}/share/examples/ejabberd/ejabberd.cfg
perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" \
+ -e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g;" \
-e "s,!!EJDBDIR!!,${EJDBDIR},g;" \
+ -e "s,!!EJLOGDIR!!,${EJLOGDIR},g;" \
-e "s,!!JABBERDUSER!!,${JABBERDUSER},g;" \
- ${PREFIX}/bin/ejabberdctl
+ ${PREFIX}/sbin/ejabberdctl
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ejabberd/distinfo,v
retrieving revision 1.2
diff -u -d -r1.2 distinfo
--- distinfo 18 Sep 2007 17:56:32 -0000 1.2
+++ distinfo 21 Feb 2008 15:31:31 -0000
@@ -1,5 +1,5 @@
-MD5 (ejabberd-1.1.4.tar.gz) = ZenNNG8Roor7rP4de+OjOw==
-RMD160 (ejabberd-1.1.4.tar.gz) = THJUgSmwGW/wCWvYWTbgdQ/E174=
-SHA1 (ejabberd-1.1.4.tar.gz) = 229SHUXeziAN5OtvyWfGRyjo9qM=
-SHA256 (ejabberd-1.1.4.tar.gz) = 3NYbcsUi7ud6tWInsW11/VdB7+K5uaih0+1+78Kn5PY=
-SIZE (ejabberd-1.1.4.tar.gz) = 846059
+MD5 (ejabberd-2.0.0.tar.gz) = k7IfL6DKYHS9IquSTn3O2A==
+RMD160 (ejabberd-2.0.0.tar.gz) = nnuzCCXy1IDXVRYTb8xipJ2HElU=
+SHA1 (ejabberd-2.0.0.tar.gz) = 1wJXwedfWbcoTVLAOEMWZM/VPgg=
+SHA256 (ejabberd-2.0.0.tar.gz) = CG4QXLQC74aOMYcnfbFIaAfhs0ouPjZ58O5t4eX9LlQ=
+SIZE (ejabberd-2.0.0.tar.gz) = 1387404
Index: files/README.OpenBSD
===================================================================
RCS file: files/README.OpenBSD
diff -N files/README.OpenBSD
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/README.OpenBSD 30 Mar 2008 20:49:04 -0000
@@ -0,0 +1,60 @@
+* Migration
+ When moving database between machines, or upgrading from 1.1.x to
+ 2.x.x version you will need to follow the instructions available at
+ http://www.ejabberd.im/migrate-host
+ Node name is by default set to [EMAIL PROTECTED] -s`
+
+
+* Configuration
+ * DNS
+ SRV records for your server can make your life easier. Example
+ records:
+ _jabber._tcp.example.org. SRV 5 0 5269 host.example.org.
+ _xmpp-server._tcp.example.org. SRV 5 0 5269 host.example.org.
+ _xmpp-client._tcp.example.org. SRV 5 0 5222 host.example.org.
+
+ * Configuration file
+ Set up the hostnames served by the server:
+ {hosts, ["example.net", "example.com", "example.org"]}.
+ Add administrative user
+ {acl, admin, {user, "ermine", "example.org"}}.
+ If you want to disallow in-band registration of users:
+ {access, register, [{deny, all}]}.
+ Users to get notifications about created new accounts:
+ {registration_watchers, ["[EMAIL PROTECTED]"]},
+
+
+* Running
+ Control is done using !!LOCALBASE!!/sbin/ejabberdctl, run it without
+ arguments for list of possible commands and flags. It needs to be
+ executed as either root or _ejabberd user.
+
+ To start ejabberd at boot time, you may insert the following
+ into !!SYSCONFDIR!!/rc.local:
+
+ if [ -x !!LOCALBASE!!/sbin/ejabberd ]; then
+ echo -n ' ejabberd'; !!LOCALBASE!!/sbin/ejabberd
+ fi
+
+
+
+* Administration
+ ejabberdctl has some commands for administration of the server. After
+ starting ejabberd run ejabberdctl again for list of options.
+ Another possibility, giving you more options, is the web interface,
+ available at http://your.server:5280/admin/ where you need to log in
+ as a user added to admin acl group, give your full jid and your
+ account password
+
+
+* Using SSL
+ The sample configuration enables SSL by default. You just need to
+ generate the keys. Note that you should enter your domain name as the
+ Common Name for your certificate.
+ # openssl req -new -nodes -x509 -newkey rsa:4096 -days 365 \
+ -keyout !!SYSCONFDIR!!/ejabberd/myserver.pem -out
!!SYSCONFDIR!!/ejabberd/myserver.pem
+ # chown root:_ejabberd !!SYSCONFDIR!!/ejabberd/myserver.pem
+ # chmod 640 !!SYSCONFDIR!!/ejabberd/myserver.pem
+
+ To disable SSL comment out (prepend with %%) lines containing
+ 'certfile' and the whole block pertaining port 5223
Index: files/ejabberd
===================================================================
RCS file: files/ejabberd
diff -N files/ejabberd
--- files/ejabberd 17 Sep 2007 21:19:06 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-#!/bin/sh
-PREFIX="!!LOCALBASE!!"
-EJLIBDIR="${PREFIX}/lib/ejabberd"
-EJDBDIR="!!EJDBDIR!!"
-EJLOGDIR="!!EJLOGDIR!!"
-
-CONFDIR="!!SYSCONFDIR!!/ejabberd"
-configfile="${CONFDIR}/ejabberd.cfg"
-detached="-detached"
-
-while getopts fc: opt
-do
- case "$opt" in
- c) configfile="$OPTARG";;
- f) detached="";;
- \?) # unknown flag
- echo >&2 \
- "usage: $0 [-c configfile] [-f]"
- exit 1;;
- esac
-done
-shift `expr $OPTIND - 1`
-
-exec su -l !!JABBERDUSER!! ${PREFIX}/bin/erl \
- -kernel inetrc \"${CONFDIR}/ejabberd.inetrc\" \
- -noinput -pa ${EJLIBDIR}/ebin \
- -sname ejabberd -s ejabberd \
- -ejabberd config \"${configfile}\" \
- log_path \"${EJLOGDIR}/ejabberd.log\" \
- -sasl sasl_error_logger \{file,\"${EJLOGDIR}/sasl.log\"\} \
- -mnesia dir \"$EJDBDIR\" ${detached}
Index: files/ejabberd.inetrc
===================================================================
RCS file: files/ejabberd.inetrc
diff -N files/ejabberd.inetrc
--- files/ejabberd.inetrc 17 Sep 2007 21:19:06 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-{file, resolv, "/etc/resolv.conf"}.
Index: files/ejabberdctl
===================================================================
RCS file: files/ejabberdctl
diff -N files/ejabberdctl
--- files/ejabberdctl 17 Sep 2007 21:19:06 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-#!/bin/sh
-PREFIX="!!LOCALBASE!!"
-EJLIBDIR="${PREFIX}/lib/ejabberd"
-ID=`id -g`
-EJID=`id -g !!JABBERDUSER!!`
-export HOME="!!EJDBDIR!!"
-
-if [ "$ID" -ne 0 -a "$ID" -ne "$EJID" ]; then
- echo "this command can only be run by root and the _ejabberd user" >&2
- exit 1
-fi
-if [ X"$1" == "X" ]; then
- echo "not enough arguments" >&2
- exit 2
-fi
-echo "$1" | grep -q "@"
-if [ $? -ne 0 ]; then
- nodename="[EMAIL PROTECTED] -s`"
-else
- nodename=""
-fi
-
-if [ $ID -eq 0 ]; then
- exec su -l !!JABBERDUSER!! ${PREFIX}/bin/erl -noinput -pa
${EJLIBDIR}/ebin -sname ejabberdctl -s ejabberd_ctl -extra $nodename $@
-else
- exec ${PREFIX}/bin/erl -noinput -pa ${EJLIBDIR}/ebin -sname ejabberdctl
-s ejabberd_ctl -extra $nodename $@
-fi
Index: patches/patch-src_ejabberd_cfg_example
===================================================================
RCS file: patches/patch-src_ejabberd_cfg_example
diff -N patches/patch-src_ejabberd_cfg_example
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ejabberd_cfg_example 30 Mar 2008 21:12:18 -0000
@@ -0,0 +1,54 @@
+$OpenBSD$
+--- src/ejabberd.cfg.example.orig Thu Feb 21 11:02:12 2008
++++ src/ejabberd.cfg.example Sun Mar 30 23:11:59 2008
+@@ -113,7 +113,7 @@
+ %% certificate, put the correct path to the
+ %% file and uncomment this line:
+ %%
+- %%{certfile, "/path/to/ssl.pem"}, starttls,
++ {certfile, "!!SYSCONFDIR!!/ejabberd/myserver.pem"},
starttls,
+
+ {access, c2s},
+ {shaper, c2s_shaper},
+@@ -123,12 +123,12 @@
+ %%
+ %% To enable the old SSL connection method in port 5223:
+ %%
+- %%{5223, ejabberd_c2s, [
+- %% {access, c2s},
+- %% {shaper, c2s_shaper},
+- %% {certfile, "/path/to/ssl.pem"}, tls,
+- %% {max_stanza_size, 65536}
+- %% ]},
++{5223, ejabberd_c2s, [
++ {access, c2s},
++ {shaper, c2s_shaper},
++ {certfile, "!!SYSCONFDIR!!/ejabberd/myserver.pem"}, tls,
++ {max_stanza_size, 65536}
++ ]},
+
+ {5269, ejabberd_s2s_in, [
+ {shaper, s2s_shaper},
+@@ -159,18 +159,18 @@
+ %% Allowed values are: true or false.
+ %% You must specify a certificate file.
+ %%
+-%%{s2s_use_starttls, true}.
++{s2s_use_starttls, true}.
+
+ %%
+ %% s2s_certfile: Specify a certificate file.
+ %%
+-%%{s2s_certfile, "/path/to/ssl.pem"}.
++{s2s_certfile, "!!SYSCONFDIR!!/ejabberd/myserver.pem"}.
+
+ %%
+ %% domain_certfile: Specify a different certificate for each served hostname.
+ %%
+-%%{domain_certfile, "example.org", "/path/to/example_org.pem"}.
+-%%{domain_certfile, "example.com", "/path/to/example_com.pem"}.
++%%{domain_certfile, "example.org", "!!SYSCONFDIR!!/ejabberd/example_org.pem"}.
++%%{domain_certfile, "example.com", "!!SYSCONFDIR!!/ejabberd/example_com.pem"}.
+
+ %%
+ %% S2S whitelist or blacklist
Index: patches/patch-src_ejabberd_s2s_in_erl
===================================================================
RCS file: /cvs/ports/net/ejabberd/patches/patch-src_ejabberd_s2s_in_erl,v
retrieving revision 1.1
diff -u -d -r1.1 patch-src_ejabberd_s2s_in_erl
--- patches/patch-src_ejabberd_s2s_in_erl 19 Dec 2007 22:55:30 -0000
1.1
+++ patches/patch-src_ejabberd_s2s_in_erl 21 Feb 2008 15:34:16 -0000
@@ -1,15 +1,15 @@
$OpenBSD: patch-src_ejabberd_s2s_in_erl,v 1.1 2007/12/19 22:55:30 sthen Exp $
---- src/ejabberd_s2s_in.erl.orig Thu Dec 6 12:21:26 2007
-+++ src/ejabberd_s2s_in.erl Thu Dec 6 12:22:44 2007
-@@ -30,8 +30,9 @@
-
- -include("ejabberd.hrl").
- -include("jlib.hrl").
+--- src/ejabberd_s2s_in.erl.orig Thu Feb 21 16:33:14 2008
++++ src/ejabberd_s2s_in.erl Thu Feb 21 16:34:02 2008
+@@ -51,8 +51,9 @@
+ -ifdef(SSL39).
+ -include_lib("ssl/include/ssl_pkix.hrl").
+ -else.
--include_lib("ssl/include/PKIX1Explicit88.hrl").
--include_lib("ssl/include/PKIX1Implicit88.hrl").
+-include_lib("ssl/pkix/PKIX1Explicit88.hrl").
+-include_lib("ssl/pkix/PKIX1Implicit88.hrl").
+-include_lib("ssl/pkix/OTP-PKIX.hrl").
+ -endif.
-include("XmppAddr.hrl").
- -define(DICT, dict).
Index: patches/patch-src_ejabberdctl_template
===================================================================
RCS file: patches/patch-src_ejabberdctl_template
diff -N patches/patch-src_ejabberdctl_template
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ejabberdctl_template 4 Apr 2008 11:24:04 -0000
@@ -0,0 +1,184 @@
+$OpenBSD$
+--- src/ejabberdctl.template.orig Thu Feb 21 11:02:12 2008
++++ src/ejabberdctl.template Fri Apr 4 13:23:59 2008
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+
+ # define default configuration
+-POLL=true
++POLL=false
+ SMP=auto
+ ERL_MAX_PORTS=32000
+ ERL_PROCESSES=250000
+@@ -9,15 +9,17 @@ ERL_MAX_ETS_TABLES=1400
+
+ # define default environment variables
+ NODE=ejabberd
+-HOST=localhost
++HOST=`hostname -s`
+ [EMAIL PROTECTED]
+ [EMAIL PROTECTED]@
+-EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
+-LOGS_DIR=$ROOTDIR/var/log/ejabberd/
+-EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
++EJABBERD_CONFIG_PATH=!!SYSCONFDIR!!/ejabberd/ejabberd.cfg
++LOGS_DIR=!!EJLOGDIR!!
++EJABBERD_DB=!!EJDBDIR!!/$NODE
++ID=`id -g`
++EJID=`id -g !!JABBERDUSER!!`
+
+ # read custom configuration
+-CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg
++CONFIG=!!SYSCONFDIR!!/ejabberd/ejabberdctl.cfg
+ [ -f "$CONFIG" ] && . "$CONFIG"
+
+ # parse command line parameters
+@@ -36,22 +38,32 @@ while [ $# -ne 0 ] ; do
+ esac
+ done
+
++NODE="[EMAIL PROTECTED]"
++EJABBERD_DB=!!EJDBDIR!!/$NODE
++
+ NAME=-name
+ [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && NAME=-sname
+
+ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES"
+
+ # define additional environment variables
+-EJABBERD_EBIN=$ROOTDIR/var/lib/ejabberd/ebin
+-EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
+-EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib
+-EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+-SASL_LOG_PATH=$LOGS_DIR/sasl.log
++EJABBERD_EBIN=!!LOCALBASE!!/lib/ejabberd/ebin
++EJABBERD_MSGS_PATH=!!LOCALBASE!!/lib/ejabberd/priv/msgs
++EJABBERD_SO_PATH=!!LOCALBASE!!/lib/ejabberd/priv/lib
++EJABBERD_LOG_PATH=$LOGS_DIR/${NODE}.log
++SASL_LOG_PATH=$LOGS_DIR/${NODE}_sasl.log
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+-ERL_INETRC=$ROOTDIR/etc/ejabberd/inetrc
+-HOME=$ROOTDIR/var/lib/ejabberd
++ERL_INETRC=!!SYSCONFDIR!!/ejabberd/inetrc
++HOME=!!EJDBDIR!!
+
++# make sure we execute commands as proper user
++if [ $ID -eq 0 ]; then
++ EXEC_CMD='su -l !!JABBERDUSER!! -c'
++else
++ EXEC_CMD=''
++fi
++
+ # export global variables
+ export EJABBERD_CONFIG_PATH
+ export EJABBERD_MSGS_PATH
+@@ -61,25 +73,26 @@ export ERL_CRASH_DUMP
+ export ERL_INETRC
+ export ERL_MAX_PORTS
+ export ERL_MAX_ETS_TABLES
++export EXEC_CMD
+ export HOME
+
+-[ -d $EJABBERD_DB ] || mkdir -p $EJABBERD_DB
+-[ -d $LOGS_DIR ] || mkdir -p $LOGS_DIR
+-
+ # Compatibility in ZSH
+ #setopt shwordsplit 2>/dev/null
+
+ # start server
+ start ()
+ {
+- erl \
++ $EXEC_CMD "!!LOCALBASE!!/bin/erl \
+ $NAME $ERLANG_NODE \
+ -noinput -detached \
+ -pa $EJABBERD_EBIN \
+- -mnesia dir "\"$EJABBERD_DB\"" \
++ -kernel inetrc \\\"${ERL_INETRC}\\\" \
++ -mnesia dir \"\\\"$EJABBERD_DB\\\"\" \
+ -s ejabberd \
+- -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} \
+- $ERLANG_OPTS $ARGS "$@"
++ -ejabberd config \\\"${EJABBERD_CONFIG_PATH}\\\" \
++ log_path \\\"${EJABBERD_LOG_PATH}\\\" \
++ -sasl sasl_error_logger \{file,\\\"$SASL_LOG_PATH\\\"\} \
++ $ERLANG_OPTS $ARGS \"[EMAIL PROTECTED]""
+ }
+
+ # attach to server
+@@ -101,10 +114,10 @@ debug ()
+ echo "Press any key to continue"
+ read foo
+ echo ""
+- erl \
++ $EXEC_CMD "!!LOCALBASE!!/bin/erl \
+ $NAME ${NODE}debug \
+ -remsh $ERLANG_NODE \
+- $ERLANG_OPTS $ARGS "$@"
++ $ERLANG_OPTS $ARGS \"[EMAIL PROTECTED]""
+ }
+
+ # start interactive server
+@@ -125,23 +138,26 @@ live ()
+ echo "Press any key to continue"
+ read foo
+ echo ""
+- erl \
++ $EXEC_CMD "!!LOCALBASE!!/bin/erl \
+ $NAME $ERLANG_NODE \
+ $ERLANG_OPTS \
+ -pa $EJABBERD_EBIN \
+- -mnesia dir "\"$EJABBERD_DB\"" \
++ -kernel inetrc \\\"${ERL_INETRC}\\\" \
++ -mnesia dir \"\\\"$EJABBERD_DB\\\"\" \
+ -s ejabberd \
+- $ERLANG_OPTS $ARGS "$@"
++ -ejabberd config \\\"${EJABBERD_CONFIG_PATH}\\\" \
++ log_path \\\"${EJABBERD_LOG_PATH}\\\" \
++ $ERLANG_OPTS $ARGS \"[EMAIL PROTECTED]""
+ }
+
+ # common control function
+ ctl ()
+ {
+- erl \
++ $EXEC_CMD "!!LOCALBASE!!/bin/erl \
+ $NAME ejabberdctl \
+ -noinput \
+ -pa $EJABBERD_EBIN \
+- -s ejabberd_ctl -extra $ERLANG_NODE $@
++ -s ejabberd_ctl -extra $ERLANG_NODE $@"
+ result=$?
+ case $result in
+ 0) :;;
+@@ -157,6 +173,7 @@ ctl ()
+ echo " --ctl-config file Config file of ejabberdctl: $CONFIG"
+ echo " --logs dir Directory for logs: $LOGS_DIR"
+ echo " --spool dir Database spool dir: $EJABBERD_DB"
++ echo " --node node_name Ejabberd node name: $ERLANG_NODE"
+ echo "";;
+ esac
+ return $result
+@@ -168,6 +185,21 @@ usage ()
+ ctl
+ exit
+ }
++
++# check if we're a user that can execute commands
++if [ "$ID" -ne 0 -a "$ID" -ne "$EJID" ]; then
++ echo "this command can only be run by root and the _ejabberd user" >&2
++ EXEC_CMD='false'
++ usage
++fi
++
++if [ ! -d $EJABBERD_DB -o ! -w $EJABBERD_DB ] ; then
++ if [ ! -d ${EJABBERD_DB%/*} -o ! -w ${EJABBERD_DB%/*} ] ; then
++ echo "${EJABBERD_DB} does not exist and I can't create it!"
++ exit 1
++ fi
++ echo "${EJABBERD_DB} does not exist, creating it now."
++fi
+
+ case $ARGS in
+ ' start') start;;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ejabberd/pkg/PLIST,v
retrieving revision 1.2
diff -u -d -r1.2 PLIST
--- pkg/PLIST 18 Sep 2007 17:56:32 -0000 1.2
+++ pkg/PLIST 30 Mar 2008 21:08:56 -0000
@@ -2,7 +2,6 @@
@newgroup _ejabberd:594
@newuser _ejabberd:594:_ejabberd:daemon:ejabberd
account:/var/db/ejabberd:/bin/sh
%%SHARED%%
-bin/ejabberdctl
lib/ejabberd/
lib/ejabberd/ebin/
lib/ejabberd/ebin/ELDAPv3.beam
@@ -23,17 +22,24 @@
lib/ejabberd/ebin/ejabberd_auth_internal.beam
lib/ejabberd/ebin/ejabberd_auth_ldap.beam
lib/ejabberd/ebin/ejabberd_auth_odbc.beam
[EMAIL PROTECTED] lib/ejabberd/ebin/ejabberd_auth_pam.beam
lib/ejabberd/ebin/ejabberd_c2s.beam
+lib/ejabberd/ebin/ejabberd_c2s_config.beam
lib/ejabberd/ebin/ejabberd_config.beam
lib/ejabberd/ebin/ejabberd_ctl.beam
+lib/ejabberd/ebin/ejabberd_frontend_socket.beam
lib/ejabberd/ebin/ejabberd_hooks.beam
lib/ejabberd/ebin/ejabberd_http.beam
+lib/ejabberd/ebin/ejabberd_http_bind.beam
lib/ejabberd/ebin/ejabberd_http_poll.beam
lib/ejabberd/ebin/ejabberd_listener.beam
lib/ejabberd/ebin/ejabberd_local.beam
lib/ejabberd/ebin/ejabberd_logger_h.beam
+lib/ejabberd/ebin/ejabberd_loglevel.beam
+lib/ejabberd/ebin/ejabberd_node_groups.beam
lib/ejabberd/ebin/ejabberd_odbc.beam
lib/ejabberd/ebin/ejabberd_odbc_sup.beam
+lib/ejabberd/ebin/ejabberd_rdbms.beam
lib/ejabberd/ebin/ejabberd_receiver.beam
lib/ejabberd/ebin/ejabberd_router.beam
lib/ejabberd/ebin/ejabberd_s2s.beam
@@ -41,7 +47,9 @@
lib/ejabberd/ebin/ejabberd_s2s_out.beam
lib/ejabberd/ebin/ejabberd_service.beam
lib/ejabberd/ebin/ejabberd_sm.beam
+lib/ejabberd/ebin/ejabberd_socket.beam
lib/ejabberd/ebin/ejabberd_sup.beam
+lib/ejabberd/ebin/ejabberd_system_monitor.beam
lib/ejabberd/ebin/ejabberd_tmp_sup.beam
lib/ejabberd/ebin/ejabberd_update.beam
lib/ejabberd/ebin/ejabberd_web.beam
@@ -50,19 +58,26 @@
lib/ejabberd/ebin/ejd2odbc.beam
lib/ejabberd/ebin/eldap.beam
lib/ejabberd/ebin/eldap_filter.beam
+lib/ejabberd/ebin/eldap_pool.beam
+lib/ejabberd/ebin/eldap_utils.beam
lib/ejabberd/ebin/extauth.beam
lib/ejabberd/ebin/gen_iq_handler.beam
lib/ejabberd/ebin/gen_mod.beam
+lib/ejabberd/ebin/gen_pubsub_node.beam
+lib/ejabberd/ebin/gen_pubsub_nodetree.beam
lib/ejabberd/ebin/iconv.beam
lib/ejabberd/ebin/idna.beam
lib/ejabberd/ebin/jd2ejd.beam
lib/ejabberd/ebin/jlib.beam
lib/ejabberd/ebin/mod_adhoc.beam
lib/ejabberd/ebin/mod_announce.beam
+lib/ejabberd/ebin/mod_caps.beam
lib/ejabberd/ebin/mod_configure.beam
lib/ejabberd/ebin/mod_configure2.beam
lib/ejabberd/ebin/mod_disco.beam
lib/ejabberd/ebin/mod_echo.beam
+lib/ejabberd/ebin/mod_http_bind.beam
+lib/ejabberd/ebin/mod_http_fileserver.beam
lib/ejabberd/ebin/mod_irc.beam
lib/ejabberd/ebin/mod_irc_connection.beam
lib/ejabberd/ebin/mod_last.beam
@@ -73,7 +88,14 @@
lib/ejabberd/ebin/mod_offline.beam
lib/ejabberd/ebin/mod_offline_odbc.beam
lib/ejabberd/ebin/mod_privacy.beam
+lib/ejabberd/ebin/mod_privacy_odbc.beam
lib/ejabberd/ebin/mod_private.beam
+lib/ejabberd/ebin/mod_private_odbc.beam
+lib/ejabberd/ebin/mod_proxy65.beam
+lib/ejabberd/ebin/mod_proxy65_lib.beam
+lib/ejabberd/ebin/mod_proxy65_service.beam
+lib/ejabberd/ebin/mod_proxy65_sm.beam
+lib/ejabberd/ebin/mod_proxy65_stream.beam
lib/ejabberd/ebin/mod_pubsub.beam
lib/ejabberd/ebin/mod_register.beam
lib/ejabberd/ebin/mod_roster.beam
@@ -86,7 +108,19 @@
lib/ejabberd/ebin/mod_vcard_ldap.beam
lib/ejabberd/ebin/mod_vcard_odbc.beam
lib/ejabberd/ebin/mod_version.beam
+lib/ejabberd/ebin/node_buddy.beam
+lib/ejabberd/ebin/node_club.beam
+lib/ejabberd/ebin/node_default.beam
+lib/ejabberd/ebin/node_dispatch.beam
+lib/ejabberd/ebin/node_pep.beam
+lib/ejabberd/ebin/node_private.beam
+lib/ejabberd/ebin/node_public.beam
+lib/ejabberd/ebin/nodetree_default.beam
+lib/ejabberd/ebin/nodetree_virtual.beam
lib/ejabberd/ebin/odbc_queries.beam
+lib/ejabberd/ebin/p1_fsm.beam
+lib/ejabberd/ebin/p1_mnesia.beam
+lib/ejabberd/ebin/ram_file_io_server.beam
lib/ejabberd/ebin/randoms.beam
lib/ejabberd/ebin/sha.beam
lib/ejabberd/ebin/shaper.beam
@@ -99,20 +133,33 @@
lib/ejabberd/priv/
lib/ejabberd/priv/lib/
lib/ejabberd/priv/msgs/
+lib/ejabberd/priv/msgs/ca.msg
lib/ejabberd/priv/msgs/cs.msg
lib/ejabberd/priv/msgs/de.msg
+lib/ejabberd/priv/msgs/eo.msg
lib/ejabberd/priv/msgs/es.msg
lib/ejabberd/priv/msgs/fr.msg
+lib/ejabberd/priv/msgs/gl.msg
+lib/ejabberd/priv/msgs/it.msg
+lib/ejabberd/priv/msgs/ja.msg
lib/ejabberd/priv/msgs/nl.msg
+lib/ejabberd/priv/msgs/no.msg
lib/ejabberd/priv/msgs/pl.msg
lib/ejabberd/priv/msgs/pt-br.msg
lib/ejabberd/priv/msgs/pt.msg
lib/ejabberd/priv/msgs/ru.msg
lib/ejabberd/priv/msgs/sk.msg
lib/ejabberd/priv/msgs/sv.msg
+lib/ejabberd/priv/msgs/th.msg
+lib/ejabberd/priv/msgs/tr.msg
lib/ejabberd/priv/msgs/uk.msg
-sbin/ejabberd
+lib/ejabberd/priv/msgs/vi.msg
+lib/ejabberd/priv/msgs/wa.msg
+lib/ejabberd/priv/msgs/zh.msg
+sbin/ejabberdctl
share/doc/ejabberd/
+share/doc/ejabberd/README.OpenBSD
[EMAIL PROTECTED] share/doc/ejabberd/api/
share/doc/ejabberd/dev.html
share/doc/ejabberd/disco.png
share/doc/ejabberd/discorus.png
@@ -126,10 +173,12 @@
@sample ${SYSCONFDIR}/ejabberd/
share/examples/ejabberd/ejabberd.cfg
@sample ${SYSCONFDIR}/ejabberd/ejabberd.cfg
-share/examples/ejabberd/ejabberd.inetrc
[EMAIL PROTECTED] ${SYSCONFDIR}/ejabberd/ejabberd.inetrc
+share/examples/ejabberd/ejabberdctl.cfg
[EMAIL PROTECTED] ${SYSCONFDIR}/ejabberd/ejabberdctl.cfg
share/examples/ejabberd/extauth/
share/examples/ejabberd/extauth/check_pass_null.pl
+share/examples/ejabberd/inetrc
[EMAIL PROTECTED] ${SYSCONFDIR}/ejabberd/inetrc
share/examples/ejabberd/mtr/
share/examples/ejabberd/mtr/ejabberd
share/examples/ejabberd/mtr/ejabberd-netbsd.sh
