From 8f1986188189fe2d363217581c839358f36817e5 Mon Sep 17 00:00:00 2001
From: nemerald-voip <58834187+nemerald-voip@users.noreply.github.com>
Date: Mon, 25 Jan 2021 10:01:42 -0800
Subject: [PATCH 1/4] Additional Polycom config parameters

---
 app/polycom/app_config.php | 80 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php
index 6af7888f81..6bf239675c 100644
--- a/app/polycom/app_config.php
+++ b/app/polycom/app_config.php
@@ -358,5 +358,85 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "French_Canada, Portuguese_Portugal, DTGerman_Germany, Null (default) to US English.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3de149e1-f61a-4d07-9bfe-177299dd625b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_platform_profile_cipher_suite";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "ALL:!aNULL:!eNULL:!IDEA:!MEDIUM:!LOW:!ADH:!LOW:!EXP:!DH:!AECDH:!PSK:!SRP:!MD5:!RC4:@STRENGTH";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enter the cipher suites to use for TLS Platform Profile 1";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d8e53e24-fbb4-4cbd-bce1-dd793d92e789";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dns_server";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the primary server to which the phone directs DNS queries.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "094f626b-5891-4a0c-a390-49c221fcb197";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dns_alt_server";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the secondary server to which the phone directs DNS queries.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ba9ad978-5c38-467b-9630-f417690b1303";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_diversion_header";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "0 (default) - If set to 0, the diversion header is not displayed. 1 - If set to 1, the diversion header is displayed if received.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3351d37d-e9b8-4c5c-96e7-0f232893895c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_keep_alive";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The keep-alive interval in seconds.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "808a4cb8-054a-416a-b473-804b84822385";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_boot_server_option";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Default";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default, Custom or Static";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "355b778a-1c6c-4ed4-ae7b-6db37b6f139a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_lldp_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Phone attempts to determine its VLAN ID and negotiate power through LLDP. 0 - disabled. 1 - enabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b19aea7a-5f3e-455c-94fe-b6b4f895a7ca";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_cdp_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "phone attempts to determine its VLAN ID and negotiate power through CDP. 0 - disabled. 1 - enabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "95a35bbe-3410-432a-b318-fbd6a490a56c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dhcp_vlan_discovery";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Fixed";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Disabled, Fixed or Custom";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be7b12ff-3172-43e1-be9a-df8da3cb6d76";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_local_admin_password";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "456";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Specify a local administrator password.";
 
 ?>

From 8510e1984aa5a7b87fc4e06ee49039d210306214 Mon Sep 17 00:00:00 2001
From: nemerald-voip <58834187+nemerald-voip@users.noreply.github.com>
Date: Mon, 25 Jan 2021 10:05:16 -0800
Subject: [PATCH 2/4] Polycom config file with more features and securities

---
 .../provision/polycom/5.x/{$mac}.cfg          | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index b3888bafb4..6c0c74f702 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -53,11 +53,22 @@
 		sec.srtp.require="{$polycom_srtp_require}"
 		{if isset($polycom_root_cert)}sec.TLS.customCaCert.5="{$polycom_root_cert}"{/if}
 		{if isset($polycom_cert_validation)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_cert_validation}"{/if}
-		{if isset($polycom_provision_cert_validate)}
+		{if isset($polycom_provision_cert_validate)} 
 		device.sec.TLS.prov.strictCertCommonNameValidation.set ="1" 
 		device.sec.TLS.prov.strictCertCommonNameValidation="{$polycom_provision_cert_validate}"
 		{/if}
+		{if isset($polycom_platform_profile_cipher_suite)} 
+		device.sec.TLS.profile.cipherSuiteDefault1.set="1"
+		device.sec.TLS.profile.cipherSuiteDefault1="0"
+		device.sec.TLS.profile.cipherSuite1.set="1"
+		device.sec.TLS.profile.cipherSuite1="{$polycom_platform_profile_cipher_suite}"
+		{/if}
+		{if isset($polycom_local_admin_password)} 
+		device.auth.localAdminPassword.set="1"
+		device.auth.localAdminPassword="{$polycom_local_admin_password}"
+		{/if}		
 	/>
