prosody
3f9f67f1a106
prosody.cfg.lua.dist

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosody.cfg.lua.dist @ 524:3f9f67f1a106

Merge from waqas
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Dec 2008 15:09:58 +0000
parent 522:fc3df507afa2
parent 518:127eb78cbf4a
child 525:32122251d2fe
comparison
equal deleted inserted replaced
523:c0f15538f358 524:3f9f67f1a106
47 "dialback"; -- s2s dialback support 47 "dialback"; -- s2s dialback support
48 "disco"; -- Service discovery 48 "disco"; -- Service discovery
49 "ping"; -- XMPP Ping 49 "ping"; -- XMPP Ping
50 "time"; -- Let others know the time here 50 "time"; -- Let others know the time here
51 "uptime"; -- Uptime reporting 51 "uptime"; -- Uptime reporting
52 "console"; -- telnet to port 5528 (needs console_enabled = true) 52 "console"; -- telnet to port 5582 (needs console_enabled = true)
53 }; 53 };
54 54
55 -- These are the SSL/TLS-related settings. If you don't want 55 -- These are the SSL/TLS-related settings. If you don't want
56 -- to use SSL/TLS, you may comment or remove this 56 -- to use SSL/TLS, you may comment or remove this
57 ssl = { 57 ssl = {
73 key = "certs/example.com.key"; 73 key = "certs/example.com.key";
74 certificate = "certs/example.com.crt"; 74 certificate = "certs/example.com.crt";
75 } 75 }
76 76
77 enabled = false -- This will disable the host, preserving the config, but denying connections 77 enabled = false -- This will disable the host, preserving the config, but denying connections
78 78 >>>>>>> other