Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Code Releases Activity
2,983 Commits 7 Branches 109 Tags 65 MiB
75d3152a0f
Commit Graph

60 Commits

Author SHA1 Message Date
Christophe Romain
adf56dedf3 fix merge conflicts from 2.1.9 2011-09-30 14:28:40 +02:00
Badlop
cb9aecf35e ejabberdctl doesn't support parameters with blankspaces (EJAB-1458) 
Revert "Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)"

This reverts commit 6dea2d2307.
 2011-09-22 16:18:04 +02:00
Badlop
dd772404c5 Merge branch '2.1.x' into 2.2.x 
Conflicts:
	src/configure
	src/ejabberd.app
	src/ejabberd_auth_anonymous.erl
	src/ejabberd_c2s.erl
	src/ejabberd_sm.erl
 2011-08-24 18:29:25 +02:00
Badlop
32d3d1626b New ERL_EPMD_ADDRESS that works since Erlang/OTP R14B03 2011-05-31 12:26:44 +02:00
Christophe Romain
33d4126290 merge with latest 2.1.x (pre 2.1.7) 2011-04-11 15:47:04 +02:00
Badlop
b116957982 Fix bashism and make some lines similar to master branch (EJAB-1404) 2011-03-09 16:25:05 +01:00
Badlop
339fa6e41b ejabberdctl needs space between INET_DIST_INTERFACE (thanks to Dale Chase)(EJAB-1416) 2011-02-28 18:40:45 +01:00
Badlop
fe40a9c5f6 New DIST_USE_INTERFACE to restrict IP where erlang connections are listened (EJAB-1404) 2011-02-16 23:53:29 +01:00
Christophe Romain
f39ccd73c5 Merge remote branch 'mainline/2.1.x' into 2.2.x 2011-02-14 13:54:06 +01:00
Badlop
6dea2d2307 Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399) 2011-02-09 16:38:54 +01:00
Christophe Romain
92f5509b35 improve check_start only matching node process 2011-01-18 13:36:46 +01:00
Evgeniy Khramtsov
02cfb11a6d Merge branch '2.1.x' into mergefix 
Conflicts:
	.gitignore
	src/ejabberd.app
	src/ejabberd_c2s.erl
	src/ejabberd_captcha.erl
	src/ejabberd_node_groups.erl
	src/mod_caps.erl
	src/web/ejabberd_http.erl
	src/web/ejabberd_http_bind.erl
 2010-12-14 23:10:08 +09:00
Peter Lemenkov
c53e8012b2 Change directory before any operation to one readable by INSTALLUSER (EJAB-1322) 
This is required in order to suppress error messages like
"File operation error: eacces" when ejabberd was started from directory,
which is not readable by INSTALLUSER (/root, for example). See rhbz #564686:

https://bugzilla.redhat.com/564686

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 2010-10-19 01:05:31 +02:00
Christophe Romain
3aaebe98f4 add ejabberdctl ability to check epmd names (TECH-1121) 2010-07-20 14:06:48 +02:00
Christophe Romain
bf63d09d80 Add etop command to ejabberdctl (TECH-1109) 2010-07-16 16:52:27 +02:00
Christophe Romain
628571f8cf merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash 2010-07-13 12:04:30 +02:00
Badlop
42ddc297fe Fix my flock change from last friday 2010-07-12 18:53:16 +02:00
Badlop
d106f741d9 Some systems delete the lock dir; in such case don't use flock at all 2010-07-09 22:39:13 +02:00
Badlop
1531541331 Fix problem when FIREWALL_WINDOW options for erl kernel were used 
http://www.ejabberd.im/node/4120
 2010-06-28 13:17:55 +02:00
Peter Lemenkov
95e085beb7 More compliance with LSB 
The init-script shall return 4 in case then user doesn't have sufficient privileges for action.
See http://refspecs.freestandards.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 2010-03-08 21:16:18 +01:00
Badlop
a71b47ea27 Improve TTY code to work on more operating systems (thanks to Jan Koum) 2010-02-12 22:11:15 +01:00
Badlop
2cca00acc0 Added support for Jot in ctl and TTY in debug (thanks to Jan Koum) 2010-02-12 20:50:56 +01:00
Badlop
7c36e304f0 Minor fixes in the new ejabberdctl flock code 2010-02-12 20:25:31 +01:00
Martin Langhoff
10c16b1cdf ejabberdctl: support concurrent connections with bound conn names 
If flock is available, ejabberdctl will use it to grab one
of a bound number of connection names. This allows concurrent
connections while using a bound number of atoms.

Using PID, timestamps or random strings for transient connection IDs
(which would avoid the need for flock) uses an unbound number of atoms.
This can effectively DoS servers, as these connection names are
not garbage collected.
 2010-02-12 20:23:33 +01:00
Badlop
b17c7848fd Fix bashism in 'ejabberdctl started' 2010-02-11 11:02:57 +01:00
Badlop
d804698541 Fix typo in EJABBERD_BIN_PATH (thanks to Martin Langhoff)(EJAB-891) 
SVN Revision: 2925
 2010-01-25 18:37:58 +00:00
