diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-11-15 10:01:30 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-11-15 10:01:30 +0300 |
| commit | b04c6b7d7513025006847a4da1bdca34dc35f87f (patch) | |
| tree | 35a43055ac10a4ddb2757d846deb18d022699b8a /src/ejabberd_pkix.erl | |
| parent | mod_stream_mgmt: Improve logging on timeout (diff) | |
| parent | Explain what is needed for the acme configuration and other small changes (diff) | |
Merge branch 'lets_encrypt_acme_support' of git://github.com/angelhof/ejabberd into angelhof-lets_encrypt_acme_support
Conflicts:
rebar.config
src/ejabberd_pkix.erl
Diffstat (limited to 'src/ejabberd_pkix.erl')
| -rw-r--r-- | src/ejabberd_pkix.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/ejabberd_pkix.erl b/src/ejabberd_pkix.erl index 7efe7b42..68b8226c 100644 --- a/src/ejabberd_pkix.erl +++ b/src/ejabberd_pkix.erl @@ -301,7 +301,14 @@ add_certfiles(Host, State) -> NewAccState end end, State, certfiles_from_config_options()), - if State /= State1 -> + State2 = case ejabberd_acme:certificate_exists(Host) of + {true, Path} -> + {_, State3} = add_certfile(Path, State1), + State3; + false -> + State1 + end, + if State /= State2 -> case build_chain_and_check(State1) of ok -> {ok, State1}; {error, _} = Err -> Err |