diff --git a/resources/templates/provision/sangoma/s500/{$mac}.xml b/resources/templates/provision/sangoma/s500/{$mac}.xml
index 462f354111..b70df22c24 100644
--- a/resources/templates/provision/sangoma/s500/{$mac}.xml
+++ b/resources/templates/provision/sangoma/s500/{$mac}.xml
@@ -9,21 +9,21 @@
0
{$outbound_proxy_primary_1}
{$outbound_proxy_secondary_1}
- 0
+ {$sangoma_transport}
2
{$display_name_1}
{$user_id_1}
{$auth_id_1}
{$user_password_1}
-
- 0
+ {$display_name_1}
+ {$sangoma_dns_mode}
0
1
0
- 15
+ 2
1
- 5060
- 0
+ {$sip_port_1}
+ 1
*97
1
1
@@ -31,10 +31,10 @@
0
8
- 18
+ 9
2
- 4
- 9
+ 18
+ 4
2
0
0
@@ -51,14 +51,14 @@
0
1
1
- 0
+ 1
60
1
{literal}{[x*]+}{/literal}
0
0
0
- 0
+ 1
0
1
1
@@ -85,7 +85,7 @@
0
0
- 0
+ 3
0
0
0
@@ -138,21 +138,21 @@
0
{$outbound_proxy_primary_2}
{$outbound_proxy_secondary_2}
- 0
+ {$sangoma_transport}
2
{$display_name_2}
{$user_id_2}
{$auth_id_2}
{$user_password_2}
-
+ {$display_name_2}
0
0
1
0
- 15
+ 2
1
- 5160
- 0
+ {$sip_port_2}
+ 1
*97
1
1
@@ -160,10 +160,10 @@
0
8
- 18
+ 9
2
- 4
- 9
+ 18
+ 4
2
0
0
@@ -187,7 +187,7 @@
0
0
0
- 0
+ 1
0
1
1
@@ -267,21 +267,21 @@
0
{$outbound_proxy_primary_3}
{$outbound_proxy_secondary_3}
- 0
+ {$sangoma_transport}
2
{$display_name_3}
{$user_id_3}
{$auth_id_3}
{$user_password_3}
-
- 0
+ {$display_name_3}
+ {$sangoma_dns_mode}
0
1
0
- 15
+ 2
1
- 5260
- 0
+ {$sip_port_3}
+ 1
*97
1
1
@@ -289,10 +289,10 @@
0
8
- 18
+ 9
2
- 4
- 9
+ 18
+ 4
2
0
0
@@ -316,7 +316,7 @@
0
0
0
- 0
+ 1
0
1
1
@@ -396,21 +396,21 @@
0
{$outbound_proxy_primary_4}
{$outbound_proxy_secondary_4}
- 0
+ {$sangoma_transport}
2
{$display_name_4}
{$user_id_4}
{$auth_id_4}
{$user_password_4}
-
- 0
+ {$display_name_4}
+ {$sangoma_dns_mode}
0
1
0
- 15
+ 2
1
- 5360
- 0
+ {$sip_port_4}
+ 1
*97
1
1
@@ -418,10 +418,10 @@
0
8
- 18
+ 9
2
- 4
- 9
+ 18
+ 4
2
0
0
@@ -445,7 +445,7 @@
0
0
0
- 0
+ 1
0
1
1
@@ -525,21 +525,21 @@
0
{$outbound_proxy_primary_5}
{$outbound_proxy_secondary_5}
- 0
+ {$sangoma_transport}
2
{$display_name_5}
{$user_id_5}
{$auth_id_5}
{$user_password_5}
-
- 0
+ {$display_name_5}
+ {$sangoma_dns_mode}
0
1
0
- 15
+ 2
1
-
- 5460
+ {$sip_port_5}
+ 1
*97
1
1
@@ -547,10 +547,10 @@
0
8
- 18
+ 9
2
- 4
- 9
+ 18
+ 4
2
0
97
@@ -574,7 +574,7 @@
0
0
0
- 0
+ 1
0
1
1
@@ -654,21 +654,21 @@
0
{$outbound_proxy_primary_6}
{$outbound_proxy_secondary_6}
- 0
+ {$sangoma_transport}
2
{$display_name_6}
{$user_id_6}
{$auth_id_6}
{$user_password_6}
-
- 0
+ {$display_name_6}
+ {$sangoma_dns_mode}
0
1
0
- 15
+ 2
1
-
- 5560
+ {$sip_port_6}
+ 1
*97
1
1
@@ -676,10 +676,10 @@
0
8
- 18
+ 9
2
- 4
- 9
+ 18
+ 4
2
0
97
@@ -703,7 +703,7 @@
0
0
0
- 0
+ 1
0
1
1
@@ -777,7 +777,7 @@
0
0
- S700-0050585011DE
+ S500-{$mac}
@@ -793,21 +793,21 @@
0
0
0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
+ 8
+ 8
+ 8
+ 8
+ 4
+ 2
+ 2
+ 2
- 0
- 0
- 0
- 0
+ 8
+ 8
+ 8
+ 8
1
1
1
@@ -858,7 +858,7 @@
0
0
- time.windows.com
+ {$ntp_server_primary}
0
0
@@ -875,47 +875,61 @@
20
0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
0
- 255
+ 0
- 1
+ 0
0
- 255
+ 0
- 1
+ 0
0
- 255
+ 0
- 1
+ 0
0
- 255
+ 0
- 1
+ 0
0
- 255
+ 0
- 1
+ 0
0
- 255
+ 0
0
@@ -1190,6 +1204,16 @@
0
+
+
+
+
+
+
+
+
+
+
0
@@ -1277,89 +1301,102 @@
0
- 18
+ 14
0
- 0
- 2
- 0
+ 1
+ 1
+ 1
0
0
0
- 0
- 0
- 0
- 2
- 0
+ 300
+ 0
+ 1
1
- 1
+ 0
0
- 0
- 1
+ 1
+ 0
1
- 0
+ 1
1
0
-
- 255
-
- 255
-
- 255
- 0
- 0
+ 5
+ 0
+ ring1
+ 1
+ ring2
+ 2
+ ring3
+ 3
0
0
- 4
+ 2
0
-
+ 4
+ 1
+ 0
-
+ 0
- 0
+
-
+ 0
- 0
- 60
-
-
+
+
+ 0
+ 0
-
-
- 0
- 1
- 1
+ *78
+ *79
+
+
+ 0
1
- 0
- 0
- 0
-
+ 1
+ 1
+ 1
+ 0
0
0
- 0
+
0
- admin
- 15
+ 0
+ 0
- 1
- 0
- 0
- 3
- 3
- 0
-
- f1=350@-13,f2=440@-13,c=0/0;
- f1=440@-19,f2=480@-19,c=2000/4000;
+ 15
+
+ 1
+ 1
+ 0
+ 3
+ 0
+ 0
+
+ 0
+
+ 0
+ 1
+ 1
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
- f1=480@-24,f2=620@-24,c=500/500;
- f1=480@-24,f2=620@-24,c=250/250;
- f1=350@-11,f2=440@-11,c=100/100-100/100-100/100;
- f1=440@-13,c=300/10000-300/10000-0/0;
-
-
+ f1=350@-13,f2=440@-13,c=0/0;
+ f1=440@-19,f2=480@-19,c=2000/4000;
+ f1=480@-24,f2=620@-24,c=500/500;
+ f1=480@-24,f2=620@-24,c=250/250;
+ f1=350@-11,f2=440@-11,c=100/100-100/100-100/100;
+ f1=440@-13,c=300/10000-300/10000-0/0;
@@ -1396,1330 +1433,1332 @@
- 1
+
-
+ 1
-
+ http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
-
+ http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
-
+ http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
- (cn=%)
- (|(telephoneNumber=%)(Mobile=%))
+
+
-
- 389
+ ((telephoneNumber=*)(sn=%))
+ ((telephoneNumber=%)(sn=*))
-
-
- 32000
- cn
- 0
- 0
- 0
+ 389
+ dc=domain,dc=local
+
+
+ 50
+
+ 200
0
-
-
+ 0
+ 0
- 0
+
-
+ 0
- 0
+
-
+ 0
- 0
+
-
+ 0
- 0
+
-
+ 0
- 0
+
-
+ 0
- 0
+
-
+ 0
- 0
+
-
+ 0
- 0
+
-
+ 0
- 0
+
-
- admin
- user
+ 0
+
+
admin
- 1234
- 3
- https://rs.sangoma.net/fm
+ user
+
+
- https://rs.sangoma.net/cfg
- 66
- 1
- 1
- 60
-
-
+ 1
+ http://rs.sangoma.net/phone/firmware/
+ http://{$domain_name}/app/provision
+
+ 0
+ 1
+ 10080
+ 0
- 0
- 0
-
-
- 0
- 0
+
+
+ 0
+ 0
+
+ 0
+
0
0
-
-
+ 0
+ 0
- 0
+
- Copyright © 2005-2016 All Rights Reserved
- SANGOMA
+
+ 0
-
-
- 0
+ Copyright 2005-2016 All Rights Reserved
+ SANGOMA
+ {$var_name}
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
0
-
- 0
+ 0
+
-
+ 0
@@ -2740,131 +2779,141 @@
- 0
- 0
-
-
+
+
+ 0
+ 0
- http://rs.sangoma.net/screensaver
- http://rs.sangoma.net/wallpaper
- 0
-
-
-
-
-
-
-
- 255
- 255
- 255
- 255
- 255
- 255
- 255
- 0
- 0
- 12100
- 12200
- 0
- 0
- 1
- 1
- 0
- 12
- 31
- 23
- 0
- 0
- 0
+
+
+
+ {$sangoma_wallpaper}
+ 28
+ ring4
+ ring5
+ ring6
+ ring7
+ ring8
+ ring9
+ ring10
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 1
+ 2
+ 12100
+ 12200
+ 0
+ 0
+ 3
+ 1
+ 2
+ 11
+ 1
+ 1
+ 1
0
0
- 1
- 2
- 3
- 4
- 5
- 6
- 0
- 0
+ 0
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
0
- terminated
- early
- confirmed
- confirmed
+ 0
+ 0
+ terminated
+ early
confirmed
confirmed
- unknown
-
-
+ confirmed
+ confirmed
+ unknown
- 2
- 6
- 1
- 1
+
+
+ 2
+ 6
1
1
- 0
- 0
+ 1
+ 1
0
0
- 1
- 1
- 0
- 0
-
-
- 0
- 2
+ 0
+ 0
+ 1
+ 1
+ 0
+ 0
+
+
0
0
- 1
+ 0
0
- http://rs.sangoma.net/ring
+ 0
- http://rs.sangoma.net/phonechain.pem
- http://rs.sangoma.net/phonechain.pem
- http://rs.sangoma.net/screensaver
- http://rs.sangoma.net/wallpaper
+
+
+ http://rs.sangoma.net/phonechain.pem
+ http://rs.sangoma.net/phonechain.pem
-
- 0
- 5
+ {$sangoma_wallpaper}
+ {$ntp_server_secondary}
+
0
- 0
+ 5
0
1
0
-
- 80
- 0
-
-
+ 1
+ 0
+
+ 80
+ 0
- 0
- 1
- 1
+
+
+ 0
1
1
1
1
1
- Group
- GroupCommon
- Interoperability
- EnterpriseCommon
- Personal
- 0
- 0
-
-
+ 1
+ 1
+ Group
+ GroupCommon
+ Interoperability
+ EnterpriseCommon
+ Personal
+ 0
+ 0
- 0
+
+
+ 0
+
+
+
+
+
+
+
+ 1