diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index 701b396e55..e420591dd0 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -7,11 +7,11 @@
- {if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}
- {if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}
+ {if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}
+ {if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}
1
1
- 0
+ 1
1
0
Fanvil X3U
@@ -74,9 +74,9 @@
- 5060
-
- 3478
+ {$sip_port}
+ {$fanvil_stun_server}
+ {$fanvil_stun_port}
50
800
@@ -88,28 +88,28 @@
1
1
0
- 0
+ 1
-
-
+ {$account.1.user_id}
+ {$account.1.display_name}
-
- 5060
-
-
- 3600
+ {$account.1.server_address}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.1.password)}1{else}0{/if}
+ {$account.1.outbound_proxy_primary}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.outbound_proxy_secondary}
+ {$account.1.sip_port}
+ {if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -133,7 +133,7 @@
- default
+ {if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}
2
30
0
@@ -148,14 +148,14 @@
0
1
0
- 3600
+ {$account.1.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -164,15 +164,17 @@
1
0
5060
- 0
+ {if $account.1.sip_transport == 'udp'}0{/if}
+ {if $account.1.sip_transport == 'tcp'}1{/if}
+ {if $account.1.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -183,23 +185,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,iLBC,G722
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -245,26 +247,26 @@
5000
-
-
+ {$account.2.user_id}
+ {$account.2.display_name}
-
- 5060
-
-
- 3600
+ {$account.2.server_address}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.2.password)}1{else}0{/if}
+ {$account.2.outbound_proxy_primary}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.outbound_proxy_secondary}
+ {$account.2.sip_port}
+ {if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -288,7 +290,7 @@
- default
+ {if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}
2
30
0
@@ -303,14 +305,14 @@
0
1
0
- 3600
+ {$account.2.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -319,15 +321,17 @@
1
0
5060
- 0
+ {if $account.2.sip_transport == 'udp'}0{/if}
+ {if $account.2.sip_transport == 'tcp'}1{/if}
+ {if $account.2.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -338,23 +342,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,iLBC,G722
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -400,26 +404,26 @@
5000
-
-
+ {$account.3.user_id}
+ {$account.3.display_name}
-
- 5060
-
-
- 3600
+ {$account.3.server_address}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.3.password)}1{else}0{/if}
+ {$account.3.outbound_proxy_primary}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.outbound_proxy_secondary}
+ {$account.3.sip_port}
+ {if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -443,7 +447,7 @@
- default
+ {if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}
2
30
0
@@ -458,14 +462,14 @@
0
1
0
- 3600
+ {$account.3.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -474,15 +478,17 @@
1
0
5060
- 0
+ {if $account.3.sip_transport == 'udp'}0{/if}
+ {if $account.3.sip_transport == 'tcp'}1{/if}
+ {if $account.3.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -493,23 +499,25 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,iLBC,G722
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -555,26 +563,26 @@
5000
-
-
+ {$account.4.user_id}
+ {$account.4.display_name}
-
- 5060
-
-
- 3600
+ {$account.4.server_address}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.4.password)}1{else}0{/if}
+ {$account.4.outbound_proxy_primary}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.outbound_proxy_secondary}
+ {$account.4.sip_port}
+ {if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -598,7 +606,7 @@
- default
+ {if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}
2
30
0
@@ -613,14 +621,14 @@
0
1
0
- 3600
+ {$account.4.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -629,15 +637,17 @@
1
0
5060
- 0
+ {if $account.4.sip_transport == 'udp'}0{/if}
+ {if $account.4.sip_transport == 'tcp'}1{/if}
+ {if $account.4.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -648,23 +658,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,iLBC,G722
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -710,26 +720,26 @@
5000
-
-
+ {$account.5.user_id}
+ {$account.5.display_name}
-
- 5060
-
-
- 3600
+ {$account.5.server_address}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.5.password)}1{else}0{/if}
+ {$account.5.outbound_proxy_primary}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.outbound_proxy_secondary}
+ {$account.5.sip_port}
+ {if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -753,7 +763,7 @@
- default
+ {if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}
2
30
0
@@ -768,7 +778,7 @@
0
1
0
- 3600
+ {$account.5.register_expires}
0
0
1
@@ -784,15 +794,17 @@
1
0
5060
- 0
+ {if $account.5.sip_transport == 'udp'}0{/if}
+ {if $account.5.sip_transport == 'tcp'}1{/if}
+ {if $account.5.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -803,23 +815,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,iLBC,G722
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
index cddb247dce..46d3443d92 100644
--- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
@@ -7,11 +7,11 @@
- {if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}
- {if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}
+ {if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}
+ {if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}
1
1
- 0
+ 1
1
0
Fanvil X4U
@@ -80,9 +80,9 @@
- 5060
-
- 3478
+ {$sip_port}
+ {$fanvil_stun_server}
+ {$fanvil_stun_port}
50
800
@@ -94,28 +94,28 @@
1
1
0
- 0
+ 1
-
-
+ {$account.1.user_id}
+ {$account.1.display_name}
-
- 5060
-
-
- 3600
+ {$account.1.server_address}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.1.password)}1{else}0{/if}
+ {$account.1.outbound_proxy_primary}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.outbound_proxy_secondary}
+ {$account.1.sip_port}
+ {if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -139,7 +139,7 @@
- default
+ {if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}
2
30
0
@@ -154,14 +154,14 @@
0
1
0
- 3600
+ {$account.1.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -170,15 +170,17 @@
1
0
5060
- 0
+ {if $account.1.sip_transport == 'udp'}0{/if}
+ {if $account.1.sip_transport == 'tcp'}1{/if}
+ {if $account.1.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -189,23 +191,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -251,26 +253,26 @@
5000
-
-
+ {$account.2.user_id}
+ {$account.2.display_name}
-
- 5060
-
-
- 3600
+ {$account.2.server_address}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.2.password)}1{else}0{/if}
+ {$account.2.outbound_proxy_primary}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.outbound_proxy_secondary}
+ {$account.2.sip_port}
+ {if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -294,7 +296,7 @@
- default
+ {if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}
2
30
0
@@ -309,14 +311,14 @@
0
1
0
- 3600
+ {$account.2.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -325,15 +327,17 @@
1
0
5060
- 0
+ {if $account.2.sip_transport == 'udp'}0{/if}
+ {if $account.2.sip_transport == 'tcp'}1{/if}
+ {if $account.2.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -344,23 +348,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -406,26 +410,26 @@
5000
-
-
+ {$account.3.user_id}
+ {$account.3.display_name}
-
- 5060
-
-
- 3600
+ {$account.3.server_address}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.3.password)}1{else}0{/if}
+ {$account.3.outbound_proxy_primary}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.outbound_proxy_secondary}
+ {$account.3.sip_port}
+ {if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -449,7 +453,7 @@
- default
+ {if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}
2
30
0
@@ -464,14 +468,14 @@
0
1
0
- 3600
+ {$account.3.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -480,15 +484,17 @@
1
0
5060
- 0
+ {if $account.3.sip_transport == 'udp'}0{/if}
+ {if $account.3.sip_transport == 'tcp'}1{/if}
+ {if $account.3.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -499,23 +505,25 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -561,26 +569,26 @@
5000
-
-
+ {$account.4.user_id}
+ {$account.4.display_name}
-
- 5060
-
-
- 3600
+ {$account.4.server_address}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.4.password)}1{else}0{/if}
+ {$account.4.outbound_proxy_primary}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.outbound_proxy_secondary}
+ {$account.4.sip_port}
+ {if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -604,7 +612,7 @@
- default
+ {if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}
2
30
0
@@ -619,14 +627,14 @@
0
1
0
- 3600
+ {$account.4.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -635,15 +643,17 @@
1
0
5060
- 0
+ {if $account.4.sip_transport == 'udp'}0{/if}
+ {if $account.4.sip_transport == 'tcp'}1{/if}
+ {if $account.4.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -654,23 +664,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -716,26 +726,26 @@
5000
-
-
+ {$account.5.user_id}
+ {$account.5.display_name}
-
- 5060
-
-
- 3600
+ {$account.5.server_address}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.5.password)}1{else}0{/if}
+ {$account.5.outbound_proxy_primary}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.outbound_proxy_secondary}
+ {$account.5.sip_port}
+ {if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -759,7 +769,7 @@
- default
+ {if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}
2
30
0
@@ -774,7 +784,7 @@
0
1
0
- 3600
+ {$account.5.register_expires}
0
0
1
@@ -790,15 +800,17 @@
1
0
5060
- 0
+ {if $account.5.sip_transport == 'udp'}0{/if}
+ {if $account.5.sip_transport == 'tcp'}1{/if}
+ {if $account.5.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -809,23 +821,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -2124,7 +2136,7 @@
VOIP PHONE
5
4
- 15
+ 12
45
0
diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index 9875636784..c01ac3ac6b 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -540,7 +540,7 @@
{$account.4.sip_port}
{$account.4.auth_id}
{$account.4.password}
- {$account.1.register_expires}
+ {$account.4.register_expires}
5060
0
diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
index f514b677da..0ac0ea0752 100644
--- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
@@ -7,11 +7,11 @@
- {if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}
- {if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}
+ {if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}
+ {if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}
1
1
- 0
+ 1
1
0
Fanvil X5U
@@ -80,9 +80,9 @@
- 5060
-
- 3478
+ {$sip_port}
+ {$fanvil_stun_server}
+ {$fanvil_stun_port}
50
800
@@ -94,28 +94,28 @@
1
1
0
- 0
+ 1
-
-
+ {$account.1.user_id}
+ {$account.1.display_name}
-
- 5060
-
-
- 3600
+ {$account.1.server_address}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.1.password)}1{else}0{/if}
+ {$account.1.outbound_proxy_primary}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.outbound_proxy_secondary}
+ {$account.1.sip_port}
+ {if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -139,7 +139,7 @@
- default
+ {if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}
2
30
0
@@ -154,14 +154,14 @@
0
1
0
- 3600
+ {$account.1.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -170,15 +170,17 @@
1
0
5060
- 0
+ {if $account.1.sip_transport == 'udp'}0{/if}
+ {if $account.1.sip_transport == 'tcp'}1{/if}
+ {if $account.1.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -189,23 +191,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -251,26 +253,26 @@
5000
-
-
+ {$account.2.user_id}
+ {$account.2.display_name}
-
- 5060
-
-
- 3600
+ {$account.2.server_address}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.2.password)}1{else}0{/if}
+ {$account.2.outbound_proxy_primary}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.outbound_proxy_secondary}
+ {$account.2.sip_port}
+ {if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -294,7 +296,7 @@
- default
+ {if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}
2
30
0
@@ -309,14 +311,14 @@
0
1
0
- 3600
+ {$account.2.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -325,15 +327,17 @@
1
0
5060
- 0
+ {if $account.2.sip_transport == 'udp'}0{/if}
+ {if $account.2.sip_transport == 'tcp'}1{/if}
+ {if $account.2.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -344,23 +348,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -406,26 +410,26 @@
5000
-
-
+ {$account.3.user_id}
+ {$account.3.display_name}
-
- 5060
-
-
- 3600
+ {$account.3.server_address}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.3.password)}1{else}0{/if}
+ {$account.3.outbound_proxy_primary}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.outbound_proxy_secondary}
+ {$account.3.sip_port}
+ {if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -449,7 +453,7 @@
- default
+ {if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}
2
30
0
@@ -464,14 +468,14 @@
0
1
0
- 3600
+ {$account.3.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -480,15 +484,17 @@
1
0
5060
- 0
+ {if $account.3.sip_transport == 'udp'}0{/if}
+ {if $account.3.sip_transport == 'tcp'}1{/if}
+ {if $account.3.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -499,23 +505,25 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -561,26 +569,26 @@
5000
-
-
+ {$account.4.user_id}
+ {$account.4.display_name}
-
- 5060
-
-
- 3600
+ {$account.4.server_address}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.4.password)}1{else}0{/if}
+ {$account.4.outbound_proxy_primary}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.outbound_proxy_secondary}
+ {$account.4.sip_port}
+ {if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -604,7 +612,7 @@
- default
+ {if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}
2
30
0
@@ -619,14 +627,14 @@
0
1
0
- 3600
+ {$account.4.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -635,15 +643,17 @@
1
0
5060
- 0
+ {if $account.4.sip_transport == 'udp'}0{/if}
+ {if $account.4.sip_transport == 'tcp'}1{/if}
+ {if $account.4.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -654,23 +664,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -716,26 +726,26 @@
5000
-
-
+ {$account.5.user_id}
+ {$account.5.display_name}
-
- 5060
-
-
- 3600
+ {$account.5.server_address}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.5.password)}1{else}0{/if}
+ {$account.5.outbound_proxy_primary}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.outbound_proxy_secondary}
+ {$account.5.sip_port}
+ {if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -759,7 +769,7 @@
- default
+ {if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}
2
30
0
@@ -774,7 +784,7 @@
0
1
0
- 3600
+ {$account.5.register_expires}
0
0
1
@@ -790,15 +800,17 @@
1
0
5060
- 0
+ {if $account.5.sip_transport == 'udp'}0{/if}
+ {if $account.5.sip_transport == 'tcp'}1{/if}
+ {if $account.5.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -809,23 +821,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 0e9ad7b868..f2d03f5cf3 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -537,7 +537,7 @@
{$account.4.sip_port}
{$account.4.auth_id}
{$account.4.password}
- {$account.1.register_expires}
+ {$account.4.register_expires}
5060
0
diff --git a/resources/templates/provision/fanvil/x6u/{$mac}.cfg b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
index fc2212e9cb..eef3394fc3 100644
--- a/resources/templates/provision/fanvil/x6u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
@@ -7,11 +7,11 @@
- {if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}
- {if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}
+ {if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}
+ {if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}
1
1
- 0
+ 1
1
0
Fanvil X6U
@@ -85,9 +85,9 @@
- 5060
-
- 3478
+ {$sip_port}
+ {$fanvil_stun_server}
+ {$fanvil_stun_port}
50
800
@@ -99,28 +99,28 @@
1
1
0
- 0
+ 1
-
-
+ {$account.1.user_id}
+ {$account.1.display_name}
-
- 5060
-
-
- 3600
+ {$account.1.server_address}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.1.password)}1{else}0{/if}
+ {$account.1.outbound_proxy_primary}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.outbound_proxy_secondary}
+ {$account.1.sip_port}
+ {if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -144,7 +144,7 @@
- default
+ {if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}
2
30
0
@@ -159,14 +159,14 @@
0
1
0
- 3600
+ {$account.1.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -175,15 +175,17 @@
1
0
5060
- 0
+ {if $account.1.sip_transport == 'udp'}0{/if}
+ {if $account.1.sip_transport == 'tcp'}1{/if}
+ {if $account.1.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -194,23 +196,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -256,26 +258,26 @@
5000
-
-
+ {$account.2.user_id}
+ {$account.2.display_name}
-
- 5060
-
-
- 3600
+ {$account.2.server_address}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.2.password)}1{else}0{/if}
+ {$account.2.outbound_proxy_primary}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.outbound_proxy_secondary}
+ {$account.2.sip_port}
+ {if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -299,7 +301,7 @@
- default
+ {if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}
2
30
0
@@ -314,14 +316,14 @@
0
1
0
- 3600
+ {$account.2.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -330,15 +332,17 @@
1
0
5060
- 0
+ {if $account.2.sip_transport == 'udp'}0{/if}
+ {if $account.2.sip_transport == 'tcp'}1{/if}
+ {if $account.2.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -349,23 +353,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -411,26 +415,26 @@
5000
-
-
+ {$account.3.user_id}
+ {$account.3.display_name}
-
- 5060
-
-
- 3600
+ {$account.3.server_address}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.3.password)}1{else}0{/if}
+ {$account.3.outbound_proxy_primary}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.outbound_proxy_secondary}
+ {$account.3.sip_port}
+ {if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -454,7 +458,7 @@
- default
+ {if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}
2
30
0
@@ -469,14 +473,14 @@
0
1
0
- 3600
+ {$account.3.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -485,15 +489,17 @@
1
0
5060
- 0
+ {if $account.3.sip_transport == 'udp'}0{/if}
+ {if $account.3.sip_transport == 'tcp'}1{/if}
+ {if $account.3.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -504,23 +510,25 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -566,26 +574,26 @@
5000
-
-
+ {$account.4.user_id}
+ {$account.4.display_name}
-
- 5060
-
-
- 3600
+ {$account.4.server_address}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.4.password)}1{else}0{/if}
+ {$account.4.outbound_proxy_primary}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.outbound_proxy_secondary}
+ {$account.4.sip_port}
+ {if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -609,7 +617,7 @@
- default
+ {if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}
2
30
0
@@ -624,14 +632,14 @@
0
1
0
- 3600
+ {$account.4.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -640,15 +648,17 @@
1
0
5060
- 0
+ {if $account.4.sip_transport == 'udp'}0{/if}
+ {if $account.4.sip_transport == 'tcp'}1{/if}
+ {if $account.4.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -659,23 +669,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -721,26 +731,26 @@
5000
-
-
+ {$account.5.user_id}
+ {$account.5.display_name}
-
- 5060
-
-
- 3600
+ {$account.5.server_address}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.5.password)}1{else}0{/if}
+ {$account.5.outbound_proxy_primary}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.outbound_proxy_secondary}
+ {$account.5.sip_port}
+ {if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -764,7 +774,7 @@
- default
+ {if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}
2
30
0
@@ -779,7 +789,7 @@
0
1
0
- 3600
+ {$account.5.register_expires}
0
0
1
@@ -795,15 +805,17 @@
1
0
5060
- 0
+ {if $account.5.sip_transport == 'udp'}0{/if}
+ {if $account.5.sip_transport == 'tcp'}1{/if}
+ {if $account.5.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -814,23 +826,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
diff --git a/resources/templates/provision/fanvil/x7/{$mac}.cfg b/resources/templates/provision/fanvil/x7/{$mac}.cfg
index 151dab5bb9..a3b3f5f6ff 100644
--- a/resources/templates/provision/fanvil/x7/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x7/{$mac}.cfg
@@ -4,7 +4,7 @@
0
- 255.255.255.0
+
{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}
@@ -568,7 +568,7 @@
{$account.4.sip_port}
{$account.4.auth_id}
{$account.4.password}
- {$account.1.register_expires}
+ {$account.4.register_expires}
5060
0
@@ -3647,7 +3647,7 @@
-
+