+
 	<DEVICE_SETTINGS
 		device.set="1"
 		device.baseProfile.set="1"
@@ -91,6 +102,12 @@
 		device.prov.password="{$http_auth_password}"
 		device.prov.tagSerialNo.set="1"
 		device.prov.tagSerialNo="1"
+		device.prov.redunAttemptLimit.set="1"
+		device.prov.redunAttemptLimit="10"
+		device.prov.redunInterAttemptDelay.set="1"
+		device.prov.redunInterAttemptDelay="150"
+		device.prov.abortSWUpgradeAfterFailures.set="1"
+		device.prov.abortSWUpgradeAfterFailures="3"
 		{if isset($polycom_syslog_server)}
 		device.syslog.serverName.set="1"
 		device.syslog.serverName="{$polycom_syslog_server}"
@@ -174,6 +191,7 @@
 	/>
 	<MULTICAST_PAGING
 		ptt.pageMode.enable="{$polycom_page_enable}"
+		ptt.pageMode.group.1.label="Page All"
 	/>
 	<REMOTE_PACKET_CAPTURE
 		diags.pcap.enabled="0"
@@ -183,7 +201,8 @@
 		{if isset($polycom_nat_ip)}
 		nat.ip="{$polycom_nat_ip}"
 		{/if}
-		nat.keepalive.interval="30"
+		{if isset($polycom_keep_alive)}nat.keepalive.interval="{$polycom_keep_alive}"
+		{else}nat.keepalive.interval="30"{/if}
 		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
 		voIpProt.SIP.requestValidation.1.method="{$polycom_request_validation_method}"
 		voIpProt.SIP.requestValidation.1.request="{$polycom_request_validation_request}"
@@ -202,6 +221,9 @@
 		voice.volume.persist.handset="1"
 		voice.volume.persist.handsfree="1"
 		voice.volume.persist.headset="1"
+		voice.volume.persist.usbHeadset="1"
+		voice.volume.persist.bluetooth.headset="1"
+		voice.volume.persist.usb.handsfree="1"
 		feature.nonVolatileRingerVolume.enabled="1"
 		up.headsetMode="{$polycom_headset_mode}"
 		{if isset($polycom_analog_headset_option)}up.analogHeadsetOption="{$polycom_analog_headset_option}"{/if}
@@ -227,6 +249,8 @@
 		msg.mwi.{$row.line_number}.callBackMode="contact"
 		msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
 		feature.intercom.enable="{$polycom_intercom_enable}"
+		{if isset($polycom_diversion_header)}voIpProt.SIP.header.diversion.enable="{$polycom_diversion_header}"{/if}
+		
 	/>
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
@@ -245,4 +269,35 @@
 	<LANGUAGE
 		lcl.ml.lang="{$polycom_display_language}"
 	/>
+	
+	<NETWORK_SETTINGS
+		{if isset($polycom_dns_server)} 
+		device.dns.serverAddress.set="1"
+		device.dns.serverAddress="{$polycom_dns_server}"
+		{/if}
+		{if isset($polycom_dns_alt_server)} 
+		device.dns.altSrvAddress.set="1"
+		device.dns.altSrvAddress="{$polycom_dns_alt_server}"
+		{/if}
+		{if isset($polycom_boot_server_option)}
+		device.dhcp.bootSrvUseOpt.set="1"
+		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
+		{/if}
+		{if isset($polycom_boot_server_option)}
+		device.dhcp.bootSrvUseOpt.set="1"
+		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
+		{/if}
+		{if isset($polycom_lldp_enabled)}
+		device.net.lldpEnabled.set="1"
+		device.net.lldpEnabled="{$polycom_lldp_enabled}"
+		{/if}
+		{if isset($polycom_cdp_enabled)}
+		device.net.cdpEnabled.set="1"
+		device.net.cdpEnabled="{$polycom_cdp_enabled}"
+		{/if}
+		{if isset($polycom_dhcp_vlan_discovery)}
+		device.dhcp.dhcpVlanDiscUseOpt.set="1"
+		device.dhcp.dhcpVlanDiscUseOpt="{$polycom_dhcp_vlan_discovery}"
+		{/if}
+	/>
 </PHONE>

