From 8a415bc482a8f98237f6eada8bdb5a6cf33122c4 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Thu, 5 Jun 2014 00:32:29 +0000
Subject: [PATCH] Improve the Polycom VVX provisioning template tested with
 latest 5.x firmware should work with any Polycom using version 4 or higher

---
 .../templates/provision/polycom/vvx/site.cfg  | 24 ++++++++++++-------
 .../templates/provision/polycom/vvx/web.cfg   |  8 +++++++
 .../polycom/vvx/{$mac}-registration.cfg       | 13 +++++-----
 .../provision/polycom/vvx/{$mac}.cfg          |  4 +++-
 4 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 resources/templates/provision/polycom/vvx/web.cfg

diff --git a/resources/templates/provision/polycom/vvx/site.cfg b/resources/templates/provision/polycom/vvx/site.cfg
index 53ce0d36b9..2712e830d3 100644
--- a/resources/templates/provision/polycom/vvx/site.cfg
+++ b/resources/templates/provision/polycom/vvx/site.cfg
@@ -9,7 +9,11 @@
     <callLists.writeDelay callLists.writeDelay.journal="5" callLists.writeDelay.terminated="60">
     </callLists.writeDelay>
   </callLists>
-  <device device.hostname="" device.set="0">
+  <nat nat.ip="" nat.mediaPortStart="0" nat.signalPort="0">
+    <nat.keepalive nat.keepalive.interval="15">
+    </nat.keepalive>
+  </nat>
+  <device device.hostname="" device.set="1">
     <device.auth device.auth.localAdminPassword="">
       <device.auth.localAdminPassword device.auth.localAdminPassword.set="0">
       </device.auth.localAdminPassword>
@@ -170,10 +174,10 @@
         </device.sec.TLS.syslog>
       </device.sec.TLS>
     </device.sec>
-    <device.sntp device.sntp.gmtOffset="" device.sntp.serverName="216.45.57.38">
-      <device.sntp.gmtOffset device.sntp.gmtOffset.set="0">
+    <device.sntp device.sntp.gmtOffset="-21600" device.sntp.serverName="pool.ntp.org">
+      <device.sntp.gmtOffset device.sntp.gmtOffset.set="1">
       </device.sntp.gmtOffset>
-      <device.sntp.serverName device.sntp.serverName.set="0">
+      <device.sntp.serverName device.sntp.serverName.set="1">
       </device.sntp.serverName>
     </device.sntp>
     <device.syslog device.syslog.facility="" device.syslog.prependMac="" device.syslog.renderLevel="" device.syslog.serverName="" device.syslog.transport="">
@@ -244,7 +248,7 @@
       <lcl.ml.lang lcl.ml.lang.charset="">
         <lcl.ml.lang.clock lcl.ml.lang.clock.1.24HourClock="1" lcl.ml.lang.clock.1.dateTop="1" lcl.ml.lang.clock.1.format="MM/DD/YY" lcl.ml.lang.clock.1.longFormat="1" lcl.ml.lang.clock.2.24HourClock="1" lcl.ml.lang.clock.2.dateTop="1" lcl.ml.lang.clock.2.format="D,dM" lcl.ml.lang.clock.2.longFormat="1" lcl.ml.lang.clock.3.24HourClock="1" lcl.ml.lang.clock.3.format="D,dM" lcl.ml.lang.clock.4.24HourClock="0" lcl.ml.lang.clock.4.format="D,Md" lcl.ml.lang.clock.5.24HourClock="1" lcl.ml.lang.clock.5.format="D,Md" lcl.ml.lang.clock.6.24HourClock="0" lcl.ml.lang.clock.6.format="D,Md" lcl.ml.lang.clock.7.format="D,Md" lcl.ml.lang.clock.8.format="D,Md" lcl.ml.lang.clock.9.format="D,Md" lcl.ml.lang.clock.10.format="Md,D" lcl.ml.lang.clock.11.format="D,dM" lcl.ml.lang.clock.12.format="D,dM" lcl.ml.lang.clock.13.format="D,dM" lcl.ml.lang.clock.14.format="D,dM" lcl.ml.lang.clock.15.format="D,dM" lcl.ml.lang.clock.16.format="D,dM" lcl.ml.lang.clock.17.format="D,dM" lcl.ml.lang.clock.18.format="D,dM" lcl.ml.lang.clock.19.format="MM/DD/YY">
         </lcl.ml.lang.clock>
