Testing config tweaks

This commit is contained in:
Brian West 2015-09-30 01:03:42 -05:00
parent 5ab79c4570
commit c5bc11791e
2 changed files with 31 additions and 7 deletions

View File

@ -12,6 +12,7 @@
<image x="0" y="90" scale="180"/> <image x="0" y="90" scale="180"/>
<image x="180" y="90" scale="180"/> <image x="180" y="90" scale="180"/>
</layout> </layout>
<layout name="2x1-zoom" auto-3d-position="true"> <layout name="2x1-zoom" auto-3d-position="true">
<image x="0" y="0" scale="180" hscale="360" zoom="true"/> <image x="0" y="0" scale="180" hscale="360" zoom="true"/>
<image x="180" y="0" scale="180" hscale="360" zoom="true"/> <image x="180" y="0" scale="180" hscale="360" zoom="true"/>
@ -315,6 +316,10 @@
<image x="240" y="300" scale="60"/> <image x="240" y="300" scale="60"/>
<image x="300" y="300" scale="60"/> <image x="300" y="300" scale="60"/>
</layout> </layout>
<layout name="2x1-presenter-zoom" auto-3d-position="true">
<image x="0" y="0" scale="180" hscale="360" zoom="true"/>
<image x="180" y="0" scale="180" hscale="360" zoom="true" reservation_id="presenter"/>
</layout>
<layout name="presenter-dual-vertical"> <layout name="presenter-dual-vertical">
<image x="90" y="0" scale="180" floor-only="true"/> <image x="90" y="0" scale="180" floor-only="true"/>
<image x="90" y="180" scale="180" reservation_id="presenter"/> <image x="90" y="180" scale="180" reservation_id="presenter"/>

View File

@ -5,11 +5,9 @@
</settings> </settings>
<profiles> <profiles>
<profile name="default"> <profile name="default-v4">
<param name="bind-local" value="$${local_ip_v4}:8081"/> <param name="bind-local" value="$${local_ip_v4}:8081"/>
<param name="bind-local" value="$${local_ip_v4}:8082" secure="true"/> <param name="bind-local" value="$${local_ip_v4}:8082" secure="true"/>
<param name="bind-local" value="[$${local_ip_v6}]:8081"/>
<param name="bind-local" value="[$${local_ip_v6}]:8082" secure="true"/>
<param name="force-register-domain" value="$${domain}"/> <param name="force-register-domain" value="$${domain}"/>
<param name="secure-combined" value="$${certs_dir}/wss.pem"/> <param name="secure-combined" value="$${certs_dir}/wss.pem"/>
<param name="secure-chain" value="$${certs_dir}/wss.pem"/> <param name="secure-chain" value="$${certs_dir}/wss.pem"/>
@ -18,17 +16,38 @@
<param name="blind-reg" value="false"/> <param name="blind-reg" value="false"/>
<param name="mcast-ip" value="224.1.1.1"/> <param name="mcast-ip" value="224.1.1.1"/>
<param name="mcast-port" value="1337"/> <param name="mcast-port" value="1337"/>
<param name="rtp-ip" value="$${local_ip_v6}"/>
<param name="rtp-ip" value="$${local_ip_v4}"/> <param name="rtp-ip" value="$${local_ip_v4}"/>
<!-- <param name="ext-rtp-ip" value=""/> --> <!-- <param name="ext-rtp-ip" value=""/> -->
<param name="local-network" value="localnet.auto"/> <param name="local-network" value="localnet.auto"/>
<param name="outbound-codec-string" value="OPUS,VP8"/> <param name="outbound-codec-string" value="opus,vp8"/>
<param name="inbound-codec-string" value="OPUS,VP8"/> <param name="inbound-codec-string" value="opus,vp8"/>
<param name="apply-candidate-acl" value="localnet.auto"/> <param name="apply-candidate-acl" value="localnet.auto"/>
<param name="apply-candidate-acl" value="wan_v6.auto"/>
<param name="apply-candidate-acl" value="wan_v4.auto"/> <param name="apply-candidate-acl" value="wan_v4.auto"/>
<param name="apply-candidate-acl" value="rfc1918.auto"/> <param name="apply-candidate-acl" value="rfc1918.auto"/>
<param name="apply-candidate-acl" value="any_v4.auto"/>
<param name="timer-name" value="soft"/>
</profile>
<profile name="default-v6">
<param name="bind-local" value="[$${local_ip_v6}]:8081"/>
<param name="bind-local" value="[$${local_ip_v6}]:8082" secure="true"/>
<param name="force-register-domain" value="$${domain}"/>
<param name="secure-combined" value="$${certs_dir}/wss.pem"/>
<param name="secure-chain" value="$${certs_dir}/wss.pem"/>
<param name="userauth" value="true"/>
<!-- setting this to true will allow anyone to register even with no account so use with care -->
<param name="blind-reg" value="false"/>
<param name="rtp-ip" value="$${local_ip_v6}"/>
<!-- <param name="ext-rtp-ip" value=""/> -->
<param name="outbound-codec-string" value="opus,vp8"/>
<param name="inbound-codec-string" value="opus,vp8"/>
<param name="apply-candidate-acl" value="wan_v6.auto"/>
<param name="apply-candidate-acl" value="rfc1918.auto"/>
<param name="apply-candidate-acl" value="any_v6.auto"/> <param name="apply-candidate-acl" value="any_v6.auto"/>
<param name="apply-candidate-acl" value="wan_v4.auto"/>
<param name="apply-candidate-acl" value="any_v4.auto"/> <param name="apply-candidate-acl" value="any_v4.auto"/>
<param name="timer-name" value="soft"/> <param name="timer-name" value="soft"/>