Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/ejabberd.cfg.example: Fix English typos. Fix line length: 

max 80 characters per line. Remove trailing blankspaces. Added
markers for Vim fold, you may want to add to $HOME/.vimrc this
line: set modeline
* src/ejabberdctl.cfg.example: Likewise

SVN Revision: 2035
This commit is contained in:
Badlop 2009-04-22 13:45:57 +00:00
parent b59ecb83e8
commit 6acf7fb5ec
3 changed files with 91 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2009-04-22 Badlop <badlop@process-one.net> 2009-04-22 Badlop <badlop@process-one.net>
* src/ejabberd.cfg.example: Fix English typos. Fix line length:
max 80 characters per line. Remove trailing blankspaces. Added
markers for Vim fold, you may want to add to $HOME/.vimrc this
line: set modeline
* src/ejabberdctl.cfg.example: Likewise
* src/mod_muc/mod_muc.erl: Limit number of characters in Room ID, * src/mod_muc/mod_muc.erl: Limit number of characters in Room ID,
Name and Description (EJAB-899) Name and Description (EJAB-899)
* src/mod_muc/mod_muc_room.erl: Likewise * src/mod_muc/mod_muc_room.erl: Likewise

81
src/ejabberd.cfg.example
View File

@ -1,6 +1,7 @@
%%% %%%
%%% ejabberd configuration file %%% ejabberd configuration file
%%% %%%
%%%'
%%% The parameters used in this configuration file are explained in more detail %%% The parameters used in this configuration file are explained in more detail
%%% in the ejabberd Installation and Operation Guide. %%% in the ejabberd Installation and Operation Guide.
@ -34,8 +35,8 @@
%%% %%%
%%% ======================= %%%. =======================
%%% OVERRIDE STORED OPTIONS %%%' OVERRIDE STORED OPTIONS
%% %%
%% Override the old values stored in the database. %% Override the old values stored in the database.
@ -57,8 +58,8 @@
%%override_acls. %%override_acls.
%%% ========= %%%. =========
%%% DEBUGGING %%%' DEBUGGING
%% %%
%% loglevel: Verbosity of log files generated by ejabberd. %% loglevel: Verbosity of log files generated by ejabberd.
@ -79,8 +80,8 @@
%%{watchdog_admins, ["bob@example.com"]}. %%{watchdog_admins, ["bob@example.com"]}.
%%% ================ %%%. ================
%%% SERVED HOSTNAMES %%%' SERVED HOSTNAMES
%% %%
%% hosts: Domains served by ejabberd. %% hosts: Domains served by ejabberd.
@ -97,8 +98,8 @@
%%{route_subdomains, s2s}. %%{route_subdomains, s2s}.
%%% =============== %%%. ===============
%%% LISTENING PORTS %%%' LISTENING PORTS
%% %%
%% listen: Which ports will ejabberd listen, which service handles it %% listen: Which ports will ejabberd listen, which service handles it
@ -195,8 +196,9 @@
%% %%
%%{outgoing_s2s_options, [ipv4, ipv6], 10000}. %%{outgoing_s2s_options, [ipv4, ipv6], 10000}.
%%% ==============
%%% AUTHENTICATION %%%. ==============
%%%' AUTHENTICATION
%% %%
%% auth_method: Method used to authenticate the users. %% auth_method: Method used to authenticate the users.
@ -260,8 +262,8 @@
%%{host_config, "public.example.org", [{auth_method, [internal, anonymous]}]}. %%{host_config, "public.example.org", [{auth_method, [internal, anonymous]}]}.
%%% ============== %%%. ==============
%%% DATABASE SETUP %%%' DATABASE SETUP
%% ejabberd uses by default the internal Mnesia database, %% ejabberd uses by default the internal Mnesia database,
%% so you can avoid this section. %% so you can avoid this section.
@ -307,8 +309,8 @@
%%{odbc_keepalive_interval, undefined}. %%{odbc_keepalive_interval, undefined}.
%%% =============== %%%. ===============
%%% TRAFFIC SHAPERS %%%' TRAFFIC SHAPERS
%% %%
%% The "normal" shaper limits traffic speed to 1.000 B/s %% The "normal" shaper limits traffic speed to 1.000 B/s
@ -321,8 +323,8 @@
{shaper, fast, {maxrate, 50000}}. {shaper, fast, {maxrate, 50000}}.
%%% ==================== %%%. ====================
%%% ACCESS CONTROL LISTS %%%' ACCESS CONTROL LISTS
%% %%
%% The 'admin' ACL grants administrative privileges to Jabber accounts. %% The 'admin' ACL grants administrative privileges to Jabber accounts.
@ -360,8 +362,8 @@
%%}. %%}.
%%% ============ %%%. ============
%%% ACCESS RULES %%%' ACCESS RULES
%% Maximum number of simultaneous sessions allowed for a single user: %% Maximum number of simultaneous sessions allowed for a single user:
{access, max_user_sessions, [{10, all}]}. {access, max_user_sessions, [{10, all}]}.
@ -399,7 +401,7 @@
%% To disable in-band registration, replace 'allow' with 'deny'. %% To disable in-band registration, replace 'allow' with 'deny'.
{access, register, [{allow, all}]}. {access, register, [{allow, all}]}.
%% By default frequency of account registrations from a the same IP %% By default frequency of account registrations from the same IP
%% is limited to 1 account every 10 minutes. To disable put: infinity %% is limited to 1 account every 10 minutes. To disable put: infinity
%%{registration_timeout, 600}. %%{registration_timeout, 600}.
@ -414,22 +416,8 @@
%%}. %%}.
%%% ======= %%%. ================
%%% CAPTCHA %%%' DEFAULT LANGUAGE
%%
%% Full path to a script that generates the image.
%%
%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}.
%%
%% Host part of the URL sent to the user.
%%
%%{captcha_host, "example.org:5280"}.
%%% ================
%%% DEFAULT LANGUAGE
%% %%
%% language: Default language used for server messages. %% language: Default language used for server messages.
@ -444,8 +432,22 @@
%%}. %%}.
%%% ======= %%%. =======
%%% MODULES %%%' CAPTCHA
%%
%% Full path to a script that generates the image.
%%
%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}.
%%
%% Host part of the URL sent to the user.
%%
%%{captcha_host, "example.org:5280"}.
%%%. =======
%%%' MODULES
%% %%
%% Modules enabled in all ejabberd virtual hosts. %% Modules enabled in all ejabberd virtual hosts.
@ -513,9 +515,12 @@
%% ]}. %% ]}.
%%%.
%%%'
%%% $Id$ %%% $Id$
%%% Local Variables: %%% Local Variables:
%%% mode: erlang %%% mode: erlang
%%% End: %%% End:
%%% vim: set filetype=erlang tabstop=8: %%% vim: set filetype=erlang tabstop=8 foldmarker=%%%',%%%. foldmethod=marker:

