aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2003-11-13 19:09:33 +0000
committerAlexey Shchepin <alexey@process-one.net>2003-11-13 19:09:33 +0000
commit05f988572f31c38f456816f16a8a95de3dbaab8c (patch)
tree79a58427bb52b9a235e4f57df1afe5bac61ee656
parent* doc/dev.tex: Developers documentation (not completed) (diff)
* examples/mtr/ejabberd: Updated (thanks to Marshall T. Rose)
* src/Makefile.in: Added installation of msgs/ directory SVN Revision: 175
Diffstat (limited to '')
-rw-r--r--ChangeLog6
-rw-r--r--TODO1
-rw-r--r--examples/mtr/ejabberd4
-rw-r--r--src/Makefile.in5
4 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ee05be8bb..b2fcca687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-13 Alexey Shchepin <alexey@sevcom.net>
+
+ * examples/mtr/ejabberd: Updated (thanks to Marshall T. Rose)
+
+ * src/Makefile.in: Added installation of msgs/ directory
+
2003-11-11 Alexey Shchepin <alexey@sevcom.net>
* doc/dev.tex: Developers documentation (not completed)
diff --git a/TODO b/TODO
index 5866e57d5..a66b50af2 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,5 @@ more correctly work with SRV DNS records (priority, weight, etc...)
TLS
make roster set to work in one transaction
add traffic shapers to c2s connection before authentification
-add traffic shapers to s2s connections
more traffic shapers
SNMP
diff --git a/examples/mtr/ejabberd b/examples/mtr/ejabberd
index bb5ea7afe..4328b0697 100644
--- a/examples/mtr/ejabberd
+++ b/examples/mtr/ejabberd
@@ -55,7 +55,9 @@ start)
if [ -x $D/src ]; then
echo "Starting ${name}."
cd $D/src
- su jabber -c "/usr/pkg/bin/erl -sname ejabberd -s ejabberd -heart -detached &" \
+ ERL_MAX_PORTS=32000 export ERL_MAX_PORTS
+ ulimit -n $ERL_MAX_PORTS
+ su jabber -c "/usr/pkg/bin/erl -sname ejabberd -s ejabberd -heart -detached -sasl sasl_error_logger '{file, \"ejabberd-sasl.log\"}' &" \
1>/dev/null 2>&1
fi
;;
diff --git a/src/Makefile.in b/src/Makefile.in
index 549c76ddf..6378dda1f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -21,7 +21,8 @@ DESTDIR =
EJABBERDDIR = $(DESTDIR)/var/lib/ejabberd
BEAMDIR = $(EJABBERDDIR)/beam
PRIVDIR = $(EJABBERDDIR)/priv
-SODIR = $(PRIVDIR)/lib
+SODIR = $(PRIVDIR)
+MSGSDIR = $(PRIVDIR)/msgs
all: all-recursive $(ERLSHLIBS) compile-beam
@@ -52,6 +53,8 @@ install: all
cp *.beam $(BEAMDIR)
mkdir -p $(SODIR)
cp *.so $(SODIR)
+ mkdir -p $(MSGSDIR)
+ cp msgs/*.msg $(MSGSDIR)
clean: clean-recursive
rm -f *.beam $(ERLSHLIBS)