-        <lcl.ml.lang.menu lcl.ml.lang.menu.1="Chinese_China" lcl.ml.lang.menu.1.label="%u7B80%u4F53%u4E2D%u6587 (zh-cn)" lcl.ml.lang.menu.2="Danish_Denmark" lcl.ml.lang.menu.2.label="Dansk (da-dk)" lcl.ml.lang.menu.3="Dutch_Netherlands" lcl.ml.lang.menu.3.label="Nederlands (nl-nl)" lcl.ml.lang.menu.4="English_Canada" lcl.ml.lang.menu.4.label="English (en-ca)" lcl.ml.lang.menu.5="English_United_Kingdom" lcl.ml.lang.menu.5.label="English (en-gb)" lcl.ml.lang.menu.6="English_United_States" lcl.ml.lang.menu.6.label="English (en-us)" lcl.ml.lang.menu.7="French_France" lcl.ml.lang.menu.7.label="Français (fr-fr)" lcl.ml.lang.menu.8="German_Germany" lcl.ml.lang.menu.8.label="Deutsch (de-de)" lcl.ml.lang.menu.9="Italian_Italy" lcl.ml.lang.menu.9.label="Italiano (it-it)" lcl.ml.lang.menu.10="Japanese_Japan" lcl.ml.lang.menu.10.label="%u65E5%u672C%u8A9E (ja-jp)" lcl.ml.lang.menu.11="Korean_Korea" lcl.ml.lang.menu.11.label="%uD55C%uAD6D%uC5B4 (ko-kr)" lcl.ml.lang.menu.12="Norwegian_Norway" lcl.ml.lang.menu.12.label="Norsk (no-no)" lcl.ml.lang.menu.13="Polish_Poland" lcl.ml.lang.menu.13.label="Polski (pl-pl)" lcl.ml.lang.menu.14="Portuguese_Portugal" lcl.ml.lang.menu.14.label="Português (pt-br)" lcl.ml.lang.menu.15="Russian_Russia" lcl.ml.lang.menu.15.label="%u0420%u0443%u0441%u0441%u043A%u0438%u0439 (ru-ru)" lcl.ml.lang.menu.16="Slovenian_Slovenia" lcl.ml.lang.menu.16.label="Slovenski (sl-si)" lcl.ml.lang.menu.17="Spanish_Spain" lcl.ml.lang.menu.17.label="Español (es-es)" lcl.ml.lang.menu.18="Swedish_Sweden" lcl.ml.lang.menu.18.label="Svenska (sv-se)" lcl.ml.lang.menu.19="Chinese_Taiwan" lcl.ml.lang.menu.19.label="%u7E41%u9AD4%u4E2D%u6587 (zh-tw)">
+        <lcl.ml.lang.menu lcl.ml.lang.menu.1="Chinese_China" lcl.ml.lang.menu.1.label="%u7B80%u4F53%u4E2D%u6587 (zh-cn)" lcl.ml.lang.menu.2="Danish_Denmark" lcl.ml.lang.menu.2.label="Dansk (da-dk)" lcl.ml.lang.menu.3="Dutch_Netherlands" lcl.ml.lang.menu.3.label="Nederlands (nl-nl)" lcl.ml.lang.menu.4="English_Canada" lcl.ml.lang.menu.4.label="English (en-ca)" lcl.ml.lang.menu.5="English_United_Kingdom" lcl.ml.lang.menu.5.label="English (en-gb)" lcl.ml.lang.menu.6="English_United_States" lcl.ml.lang.menu.6.label="English (en-us)" lcl.ml.lang.menu.7="French_France" lcl.ml.lang.menu.7.label="Fran%uFFFDais (fr-fr)" lcl.ml.lang.menu.8="German_Germany" lcl.ml.lang.menu.8.label="Deutsch (de-de)" lcl.ml.lang.menu.9="Italian_Italy" lcl.ml.lang.menu.9.label="Italiano (it-it)" lcl.ml.lang.menu.10="Japanese_Japan" lcl.ml.lang.menu.10.label="%u65E5%u672C%u8A9E (ja-jp)" lcl.ml.lang.menu.11="Korean_Korea" lcl.ml.lang.menu.11.label="%uD55C%uAD6D%uC5B4 (ko-kr)" lcl.ml.lang.menu.12="Norwegian_Norway" lcl.ml.lang.menu.12.label="Norsk (no-no)" lcl.ml.lang.menu.13="Polish_Poland" lcl.ml.lang.menu.13.label="Polski (pl-pl)" lcl.ml.lang.menu.14="Portuguese_Portugal" lcl.ml.lang.menu.14.label="Portugu%uFFFDs (pt-br)" lcl.ml.lang.menu.15="Russian_Russia" lcl.ml.lang.menu.15.label="%u0420%u0443%u0441%u0441%u043A%u0438%u0439 (ru-ru)" lcl.ml.lang.menu.16="Slovenian_Slovenia" lcl.ml.lang.menu.16.label="Slovenski (sl-si)" lcl.ml.lang.menu.17="Spanish_Spain" lcl.ml.lang.menu.17.label="Espa%uFFFDol (es-es)" lcl.ml.lang.menu.18="Swedish_Sweden" lcl.ml.lang.menu.18.label="Svenska (sv-se)" lcl.ml.lang.menu.19="Chinese_Taiwan" lcl.ml.lang.menu.19.label="%u7E41%u9AD4%u4E2D%u6587 (zh-tw)">
         </lcl.ml.lang.menu>
       </lcl.ml.lang>
     </lcl.ml>
