Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Accept configuration file with .yaml extension (#290)

Browse Source
This commit is contained in:
Badlop 2015-03-04 17:18:57 +01:00
parent 8a99287374
commit e575f401cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ejabberdctl.cfg.example
View File

@ -152,7 +152,7 @@
#' EJABBERD_CONFIG_PATH: ejabberd configuration file #' EJABBERD_CONFIG_PATH: ejabberd configuration file
# #
# Specify the full path to the ejabberd configuration file. If the file name has # Specify the full path to the ejabberd configuration file. If the file name has
# a ".yml" extension, it is parsed as a YAML file; otherwise, Erlang syntax is # yml or yaml extension, it is parsed as a YAML file; otherwise, Erlang syntax is
# expected. # expected.
# #
# Default: $ETC_DIR/ejabberd.yml # Default: $ETC_DIR/ejabberd.yml

2
src/ejabberd_config.erl
View File

@ -185,7 +185,7 @@ get_plain_terms_file(File1, Opts) ->
consult(File) -> consult(File) ->
case filename:extension(File) of case filename:extension(File) of
".yml" -> Ex when (Ex == ".yml") or (Ex == ".yaml") ->
case p1_yaml:decode_from_file(File, [plain_as_atom]) of case p1_yaml:decode_from_file(File, [plain_as_atom]) of
{ok, []} -> {ok, []} ->
{ok, []}; {ok, []};