prosody
22ef9bab0834
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 @ 530:22ef9bab0834

Automated merge with http://waqas.ath.cx/
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Dec 2008 17:24:20 +0000
parent 525:32122251d2fe
child 911:39133bca5938
comparison
equal deleted inserted replaced
529:631e7d16d22b 530:22ef9bab0834
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 >>>>>>> other