@@ -327,8 +331,10 @@
       </qos.ip.rtp>
     </qos.ip>
   </qos>
+  <!--
   <reg reg.1.server.1.address="" reg.1.server.1.failOver.failBack.mode="newRequests" reg.1.server.1.failOver.failBack.timeout="3600" reg.1.server.1.failOver.failRegistrationOn="1" reg.1.server.1.failOver.onlySignalWithRegistered="1" reg.1.server.1.failOver.reRegisterOn="0" reg.1.server.1.port="0" reg.1.server.1.register="1" reg.1.server.1.transport="DNSnaptr" reg.1.server.1.useOutboundProxy="1" reg.1.server.H323.1.address="" reg.1.server.H323.1.expires="3600" reg.1.server.H323.1.port="0" reg.1.server.2.address="" reg.1.server.2.failOver.failBack.mode="newRequests" reg.1.server.2.failOver.failBack.timeout="3600" reg.1.server.2.failOver.failRegistrationOn="1" reg.1.server.2.failOver.onlySignalWithRegistered="1" reg.1.server.2.failOver.reRegisterOn="0" reg.1.server.2.port="0" reg.1.server.2.register="1" reg.1.server.2.transport="DNSnaptr" reg.1.server.2.useOutboundProxy="1" reg.1.server.H323.2.address="" reg.1.server.H323.2.expires="3600" reg.1.server.H323.2.port="0" reg.2.server.1.address="" reg.2.server.1.failOver.failBack.mode="newRequests" reg.2.server.1.failOver.failBack.timeout="3600" reg.2.server.1.failOver.failRegistrationOn="1" reg.2.server.1.failOver.onlySignalWithRegistered="1" reg.2.server.1.failOver.reRegisterOn="0" reg.2.server.1.port="0" reg.2.server.1.register="1" reg.2.server.1.transport="DNSnaptr" reg.2.server.1.useOutboundProxy="1" reg.2.server.H323.1.address="" reg.2.server.H323.1.expires="3600" reg.2.server.H323.1.port="0" reg.2.server.2.address="" reg.2.server.2.failOver.failBack.mode="newRequests" reg.2.server.2.failOver.failBack.timeout="3600" reg.2.server.2.failOver.failRegistrationOn="1" reg.2.server.2.failOver.onlySignalWithRegistered="1" reg.2.server.2.failOver.reRegisterOn="0" reg.2.server.2.port="0" reg.2.server.2.register="1" reg.2.server.2.transport="DNSnaptr" reg.2.server.2.useOutboundProxy="1" reg.2.server.H323.2.address="" reg.2.server.H323.2.expires="3600" reg.2.server.H323.2.port="0">
   </reg>
