[asterisk-commits] newtonr: trunk r414781 - in /trunk: ./ configs/pjsip.conf.sample

[SVN commits to the Asterisk project]

Author: newtonr
Date: Wed May 28 15:53:05 2014
New Revision: 414781

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414781
Log:
pjsip.conf: privkey_file should be priv_key_file, mediaencryption=yes should be mediaencryption=sdes

privkey_file was missed in the snake case update. An example included an invalid value for the mediaencryption option.
........

Merged revisions 414780 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/configs/pjsip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/configs/pjsip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/pjsip.conf.sample?view=diff&rev=414781&r1=414780&r2=414781
==============================================================================
--- trunk/configs/pjsip.conf.sample (original)
+++ trunk/configs/pjsip.conf.sample Wed May 28 15:53:05 2014
@@ -147,7 +147,7 @@
 ;protocol=tls
 ;bind=0.0.0.0
 ;cert_file=/path/mycert.crt
-;privkey_file=/path/mykey.key
+;priv_key_file=/path/mykey.key
 ;cipher=ALL
 ;method=tlsv1
 
@@ -282,7 +282,7 @@
 ; Use the "contact=" line instead of max_contacts= if you want to statically
 ; define the location of the device.
 ;
-; If using the TLS enabled transport, you may want the "media_encryption=yes"
+; If using the TLS enabled transport, you may want the "media_encryption=sdes"
 ; option to additionally enable SRTP, though they are not mutually inclusive.
 ;
 ; Use the "rtp_ipv6=yes" option if you want to utilize RTP over an ipv6 transport.
@@ -304,7 +304,7 @@
 ; A few more transports to pick from, and some related options below them.
 ;
 ;transport=transport-tls
-;media_encryption=yes
+;media_encryption=sdes
 ;transport=transport-udp-ipv6
 ;rtp_ipv6=yes
 ;transport=transport-udp-nat