aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/guide.tex2
-rw-r--r--src/ejabberd_admin.erl11
-rw-r--r--src/ejabberd_auth_riak.erl2
-rw-r--r--src/ejabberd_config.erl8
-rw-r--r--src/ejabberd_logger.erl2
-rw-r--r--src/ejabberd_riak_sup.erl2
-rw-r--r--src/ejabberd_stun.erl17
-rw-r--r--src/mod_client_state.erl2
-rw-r--r--src/mod_fail2ban.erl17
-rw-r--r--src/mod_sip.erl17
-rw-r--r--src/mod_sip_proxy.erl17
-rw-r--r--src/mod_sip_registrar.erl17
12 files changed, 108 insertions, 6 deletions
diff --git a/doc/guide.tex b/doc/guide.tex
index 5e0ec7694..b21e3a03d 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -6408,7 +6408,7 @@ Thanks to all people who contributed to this guide:
\makechapter{copyright}{Copyright Information}
Ejabberd Installation and Operation Guide.\\
-Copyright \copyright{} 2003 --- 2014 ProcessOne
+Copyright \copyright{} 2003 --- 2015 ProcessOne
This document is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 9d081631f..8b6e27b82 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -31,6 +31,7 @@
status/0, reopen_log/0,
stop_kindly/2, send_service_message_all_mucs/2,
registered_vhosts/0,
+ reload_config/0,
%% Erlang
update_list/0, update/1,
%% Accounts
@@ -134,6 +135,11 @@ commands() ->
module = ?MODULE, function = registered_vhosts,
args = [],
result = {vhosts, {list, {vhost, string}}}},
+ #ejabberd_commands{name = reload_config, tags = [server],
+ desc = "Reload ejabberd configuration file into memory",
+ module = ?MODULE, function = reload_config,
+ args = [],
+ result = {res, rescode}},
#ejabberd_commands{name = import_file, tags = [mnesia],
desc = "Import user data from jabberd14 spool file",
@@ -352,6 +358,11 @@ registered_users(Host) ->
registered_vhosts() ->
?MYHOSTS.
+reload_config() ->
+ ejabberd_config:reload_file(),
+ acl:start(),
+ shaper:start().
+
%%%
%%% Migration management
%%%
diff --git a/src/ejabberd_auth_riak.erl b/src/ejabberd_auth_riak.erl
index e5d901cfc..081ee6bb8 100644
--- a/src/ejabberd_auth_riak.erl
+++ b/src/ejabberd_auth_riak.erl
@@ -5,7 +5,7 @@
%%% Created : 12 Nov 2012 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2012 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2015 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 666ed035b..0d25224b9 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -26,7 +26,7 @@
-module(ejabberd_config).
-author('alexey@process-one.net').
--export([start/0, load_file/1, read_file/1,
+-export([start/0, load_file/1, reload_file/0, read_file/1,
add_global_option/2, add_local_option/2,
get_global_option/2, get_local_option/2,
get_global_option/3, get_local_option/3,
@@ -125,6 +125,12 @@ load_file(File) ->
State = read_file(File),
set_opts(State).
+-spec reload_file() -> ok.
+
+reload_file() ->
+ Config = get_ejabberd_config_path(),
+ load_file(Config).
+
-spec convert_to_yaml(file:filename()) -> ok | {error, any()}.
convert_to_yaml(File) ->
diff --git a/src/ejabberd_logger.erl b/src/ejabberd_logger.erl
index 65899c8f6..0612bb379 100644
--- a/src/ejabberd_logger.erl
+++ b/src/ejabberd_logger.erl
@@ -6,7 +6,7 @@
%%% @end
%%% Created : 12 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
%%%
-%%% ejabberd, Copyright (C) 2013 ProcessOne
+%%% ejabberd, Copyright (C) 2013-2015 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/ejabberd_riak_sup.erl b/src/ejabberd_riak_sup.erl
index 513ad785f..9711e6652 100644
--- a/src/ejabberd_riak_sup.erl
+++ b/src/ejabberd_riak_sup.erl
@@ -5,7 +5,7 @@
%%% Created : 29 Dec 2011 by Alexey Shchepin <alexey@process-one.net>
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2011 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2015 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl
index 89cbebf84..11347d604 100644
--- a/src/ejabberd_stun.erl
+++ b/src/ejabberd_stun.erl
@@ -5,6 +5,23 @@
%%%
%%% @end
%%% Created : 8 May 2014 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%
+%%% ejabberd, Copyright (C) 2013-2015 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.
+
%%%-------------------------------------------------------------------
-module(ejabberd_stun).
diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl
index 69e76c24e..fd72c02f6 100644
--- a/src/mod_client_state.erl
+++ b/src/mod_client_state.erl
@@ -5,7 +5,7 @@
%%% Created : 11 Sep 2014 by Holger Weiss
%%%
%%%
-%%% ejabberd, Copyright (C) 2014 ProcessOne
+%%% ejabberd, Copyright (C) 2014-2015 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl
index b246e402c..7c9eba88a 100644
--- a/src/mod_fail2ban.erl
+++ b/src/mod_fail2ban.erl
@@ -5,6 +5,23 @@
%%%
%%% @end
%%% Created : 15 Aug 2014 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%
+%%% ejabberd, Copyright (C) 2014-2015 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.
+
%%%-------------------------------------------------------------------
-module(mod_fail2ban).
diff --git a/src/mod_sip.erl b/src/mod_sip.erl
index bf57de75c..f7f2b8ed0 100644
--- a/src/mod_sip.erl
+++ b/src/mod_sip.erl
@@ -5,6 +5,23 @@
%%%
%%% @end
%%% Created : 21 Apr 2014 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%
+%%% ejabberd, Copyright (C) 2014-2015 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.
+
%%%-------------------------------------------------------------------
-module(mod_sip).
diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl
index b2f76dbb3..6168d997c 100644
--- a/src/mod_sip_proxy.erl
+++ b/src/mod_sip_proxy.erl
@@ -5,6 +5,23 @@
%%%
%%% @end
%%% Created : 21 Apr 2014 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%
+%%% ejabberd, Copyright (C) 2014-2015 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.
+
%%%-------------------------------------------------------------------
-module(mod_sip_proxy).
diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl
index 298c7108b..a534c61ce 100644
--- a/src/mod_sip_registrar.erl
+++ b/src/mod_sip_registrar.erl
@@ -5,6 +5,23 @@
%%%
%%% @end
%%% Created : 23 Apr 2014 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%
+%%% ejabberd, Copyright (C) 2014-2015 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.
+
%%%-------------------------------------------------------------------
-module(mod_sip_registrar).
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-11 12:03:41 +0000