aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-11 13:55:14 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-11 13:55:14 +0100
commitad7d1c86e904fc90002ba706632f31c3d8b56873 (patch)
treed722883ee5166f176f02c54365f769279a64a226 /prosody.cfg.lua.dist
parent8c189d268e700e18db59afed37af79e61e0f8b20 (diff)
parentd78375a2a11f8cb278ead0230cef31c8a44fb1f3 (diff)
downloadprosody-ad7d1c86e904fc90002ba706632f31c3d8b56873.tar.gz
prosody-ad7d1c86e904fc90002ba706632f31c3d8b56873.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
-rw-r--r--prosody.cfg.lua.dist11
1 files changed, 6 insertions, 5 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 3c199f3e..23032932 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -99,20 +99,21 @@ c2s_require_encryption = false
-- Force certificate authentication for server-to-server connections?
-- This provides ideal security, but requires servers you communicate
-- with to support encryption AND present valid, trusted certificates.
+-- NOTE: Your version of LuaSec must support certificate verification!
-- For more information see http://prosody.im/doc/s2s#security
-s2s_secure = true
+s2s_secure_auth = false
-- Many servers don't support encryption or have invalid or self-signed
-- certificates. You can list domains here that will not be required to
-- authenticate using certificates. They will be authenticated using DNS.
--- s2s_insecure_domains = { "gmail.com" }
+--s2s_insecure_domains = { "gmail.com" }
--- Even if you leave s2s_secure disabled, you can still require it for
--- some domains by specifying a list here.
+-- Even if you leave s2s_secure_auth disabled, you can still require valid
+-- certificates for some domains by specifying a list here.
--- s2s_secure_domains = { "jabber.org" }
+--s2s_secure_domains = { "jabber.org" }
-- Select the authentication backend to use. The 'internal' providers
-- use Prosody's configured data storage to store the authentication data.