+  -->
   <saf saf.1="" saf.2="">
   </saf>
   <se se.stutterOnVoiceMail="1">
@@ -498,8 +504,8 @@
       <tcpIpApp.port.rtp tcpIpApp.port.rtp.filterByIp="1" tcpIpApp.port.rtp.filterByPort="0" tcpIpApp.port.rtp.forceSend="0" tcpIpApp.port.rtp.mediaPortRangeStart="2222">
       </tcpIpApp.port.rtp>
     </tcpIpApp.port>
-    <tcpIpApp.sntp tcpIpApp.sntp.address="216.45.57.38" tcpIpApp.sntp.gmtOffset="0" tcpIpApp.sntp.resyncPeriod="86400">
-      <tcpIpApp.sntp.address tcpIpApp.sntp.address.overrideDHCP="0">
+    <tcpIpApp.sntp tcpIpApp.sntp.address="216.45.57.38" tcpIpApp.sntp.gmtOffset="-21600" tcpIpApp.sntp.resyncPeriod="86400">
+      <tcpIpApp.sntp.address tcpIpApp.sntp.address.overrideDHCP="1">
       </tcpIpApp.sntp.address>
       <tcpIpApp.sntp.daylightSavings tcpIpApp.sntp.daylightSavings.enable="1" tcpIpApp.sntp.daylightSavings.fixedDayEnable="0">
         <tcpIpApp.sntp.daylightSavings.start tcpIpApp.sntp.daylightSavings.start.date="8" tcpIpApp.sntp.daylightSavings.start.dayOfWeek="1" tcpIpApp.sntp.daylightSavings.start.month="3" tcpIpApp.sntp.daylightSavings.start.time="2">
@@ -511,7 +517,7 @@
           </tcpIpApp.sntp.daylightSavings.stop.dayOfWeek>
         </tcpIpApp.sntp.daylightSavings.stop>
       </tcpIpApp.sntp.daylightSavings>
-      <tcpIpApp.sntp.gmtOffset tcpIpApp.sntp.gmtOffset.overrideDHCP="0">
+      <tcpIpApp.sntp.gmtOffset tcpIpApp.sntp.gmtOffset.overrideDHCP="1">
       </tcpIpApp.sntp.gmtOffset>
     </tcpIpApp.sntp>
   </tcpIpApp>
@@ -1083,4 +1089,4 @@
     <webutility.language webutility.language.plcmServerUrl="http://downloads.polycom.com/voice/software/languages/">
     </webutility.language>
   </webutility>
-</polycomConfig>
+</polycomConfig>
\ No newline at end of file
diff --git a/resources/templates/provision/polycom/vvx/web.cfg b/resources/templates/provision/polycom/vvx/web.cfg
new file mode 100644
index 0000000000..fbd3b56698
--- /dev/null
+++ b/resources/templates/provision/polycom/vvx/web.cfg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Application SIP PrairieDog 4.1.4.7430 20-Mar-13 14:12 -->
+<!-- Created 06-05-2014 22:29 -->
+<PHONE_CONFIG>
+<WEB
+	nat.keepalive.interval="15"
+/>
+</PHONE_CONFIG>
\ No newline at end of file
diff --git a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
index 2d77f11db7..5a199451af 100644
--- a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
@@ -16,8 +16,8 @@
 		reg.1.auth.optimizedInFailover="" 
 		reg.1.server.1.address="{$server_address_1}" 
 		reg.1.server.1.port="5060" 
-		reg.1.server.1.transport="DNSnaptr" 
-		reg.1.server.2.transport="DNSnaptr" 
+		reg.1.server.1.transport="TCPOnly" 
+		reg.1.server.2.transport="TCPOnly" 
 		reg.1.server.1.expires="" 
 		reg.1.server.1.expires.overlap="" 
 		reg.1.server.1.register="" 
