Accept configuration file with .yaml extension (#290)

diff --git a/ejabberdctl.cfg.example b/ejabberdctl.cfg.example
index b582527ebb021c911568ac3e4a898c7c5b6373a5..7bccb41837ae854629177aa7e4f06e202a6ec2f3 100644 (file)
--- a/ejabberdctl.cfg.example
+++ b/ejabberdctl.cfg.example
@@ -152,7 +152,7 @@
 #' EJABBERD_CONFIG_PATH: ejabberd configuration file
 #
 # 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.
 #
 # Default: $ETC_DIR/ejabberd.yml

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 54a63590580e90548538a7ca10eb07adb4c3f847..6fc6c9e34b1416cadcb37e61a6724121a9e25e01 100644 (file)
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -185,7 +185,7 @@ get_plain_terms_file(File1, Opts) ->
 
 consult(File) ->
     case filename:extension(File) of
-        ".yml" ->
+        Ex when (Ex == ".yml") or (Ex == ".yaml") ->
             case p1_yaml:decode_from_file(File, [plain_as_atom]) of
                 {ok, []} ->
                     {ok, []};