diff options
| author | Kim Alvefur <zash@zash.se> | 2015-08-20 13:05:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-08-20 13:05:22 +0200 |
| commit | 80c7d5155e9c468d86f3b268e90303decd7d1827 (patch) | |
| tree | 103fd7d9396b60b9f76071a009c54d3ca9d35744 /core/certmanager.lua | |
| parent | f1313996a2db339fe76f269353cc911c68316f30 (diff) | |
| parent | c5e4af96d8bd9de7a96d3dc1eff5b8d1eecbfdaf (diff) | |
| download | prosody-80c7d5155e9c468d86f3b268e90303decd7d1827.tar.gz prosody-80c7d5155e9c468d86f3b268e90303decd7d1827.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
| -rw-r--r-- | core/certmanager.lua | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index b40c13c1..958ad3a3 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -45,7 +45,7 @@ local luasec_has = { single_ecdh_use = luasec_version >= 2; }; -module "certmanager" +local _ENV = nil; -- Global SSL options if not overridden per-host local global_ssl_config = configmanager.get("*", "ssl"); @@ -78,7 +78,7 @@ if luasec_version < 5 and ssl_x509 then end end -function create_context(host, mode, ...) +local function create_context(host, mode, ...) local cfg = new_config(); cfg:apply(core_defaults); cfg:apply(global_ssl_config); @@ -154,7 +154,7 @@ function create_context(host, mode, ...) return ctx, err, user_ssl_config; end -function reload_ssl_config() +local function reload_ssl_config() global_ssl_config = configmanager.get("*", "ssl"); if luasec_has.no_compression then core_defaults.options.no_compression = configmanager.get("*", "ssl_compression") ~= true; @@ -163,4 +163,7 @@ end prosody.events.add_handler("config-reloaded", reload_ssl_config); -return _M; +return { + create_context = create_context; + reload_ssl_config = reload_ssl_config; +}; |