@@ -36,8 +36,8 @@
 		reg.2.auth.optimizedInFailover="" 
 		reg.2.server.1.address="{$server_address_2}" 
 		reg.2.server.1.port="5060" 
-		reg.2.server.1.transport="DNSnaptr" 
-		reg.2.server.2.transport="DNSnaptr" 
+		reg.2.server.1.transport="TCPOnly" 
+		reg.2.server.2.transport="TCPOnly" 
 		reg.2.server.1.expires="" 
 		reg.2.server.1.expires.overlap="" 
 		reg.2.server.1.register="" 
@@ -56,8 +56,8 @@
 		reg.3.auth.optimizedInFailover="" 
 		reg.3.server.1.address="{$server_address_3}" 
 		reg.3.server.1.port="5060" 
-		reg.3.server.1.transport="DNSnaptr" 
-		reg.3.server.2.transport="DNSnaptr" 
+		reg.3.server.1.transport="TCPOnly" 
+		reg.3.server.2.transport="TCPOnly" 
 		reg.3.server.1.expires="" 
 		reg.3.server.1.expires.overlap="" 
 		reg.3.server.1.register="" 
@@ -87,4 +87,3 @@
 				msg.mwi.6.callBack=""/> 
 	</msg>
 </phone1>
-
diff --git a/resources/templates/provision/polycom/vvx/{$mac}.cfg b/resources/templates/provision/polycom/vvx/{$mac}.cfg
index 8241084b1c..37cc305866 100644
--- a/resources/templates/provision/polycom/vvx/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx/{$mac}.cfg
@@ -4,7 +4,8 @@
 <!-- Configuration File Management white paper available from: -->
 <!-- http://www.polycom.com/common/documents/whitepapers/configuration_file_management_on_soundpoint_ip_phones.pdf -->
 <!-- $RCSfile$  $Revision: 135829 $ -->
-<APPLICATION APP_FILE_PATH="sip.ld" CONFIG_FILES="{$mac}-registration.cfg, features.cfg, site.cfg" MISC_FILES="" LOG_FILE_DIRECTORY="" OVERRIDES_DIRECTORY="" CONTACTS_DIRECTORY="" LICENSE_DIRECTORY="" USER_PROFILES_DIRECTORY="" CALL_LISTS_DIRECTORY="">
+<APPLICATION APP_FILE_PATH="sip.ld" CONFIG_FILES="[PHONE_MAC_ADDRESS]-site.cfg,[PHONE_MAC_ADDRESS]-registration.cfg" MISC_FILES="" LOG_FILE_DIRECTORY="" OVERRIDES_DIRECTORY="" CONTACTS_DIRECTORY="" LICENSE_DIRECTORY="" USER_PROFILES_DIRECTORY="" CALL_LISTS_DIRECTORY="">
+<!--
    <APPLICATION_SPIP300 APP_FILE_PATH_SPIP300="sip_213.ld" CONFIG_FILES_SPIP300="phone1_213.cfg, sip_213.cfg"/>
    <APPLICATION_SPIP500 APP_FILE_PATH_SPIP500="sip_213.ld" CONFIG_FILES_SPIP500="phone1_213.cfg, sip_213.cfg"/>
    <APPLICATION_SPIP301 APP_FILE_PATH_SPIP301="sip_318.ld" CONFIG_FILES_SPIP301="phone1_318.cfg, sip_318.cfg"/>
@@ -17,4 +18,5 @@
    <APPLICATION_SPIP670 APP_FILE_PATH_SPIP670="sip_403.ld" CONFIG_FILES_SPIP670=""/>
    <APPLICATION_SSIP4000 APP_FILE_PATH_SSIP4000="sip_318.ld" CONFIG_FILES_SSIP4000="phone1_318.cfg, sip_318.cfg"/>
    <APPLICATION_SSIP7000 APP_FILE_PATH_SSIP7000="sip_403.ld" CONFIG_FILES_SSIP7000=""/>
+-->
 </APPLICATION>