diff options
| author | Badlop <badlop@process-one.net> | 2015-03-04 17:18:57 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2015-03-04 17:18:57 +0100 |
| commit | e575f401cdf91b084a52b882d9a1710965c756d4 (patch) | |
| tree | 0aba707573b861c38e4cc61069c4d4aaa53ddff6 /src | |
| parent | Merge branch 'master' of github.com:processone/ejabberd (diff) | |
Accept configuration file with .yaml extension (#290)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_config.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 54a635905..6fc6c9e34 100644 --- 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, []}; |