Badlop
4d85297c85 Check for Effective GID EGID in ejabberdctl (thanks to Rustam Aliyev)(EJAB-1160) 
SVN Revision: 2893
 2010-01-12 17:50:21 +00:00
Badlop
761ed1b192 Fix so script runs correctly when invoked by root (EJAB-1152) 
SVN Revision: 2862
 2010-01-05 19:43:03 +00:00
Badlop
b9e57a341d Added to ejabberdctl an experimental variable EJABBERD_BYPASS_WARNINGS 
SVN Revision: 2804
 2009-12-11 19:42:59 +00:00
Badlop
19dead97a3 Rename erlang log file sasl.log to erlang.log (EJAB-783) 
SVN Revision: 2567
 2009-08-31 08:41:56 +00:00
Badlop
1b81a2e3d6 Write PID file, path is configurable in ejabberdctl.cfg (EJAB-1023) 
SVN Revision: 2526
 2009-08-24 21:21:04 +00:00
Badlop
11be369987 Added preliminary template file for ejabberd.init (thanks to Christophe Romain) 
SVN Revision: 2520
 2009-08-24 19:43:52 +00:00
Badlop
5475f35f9f Temporary debug and ctl nodes must get nodename similar to destination. 
SVN Revision: 2355
 2009-07-06 14:09:03 +00:00
Badlop
a7eb5a77eb Add -hidden flag when calling Debug or Ctl 
SVN Revision: 2354
 2009-07-06 14:08:57 +00:00
Badlop
dfc97beaef Allow to define additional Erlang options in ejabberdctl.cfg (thanks to Sergei Golovan) 
SVN Revision: 2079
 2009-05-15 22:10:53 +00:00
Badlop
4c1eefb791 The --node argument overwrites the value of ejabberdctl.cfg 
SVN Revision: 2078
 2009-05-15 22:08:00 +00:00
Christophe Romain
1ac385f499 Allow more environment variable overrides in ejabberdctl (EJAB-891) 
SVN Revision: 1995
 2009-03-19 21:28:34 +00:00
Badlop
3e2048ace9 * src/Makefile.in: The path to the installed copy of ejabberd 
Guide is set in the environment variable
EJABBERD_DOC_PATH (EJAB-837).
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberdctl.template: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1835
 2009-01-20 19:42:08 +00:00
Badlop
78b90e9300 * src/ejabberdctl.template: Fix detection of ejabberdctl.cfg path 
SVN Revision: 1687
 2008-11-26 18:02:41 +00:00
Mickaël Rémond
cc858469ec * src/ejabberdctl.template: Added the ability to define the --config-dir option. 
SVN Revision: 1681
 2008-11-23 16:41:50 +00:00
Badlop
416a939352 * src/ejabberdctl.template: Move help print to a separate 
function (EJAB-694)

SVN Revision: 1637
 2008-10-12 12:00:20 +00:00
Badlop
ece37b1dad * src/ejabberdctl.template: Update environment variable names 
SVN Revision: 1449
 2008-07-16 10:55:50 +00:00
Badlop
0b3f830188 * src/ejabberdctl.template: Small fix so arguments of the command 
are also passed to erl

SVN Revision: 1447
 2008-07-15 21:43:22 +00:00
Badlop
f25316c1e7 * src/configure.ac: Update installation permissions (EJAB-402) 
* src/configure: Likewise

* src/Makefile.in: The mnesia, ebin and priv dirs are now
installed in different locations. Install header files and
documentation (EJAB-696)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

* include/*.hrl: Place for all ejabberd header files (EJAB-696)
* src/*/*.erl: Update references to header files
* src/*/Makefile.in: Include the include/ dir

SVN Revision: 1441
 2008-07-13 19:10:01 +00:00
Badlop
871d1dfad6 * src/configure.ac: Allow to execute ejabberd with a normal 
system user (thanks to Viq)(EJAB-402)
* src/configure: Likewise
* src/ejabberdctl.template: Likewise
* src/Makefile.in: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1439
 2008-07-12 22:02:16 +00:00
Badlop
983022438e * src/configure.ac: Improve legibility 
* src/aclocal.m4: Likewise
* src/configure: Likewise

* src/ejabberdctl.template: Remove garbage variable. Document node
option

* doc/guide.tex: Add references to sections.
* doc/guide.html: Likewise

SVN Revision: 1438
 2008-07-12 21:32:45 +00:00
Christophe Romain
ef6ce3c7c0 typo fix on ejabberdctl.template 
SVN Revision: 1266
 2008-04-01 11:47:51 +00:00
Christophe Romain
273c076ef6 Add firewalling port range definition 
SVN Revision: 1264
 2008-04-01 09:07:29 +00:00
Christophe Romain
618af5e07a Seek epam binary into priv/bin (EJAB-573) 
SVN Revision: 1243
 2008-03-21 15:42:14 +00:00
Badlop
25e6bddf29 * src/ejabberdctl.template: Instead of using the Erlang kernel 
variable 'inetrc', use the ERL_INETRC environment variable that is
available since Erlang/OTP R10B-5.

SVN Revision: 1149
 2008-01-13 22:46:00 +00:00