diff --git a/resources/templates/provision/grandstream/gswave/{$mac}.xml b/resources/templates/provision/grandstream/gswave/{$mac}.xml index 1f28af3cca..baed82ffcf 100644 --- a/resources/templates/provision/grandstream/gswave/{$mac}.xml +++ b/resources/templates/provision/grandstream/gswave/{$mac}.xml @@ -1,17 +1,18 @@ - + + - + - + - + @@ -26,7 +27,11 @@ {$account.1.display_name} +{if $account.1.sip_transport != 'dns srv'} +{$account.1.server_address}:{$account.1.sip_port} +{else} {$account.1.server_address} +{/if} {$account.1.user_id} @@ -37,91 +42,273 @@ {$account.1.password} - - -*98 + +{$voicemail_number} {$account.1.display_name} - + + + + + -0 +0 - - -0 - - - - - - - - - - - - - -0 - - - -2 - - - - - - - - + + + +{if isset($grandstream_dial_plan) } {$grandstream_dial_plan} +{else} +{literal}{x+|\+x+|*x+|*xx*x+}{/literal} +{/if} - + + +0 - +1 + + + +30 - + - +1 - +2 - +{$account.1.register_expires} - - - - - + - +40 + + + + +50 + + + + +400 5060 + + +0 + + + +1 + + + +0 + + + +0 + + + +{if isset($subscribe_mwi)} +1 +{else} +0 +{/if} + + + + +180 + + + +90 + + + +0 + + + +1 + + + + +0 + + + +0 + + + + +0 + + + +0 + -0 +{$tp=0} +{if $account.1.sip_transport == 'udp'}{$tp=0}{/if} +{if $account.1.sip_transport == 'tcp'}{$tp=1}{/if} +{if $account.1.sip_transport == 'tls'}{$tp=2}{/if} +{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if} +{$tp} + + + + +0 + + + +{$grandstream_validate_incoming_sip} + + + +{$grandstream_sip_only_known_servers} + + + + +{$grandstream_check_sip_user_id} + + + +0 + + + +0 + + + + + + + + +0 + + + + +0 + + + + + + + +15 + + + + + + + +{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if} + + + +** + + + + + +100 + + + + +0 + + + +0 + + + +0 + + + +{if isset($grandstream_feature_key_sync)} +{$grandstream_feature_key_sync} +{else} +0 +{/if} - + + + + + + + + +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_primary)} +{$account.1.outbound_proxy_primary}:{$account.1.sip_port} +{else} +{$account.1.outbound_proxy_primary} +{/if} + + +{if $account.1.sip_transport != 'dns srv' && isset($account.1.outbound_proxy_secondary)} +{$account.1.outbound_proxy_secondary}:{$account.1.sip_port} +{else} +{$account.1.outbound_proxy_secondary} +{/if} + + + +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} +2 +{/if} + + + +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} +0 +{/if} + + + @@ -137,109 +324,2206 @@ 0 - - + + 9 - - + + 0 - - -8 + + +-1 - - -98 + + +-1 - - -2 + + +-1 - - -9 + + +-1 - - -9 + + +-1 + + +1 + + + + + +512 + + + +1 + + +105 - - - - - - - - - - - - -1 - - - -2 - - - - -911 - - - - -1 - - - -0 - - - -2 - - - - - -UTF-8 - - - - -{if isset($contact_grandstream)} -{$grandstream_phonebook_xml_server_path}{$user_id_1}/ -{elseif isset($grandstream_phonebook_xml_server_path)} -{$grandstream_phonebook_xml_server_path} +{if isset($grandstream_srtp)} +{$grandstream_srtp} {else} - +0 {/if} + + +1 - -{$http_auth_username} + + +0 - -{$http_auth_password} + + +0 + + +2 - - -0 + + +1 + + + +1 + + + +97 + + + +101 + + + +1 + + + +1 + + + + - + - - -0 + + +{if isset($account.2.password)} +1 +{else} +0 +{/if} + + +{$account.2.display_name} + + +{if $account.2.sip_transport != 'dns srv'} +{$account.2.server_address}:{$account.2.sip_port} +{else} +{$account.2.server_address} +{/if} + + +{$account.2.user_id} + + +{$account.2.auth_id} + + +{$account.2.password} + + +{$voicemail_number} + + +{$account.2.display_name} + + + + + + + +0 + + + + + + +{if isset($grandstream_dial_plan) } +{$grandstream_dial_plan} +{else} +{literal}{x+|\+x+|*x+|*xx*x+}{/literal} +{/if} + + + +0 + + + +1 + + + +30 + + + + + + + +1 + + + +2 + + + +{$account.2.register_expires} + + + +40 + + + + +50 + + + + +400 + + + +5062 + + + +0 + + + +1 + + + +0 + + + +0 + + + +{if isset($subscribe_mwi)} +1 +{else} +0 +{/if} + + + +180 + + + +90 + + + +0 + + + +1 + + + + +0 + + + +0 + + + + +0 + + + +0 + + + + +{$tp=0} +{if $account.2.sip_transport == 'udp'}{$tp=0}{/if} +{if $account.2.sip_transport == 'tcp'}{$tp=1}{/if} +{if $account.2.sip_transport == 'tls'}{$tp=2}{/if} +{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if} +{$tp} + + + + +0 + + + +{$grandstream_validate_incoming_sip} + + + +{$grandstream_sip_only_known_servers} + + + + +{$grandstream_check_sip_user_id} + + + +0 + + + +0 + + + + + + + + +0 + + + + +0 + + + + + + + +15 + + + + + + + +{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if} + + + +** + + + + + +100 + + + + +0 + + + +0 + + + +0 + + + +{if isset($grandstream_feature_key_sync)} +{$grandstream_feature_key_sync} +{else} +0 +{/if} + + + + + + + + + + +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_primary)} +{$account.2.outbound_proxy_primary}:{$account.2.sip_port} +{else} +{$account.2.outbound_proxy_primary} +{/if} + + +{if $account.2.sip_transport != 'dns srv' && isset($account.2.outbound_proxy_secondary)} +{$account.2.outbound_proxy_secondary}:{$account.2.sip_port} +{else} +{$account.2.outbound_proxy_secondary} +{/if} + + + +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} +2 +{/if} + + + +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} +0 +{/if} + + + + + + + +0 + + + +1 + + + +0 + + + + +9 + + + +0 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +1 + + + + + +512 + + + +1 + + +105 + + + +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} +0 +{/if} + + + +1 + + + +0 + + + +0 + + + +2 + + + +1 + + + +1 + + + +97 + + + +101 + + + +1 + + + +1 + + + + + + + + + + + +{if isset($account.3.password)} +1 +{else} +0 +{/if} + + +{$account.3.display_name} + + +{if $account.3.sip_transport != 'dns srv'} +{$account.3.server_address}:{$account.3.sip_port} +{else} +{$account.3.server_address} +{/if} + + +{$account.3.user_id} + + +{$account.3.auth_id} + + +{$account.3.password} + + +{$voicemail_number} + + +{$account.3.display_name} + + + + + + + +0 + + + + + + +{if isset($grandstream_dial_plan) } +{$grandstream_dial_plan} +{else} +{literal}{x+|\+x+|*x+|*xx*x+}{/literal} +{/if} + + + +0 + + + +1 + + + +30 + + + + + + + +1 + + + +2 + + + +{$account.3.register_expires} + + + +40 + + + + +50 + + + + +400 + + + +5064 + + + +0 + + + +1 + + + +0 + + + +0 + + + +{if isset($subscribe_mwi)} +1 +{else} +0 +{/if} + + + +180 + + + +90 + + + +0 + + + +1 + + + + +0 + + + +0 + + + + +0 + + + +0 + + + + +{$tp=0} +{if $account.3.sip_transport == 'udp'}{$tp=0}{/if} +{if $account.3.sip_transport == 'tcp'}{$tp=1}{/if} +{if $account.3.sip_transport == 'tls'}{$tp=2}{/if} +{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if} +{$tp} + + + + +0 + + + +{$grandstream_validate_incoming_sip} + + + +{$grandstream_sip_only_known_servers} + + + + +{$grandstream_check_sip_user_id} + + + +0 + + + +0 + + + + + + + + +0 + + + + +0 + + + + + + + +15 + + + + + + + +{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if} + + + +** + + + + + +100 + + + + +0 + + + +0 + + + +0 + + + +{if isset($grandstream_feature_key_sync)} +{$grandstream_feature_key_sync} +{else} +0 +{/if} + + + + + + + + + + +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_primary)} +{$account.3.outbound_proxy_primary}:{$account.3.sip_port} +{else} +{$account.3.outbound_proxy_primary} +{/if} + + +{if $account.3.sip_transport != 'dns srv' && isset($account.3.outbound_proxy_secondary)} +{$account.3.outbound_proxy_secondary}:{$account.3.sip_port} +{else} +{$account.3.outbound_proxy_secondary} +{/if} + + + +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} +2 +{/if} + + + +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} +0 +{/if} + + + + + + + +0 + + + +1 + + + +0 + + + + +9 + + + +0 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +1 + + + + + +512 + + + +1 + + +105 + + + +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} +0 +{/if} + + + +1 + + + +0 + + + +0 + + + +2 + + + +1 + + + +1 + + + +97 + + + +101 + + + +1 + + + +1 + + + + + + + + + + + +{if isset($account.4.password)} +1 +{else} +0 +{/if} + + +{$account.4.display_name} + + +{if $account.4.sip_transport != 'dns srv'} +{$account.4.server_address}:{$account.4.sip_port} +{else} +{$account.4.server_address} +{/if} + + +{$account.4.user_id} + + +{$account.4.auth_id} + + +{$account.4.password} + + +{$voicemail_number} + + +{$account.4.display_name} + + + + + + + +0 + + + + + + +{if isset($grandstream_dial_plan) } +{$grandstream_dial_plan} +{else} +{literal}{x+|\+x+|*x+|*xx*x+}{/literal} +{/if} + + + +0 + + + +1 + + + +30 + + + + + + + +1 + + + +2 + + + +{$account.4.register_expires} + + + +40 + + + + +50 + + + + +400 + + + +5066 + + + +0 + + + +1 + + + +0 + + + +0 + + + +{if isset($subscribe_mwi)} +1 +{else} +0 +{/if} + + + +180 + + + +90 + + + +0 + + + +1 + + + + +0 + + + +0 + + + + +0 + + + +0 + + + + +{$tp=0} +{if $account.4.sip_transport == 'udp'}{$tp=0}{/if} +{if $account.4.sip_transport == 'tcp'}{$tp=1}{/if} +{if $account.4.sip_transport == 'tls'}{$tp=2}{/if} +{if $account.4.sip_transport == 'dns srv'}{$tp=1}{/if} +{$tp} + + + + +0 + + + +{$grandstream_validate_incoming_sip} + + + +{$grandstream_sip_only_known_servers} + + + + +{$grandstream_check_sip_user_id} + + + +0 + + + +0 + + + + + + + + +0 + + + + +0 + + + + + + + +15 + + + + + + + +{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if} + + + +** + + + + + +100 + + + + +0 + + + +0 + + + +0 + + + +{if isset($grandstream_feature_key_sync)} +{$grandstream_feature_key_sync} +{else} +0 +{/if} + + + + + + + + + + +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_primary)} +{$account.4.outbound_proxy_primary}:{$account.4.sip_port} +{else} +{$account.4.outbound_proxy_primary} +{/if} + + +{if $account.4.sip_transport != 'dns srv' && isset($account.4.outbound_proxy_secondary)} +{$account.4.outbound_proxy_secondary}:{$account.4.sip_port} +{else} +{$account.4.outbound_proxy_secondary} +{/if} + + + +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} +2 +{/if} + + + +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} +0 +{/if} + + + + + + + +0 + + + +1 + + + +0 + + + + +9 + + + +0 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +1 + + + + + +512 + + + +1 + + +105 + + + +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} +0 +{/if} + + + +1 + + + +0 + + + +0 + + + +2 + + + +1 + + + +1 + + + +97 + + + +101 + + + +1 + + + +1 + + + + + + + + + + + +{if isset($account.5.password)} +1 +{else} +0 +{/if} + + +{$account.5.display_name} + + +{if $account.5.sip_transport != 'dns srv'} +{$account.5.server_address}:{$account.5.sip_port} +{else} +{$account.5.server_address} +{/if} + + +{$account.5.user_id} + + +{$account.5.auth_id} + + +{$account.5.password} + + +{$voicemail_number} + + +{$account.5.display_name} + + + + + + + +0 + + + + + + +{if isset($grandstream_dial_plan) } +{$grandstream_dial_plan} +{else} +{literal}{x+|\+x+|*x+|*xx*x+}{/literal} +{/if} + + + +0 + + + +1 + + + +30 + + + + + + + +1 + + + +2 + + + +{$account.5.register_expires} + + + +40 + + + + +50 + + + + +400 + + + +5068 + + + +0 + + + +1 + + + +0 + + + +0 + + + +{if isset($subscribe_mwi)} +1 +{else} +0 +{/if} + + + +180 + + + +90 + + + +0 + + + +1 + + + + +0 + + + +0 + + + + +0 + + + +0 + + + + +{$tp=0} +{if $account.5.sip_transport == 'udp'}{$tp=0}{/if} +{if $account.5.sip_transport == 'tcp'}{$tp=1}{/if} +{if $account.5.sip_transport == 'tls'}{$tp=2}{/if} +{if $account.5.sip_transport == 'dns srv'}{$tp=1}{/if} +{$tp} + + + + +0 + + + +{$grandstream_validate_incoming_sip} + + + +{$grandstream_sip_only_known_servers} + + + + +{$grandstream_check_sip_user_id} + + + +0 + + + +0 + + + + + + + + +0 + + + + +0 + + + + + + + +15 + + + + + + + +{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if} + + + +** + + + + + +100 + + + + +0 + + + +0 + + + +0 + + + +{if isset($grandstream_feature_key_sync)} +{$grandstream_feature_key_sync} +{else} +0 +{/if} + + + + + + + + + + +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_primary)} +{$account.5.outbound_proxy_primary}:{$account.5.sip_port} +{else} +{$account.5.outbound_proxy_primary} +{/if} + + +{if $account.5.sip_transport != 'dns srv' && isset($account.5.outbound_proxy_secondary)} +{$account.5.outbound_proxy_secondary}:{$account.5.sip_port} +{else} +{$account.5.outbound_proxy_secondary} +{/if} + + + +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} +2 +{/if} + + + +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} +0 +{/if} + + + + + + + +0 + + + +1 + + + +0 + + + + +9 + + + +0 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +1 + + + + + +512 + + + +1 + + +105 + + + +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} +0 +{/if} + + + +1 + + + +0 + + + +0 + + + +2 + + + +1 + + + +1 + + + +97 + + + +101 + + + +1 + + + +1 + + + + + + + + + + + +{if isset($account.6.password)} +1 +{else} +0 +{/if} + + +{$account.6.display_name} + + +{if $account.6.sip_transport != 'dns srv'} +{$account.6.server_address}:{$account.6.sip_port} +{else} +{$account.6.server_address} +{/if} + + +{$account.6.user_id} + + +{$account.6.auth_id} + + +{$account.6.password} + + +{$voicemail_number} + + +{$account.6.display_name} + + + + + + + +0 + + + + + + +{if isset($grandstream_dial_plan) } +{$grandstream_dial_plan} +{else} +{literal}{x+|\+x+|*x+|*xx*x+}{/literal} +{/if} + + + +0 + + + +1 + + + +30 + + + + + + + +1 + + + +2 + + + +{$account.6.register_expires} + + + +40 + + + + +50 + + + + +400 + + + +5070 + + + +0 + + + +1 + + + +0 + + + +0 + + + +{if isset($subscribe_mwi)} +1 +{else} +0 +{/if} + + + +180 + + + +90 + + + +0 + + + +1 + + + + +0 + + + +0 + + + + +0 + + + +0 + + + + +{$tp=0} +{if $account.6.sip_transport == 'udp'}{$tp=0}{/if} +{if $account.6.sip_transport == 'tcp'}{$tp=1}{/if} +{if $account.6.sip_transport == 'tls'}{$tp=2}{/if} +{if $account.6.sip_transport == 'dns srv'}{$tp=1}{/if} +{$tp} + + + + +0 + + + +{$grandstream_validate_incoming_sip} + + + +{$grandstream_sip_only_known_servers} + + + + +{$grandstream_check_sip_user_id} + + + +0 + + + +0 + + + + + + + + +0 + + + + +0 + + + + + + + +15 + + + + + + + +{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if} + + + +** + + + + + +100 + + + + +0 + + + +0 + + + +0 + + + +{if isset($grandstream_feature_key_sync)} +{$grandstream_feature_key_sync} +{else} +0 +{/if} + + + + + + + + + + +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_primary)} +{$account.6.outbound_proxy_primary}:{$account.6.sip_port} +{else} +{$account.6.outbound_proxy_primary} +{/if} + + +{if $account.6.sip_transport != 'dns srv' && isset($account.6.outbound_proxy_secondary)} +{$account.5.outbound_proxy_secondary}:{$account.6.sip_port} +{else} +{$account.6.outbound_proxy_secondary} +{/if} + + + +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} +2 +{/if} + + + +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} +0 +{/if} + + + + + + + +0 + + + +1 + + + +0 + + + + +9 + + + +0 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +-1 + + + +1 + + + + + +512 + + + +1 + + +105 + + + +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} +0 +{/if} + + + +1 + + + +0 + + + +0 + + + +2 + + + +1 + + + +1 + + + +97 + + + +101 + + + +1 + + + +1 + + + + + + + + + + + +5004 + + + +1 + + + + + + + +{literal}[()- ]{/literal} + + + + + + + +1 + + + + + + + + +{if isset($grandstream_stun_server) } +{$grandstream_stun_server} +{else} + +{/if} + + + +48 + + +48 + + + + + + + +0 + + +0 @@ -257,11 +2541,11 @@ -{$ldap_username} +{$grandstream_ldap_username} -{$ldap_password} +{$grandstream_ldap_password} @@ -273,51 +2557,64 @@ {$grandstream_ldap_number_attr} - - + + + -{$grandstream_ldap_mail_attr} +{$grandstream_ldap_number_filter} -{$grandstream_ldap_name_filter} - - - - - -{$grandstream_ldap_number_filter} - - - - -{$grandstream_ldap_mail_filter} +{$grandstream_ldap_name_filter} givenName sn title - + + -50 +100 - + + -4 +10 - -1 + + +0 - -1 + + + - - -0 + + + +2 + + + +{if $grandstream_config_server_path=="none"} + +{elseif isset($grandstream_config_server_path)} +{$grandstream_config_server_path} +{elseif isset($domain_name)} +{$domain_name}{$project_path}/app/provision +{/if} + + + +{$http_auth_username} + + + +{$http_auth_password}