From 3e24d553d93c0742087c676d6419e779cd8f8539 Mon Sep 17 00:00:00 2001
From: nemerald-voip <58834187+nemerald-voip@users.noreply.github.com>
Date: Mon, 25 Jan 2021 10:47:59 -0800
Subject: [PATCH 3/4] Update app_config.php

---
 app/polycom/app_config.php | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php
index 6bf239675c..699198ddcf 100644
--- a/app/polycom/app_config.php
+++ b/app/polycom/app_config.php
@@ -348,7 +348,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_provision_cert_validate";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Require Provisioning Cert Validation 0=Disabled - 1=Enabled ";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5f80d126-eae1-41af-8c47-5d118ef7be50";
@@ -364,7 +364,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_platform_profile_cipher_suite";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "ALL:!aNULL:!eNULL:!IDEA:!MEDIUM:!LOW:!ADH:!LOW:!EXP:!DH:!AECDH:!PSK:!SRP:!MD5:!RC4:@STRENGTH";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enter the cipher suites to use for TLS Platform Profile 1";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d8e53e24-fbb4-4cbd-bce1-dd793d92e789";
@@ -372,7 +372,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dns_server";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the primary server to which the phone directs DNS queries.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "094f626b-5891-4a0c-a390-49c221fcb197";
@@ -380,7 +380,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dns_alt_server";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the secondary server to which the phone directs DNS queries.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ba9ad978-5c38-467b-9630-f417690b1303";
@@ -396,7 +396,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_keep_alive";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The keep-alive interval in seconds.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "808a4cb8-054a-416a-b473-804b84822385";
@@ -404,7 +404,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_boot_server_option";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Default";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default, Custom or Static";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "355b778a-1c6c-4ed4-ae7b-6db37b6f139a";
@@ -412,7 +412,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_lldp_enabled";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Phone attempts to determine its VLAN ID and negotiate power through LLDP. 0 - disabled. 1 - enabled";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b19aea7a-5f3e-455c-94fe-b6b4f895a7ca";
@@ -420,7 +420,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_cdp_enabled";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "phone attempts to determine its VLAN ID and negotiate power through CDP. 0 - disabled. 1 - enabled";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "95a35bbe-3410-432a-b318-fbd6a490a56c";
@@ -430,13 +430,5 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Fixed";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Disabled, Fixed or Custom";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be7b12ff-3172-43e1-be9a-df8da3cb6d76";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_local_admin_password";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "456";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Specify a local administrator password.";
 
 ?>

From 19f3126159200434fb8eaf1bd2e120d80b53a86b Mon Sep 17 00:00:00 2001
From: nemerald-voip <58834187+nemerald-voip@users.noreply.github.com>
Date: Mon, 25 Jan 2021 10:49:58 -0800
Subject: [PATCH 4/4] Update {$mac}.cfg

---
 resources/templates/provision/polycom/5.x/{$mac}.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 6c0c74f702..bcd08bb267 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -62,10 +62,6 @@
 		device.sec.TLS.profile.cipherSuiteDefault1="0"
 		device.sec.TLS.profile.cipherSuite1.set="1"
 		device.sec.TLS.profile.cipherSuite1="{$polycom_platform_profile_cipher_suite}"
-		{/if}
-		{if isset($polycom_local_admin_password)} 
-		device.auth.localAdminPassword.set="1"
-		device.auth.localAdminPassword="{$polycom_local_admin_password}"
 		{/if}		
 	/>