diff options
| author | David Vossel <dvossel@digium.com> | 2009-04-29 14:39:48 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-04-29 14:39:48 +0000 |
| commit | ca138fc807f587a0145f68ceac824652633cb853 (patch) | |
| tree | 622e972760e11646f05bdb377f471f42a6608dcc /configs/manager.conf.sample | |
| parent | 77f08759b53eafc1f448c016c86d34dc58f51b76 (diff) | |
Consistent SSL/TLS options across conf files
ast_tls_read_conf() is a new api call for handling SSL/TLS options across all conf files. Before this change, SSL/TLS options were not consistent. http.conf and manager.conf required the 'ssl' prefix while sip.conf used options with the 'tls' prefix. While the options had different names in different conf files, they all did the exact same thing. Now, instead of mixing 'ssl' or 'tls' prefixes to do the same thing depending on what conf file you're in, all SSL/TLS options use the 'tls' prefix. For example. 'sslenable' in http.conf and manager.conf is now 'tlsenable' which matches what already existed in sip.conf. Since this has the potential to break backwards compatibility, previous options containing the 'ssl' prefix still work, but they are no longer documented in the sample.conf files. The change is noted in the CHANGES file though.
Review: http://reviewboard.digium.com/r/237/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@191028 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs/manager.conf.sample')
| -rw-r--r-- | configs/manager.conf.sample | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample index 39585c1de..425ce4ca2 100644 --- a/configs/manager.conf.sample +++ b/configs/manager.conf.sample @@ -39,15 +39,14 @@ bindaddr = 0.0.0.0 ; ; openssl s_client -connect my_host:5039 ; -; sslenable=no ; set to YES to enable it -; sslbindport=5039 ; the port to bind to -; sslbindaddr=0.0.0.0 ; address to bind to, default to bindaddr -; sslcert=/tmp/asterisk.pem ; path to the certificate. -; sslprivatekey=/tmp/private.pem ; path to the private key, if no private given, - ; if no sslprivatekey is given, default is to search - ; sslcert for private key. -; sslcipher=<cipher string> ; string specifying which SSL ciphers to use or not use - +;tlsenable=no ; set to YES to enable it +;tlsbindport=5039 ; the port to bind to +;tlsbindaddr=0.0.0.0 ; address to bind to, default to bindaddr +;tlscertfile=/tmp/asterisk.pem ; path to the certificate. +;tlsprivatekey=/tmp/private.pem ; path to the private key, if no private given, + ; if no tlsprivatekey is given, default is to search + ; tlscertfile for private key. +;tlscipher=<cipher string> ; string specifying which SSL ciphers to use or not use ; ;allowmultiplelogin = yes ; IF set to no, rejects manager logins that are already in use. ; ; The default is yes. |