29
src/ejabberdctl.cfg.example
View File

@ -3,16 +3,17 @@
# to the erlang runtime system when starting ejabberd # to the erlang runtime system when starting ejabberd
# #
# POLL: Kernel polling ([true|false]) #' POLL: Kernel polling ([true|false])
# #
# The kernel polling option requires support in the kernel. # The kernel polling option requires support in the kernel.
# Additionaly, you need to enable this feature while compiling Erlang. # Additionally, you need to enable this feature while compiling Erlang.
# #
# Default: true # Default: true
# #
#POLL=true #POLL=true
# SMP: SMP support ([enable|auto|disable]) #.
#' SMP: SMP support ([enable|auto|disable])
# #
# Explanation in Erlang/OTP documentation: # Explanation in Erlang/OTP documentation:
# enable: starts the Erlang runtime system with SMP support enabled. # enable: starts the Erlang runtime system with SMP support enabled.
@ -25,7 +26,8 @@
# #
#SMP=auto #SMP=auto
# ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports #.
#' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports
# #
# ejabberd consumes two or three ports for every connection, either # ejabberd consumes two or three ports for every connection, either
# from a client or from another Jabber server. So take this into # from a client or from another Jabber server. So take this into
@ -36,21 +38,23 @@
# #
#ERL_MAX_PORTS=32000 #ERL_MAX_PORTS=32000
# FIREWALL_WINDOW: Range of allowed ports to pass through a firewall #.
#' 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, # 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) # it's possible to make Erlang use a defined range of port (instead of dynamic
# for node communication. # ports) for node communication.
# #
# Default: not defined # Default: not defined
# Example: 4200-4210 # Example: 4200-4210
# #
#FIREWALL_WINDOW= #FIREWALL_WINDOW=
# PROCESSES: Maximum number of Erlang processes #.
#' PROCESSES: Maximum number of Erlang processes
# #
# Erlang consumes a lot of lightweight processes. If there is a lot of activity # Erlang consumes a lot of lightweight processes. If there is a lot of activity
# on ejabberd so that the maximum number of proccesses is reached, people will # on ejabberd so that the maximum number of processes is reached, people will
# experiment greater latency times. As these processes are implemented in # experiment greater latency times. As these processes are implemented in
# Erlang, and therefore not related to the operating system processes, you do # Erlang, and therefore not related to the operating system processes, you do
# not have to worry about allowing a huge number of them. # not have to worry about allowing a huge number of them.
@ -60,7 +64,8 @@
# #
#PROCESSES=250000 #PROCESSES=250000
# ERL_MAX_ETS_TABLES: Maximum number of ETS and Mnesia tables #.
#' 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 # The number of concurrent ETS and Mnesia tables is limited. When the limit is
# reached, errors will appear in the logs: # reached, errors will appear in the logs:
@ -72,6 +77,8 @@
# #
#ERL_MAX_ETS_TABLES=1400 #ERL_MAX_ETS_TABLES=1400
#.
#' ERLANG_NODE
# The next variable allows to explicitly specify erlang node for ejabberd # The next variable allows to explicitly specify erlang node for ejabberd
# It can be given in different formats: # It can be given in different formats:
# ERLANG_NODE=ejabberd # ERLANG_NODE=ejabberd
@ -86,3 +93,5 @@
# Default: ejabberd # Default: ejabberd
# #
#ERLANG_NODE=ejabberd #ERLANG_NODE=ejabberd
# vim: foldmarker=#',#. foldmethod=marker: