summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2016-12-28 21:30:05 +0000
committerTed Trask <ttrask01@yahoo.com>2017-01-01 03:51:37 +0000
commit6e2cf4da8bee8dbc180c6011ecf98b70a215bf71 (patch)
tree5f6deeb65b7f0b4b2e82297f74ca365ea60e090c
parent4408dbcd47dbcf88a5b4edce878a979cbaf7163e (diff)
downloadacf-provisioning-6e2cf4da8bee8dbc180c6011ecf98b70a215bf71.tar.bz2
acf-provisioning-6e2cf4da8bee8dbc180c6011ecf98b70a215bf71.tar.xz
Add Polycom clockenable parameter
-rw-r--r--config/process_put.lua4
-rw-r--r--config/templates/polycom-template.lua3
-rw-r--r--provisioning-scripts.lua2
-rwxr-xr-xupgradeprovisioning2
4 files changed, 11 insertions, 0 deletions
diff --git a/config/process_put.lua b/config/process_put.lua
index 0194e46..83eaeb4 100644
--- a/config/process_put.lua
+++ b/config/process_put.lua
@@ -57,6 +57,10 @@ function process_polycom()
elseif string.find(n, "24HourClock") then
params.value.device.value.militarytimeenable.value = (v == "1")
+ -- this attribute enables local clock
+ elseif string.find(n, "localClockEnabled") then
+ params.value.device.value.clockenable.value = (v == "1")
+
else
-- search attribute name for reg_name like "reg.1."
-- and for rest like "fwdStatus"
diff --git a/config/templates/polycom-template.lua b/config/templates/polycom-template.lua
index 6a874ff..e3a4313 100644
--- a/config/templates/polycom-template.lua
+++ b/config/templates/polycom-template.lua
@@ -21,6 +21,7 @@
timezone
urldialingenable
militarytimeenable
+ clockenable
displaylang
}
regX (where X is a number 1-34) = {
@@ -97,6 +98,8 @@ end
-- apply settings in 'device' parameter above
xml_attr({ 'device.net.etherModePC.set' }, '1')
+xml_attr({ 'up.localClockEnabled' }, values.device.clockenable)
+
-- Enable 24-hour Clock Mode
if values.device.militarytimeenable then
xml_attr({'lcl.datetime.time.24HourClock'}, true)
diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua
index 934497a..169cca1 100644
--- a/provisioning-scripts.lua
+++ b/provisioning-scripts.lua
@@ -488,6 +488,7 @@ mymodule.param_groups_to_params = {
"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='pcportenable'), null, false)",
"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='urldialingenable'), null, false)",
"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='militarytimeenable'), null, false)",
+ "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='clockenable'), null, false)",
"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='displaylang'), null, false)",
"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Snom Device'), (SELECT param_id FROM provisioning_params WHERE name='template'), '/etc/provisioning/templates/snom-template.lua', false)",
"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Snom Device'), (SELECT param_id FROM provisioning_params WHERE name='mac'), null, true)",
@@ -1230,6 +1231,7 @@ mymodule.provisioning_params = {
"INSERT INTO provisioning_params VALUES(default, 'urldialingenable', 'boolean', 'URL Dialing Enable', '', 'false', '12', '', null)",
"INSERT INTO provisioning_params VALUES(default, 'provpollingtime', 'select', 'Provisioning polling start time', 'The provisioning server is automatically polled for upgrades at random between the start time and one hour later', '02:00', '13', '', null)",
"INSERT INTO provisioning_params VALUES(default, 'militarytimeenable', 'boolean', '24-hour Clock Mode Enable', '', 'false', '14', '', null)",
+ "INSERT INTO provisioning_params VALUES(default, 'clockenable', 'boolean', 'Clock Enable', '', 'true', '14', '', null)",
"INSERT INTO provisioning_params VALUES(default, 'displaylang', 'select', 'Display screen language', 'Check if your phone supports the selected language', '', '15', '', null)",
"INSERT INTO provisioning_params VALUES(default, 'algoringvol', 'select', 'Ring Volume (Algo)', '', '5', '16', '', null)",
"INSERT INTO provisioning_params VALUES(default, 'algopagevol', 'select', 'Page Volume (Algo)', '', '5', '17', '', null)",
diff --git a/upgradeprovisioning b/upgradeprovisioning
index a06df73..79c7d15 100755
--- a/upgradeprovisioning
+++ b/upgradeprovisioning
@@ -744,6 +744,8 @@ if [ "$version" -lt "12" ]; then
psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='displaylang'), 'French (Canada)', 'French_Canada', '8')" provisioning
psql -U postgres -c "UPDATE provisioning_options SET label='French (France)' WHERE param_id=(SELECT param_id FROM provisioning_params WHERE name='displaylang') AND value='French_France'" provisioning
+ psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'clockenable', 'boolean', 'Clock Enable', '', 'true', '14', '', null)" provisioning
+ psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='clockenable'), null, false)" provisioning
# database
psql -U postgres -c "UPDATE provisioning_params SET value='12' WHERE name='databaseversion'" provisioning