diff options
author | Ted Trask <ttrask01@yahoo.com> | 2016-04-07 21:24:16 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2016-04-07 21:24:16 +0000 |
commit | 65c835cca94fd208190570310800f56d7b0bd855 (patch) | |
tree | bc55ffd78bdc3dfedd0d287a5c90b78d8ef11856 | |
parent | 9e74f55111afa1bf79916b23679cb00acb6874ce (diff) | |
download | acf-provisioning-65c835cca94fd208190570310800f56d7b0bd855.tar.bz2 acf-provisioning-65c835cca94fd208190570310800f56d7b0bd855.tar.xz |
Spelling fix in mac parameter description
-rw-r--r-- | provisioning-scripts.lua | 2 | ||||
-rwxr-xr-x | upgradeprovisioning | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua index 91c92b6..b995d1a 100644 --- a/provisioning-scripts.lua +++ b/provisioning-scripts.lua @@ -1098,7 +1098,7 @@ mymodule.param_groups_to_params = { mymodule.provisioning_params = { "CREATE TABLE provisioning_params (param_id SERIAL PRIMARY KEY, name VARCHAR(255) UNIQUE, type VARCHAR(255), label VARCHAR(255), descr VARCHAR(255), value VARCHAR(255), seq INTEGER, regexp VARCHAR(255), validate text)", "CREATE INDEX params_name_idx ON provisioning_params (name)", - "INSERT INTO provisioning_params VALUES(default, 'mac', 'text', 'MAC Address', 'Capitalized hex digits with no puncuation', '', '1', '^%x%x%x%x%x%x%x%x%x%x%x%x$', E'local value, functions, params = ...\nvalue = string.upper(value)\nlocal others = functions.getselectresponse(\"SELECT count(*) FROM provisioning_values WHERE param_id=\\'\"..params.value.device.value.mac.param_id..\"\\' AND device_id!=\\'\"..params.value.device_id.value..\"\\' AND value=\\'\"..value..\"\\'\")\nif tonumber(others[1].count) > 0 then\n\treturn value, \"MAC Address must be unique\"\nend\nreturn value')", + "INSERT INTO provisioning_params VALUES(default, 'mac', 'text', 'MAC Address', 'Capitalized hex digits with no punctuation', '', '1', '^%x%x%x%x%x%x%x%x%x%x%x%x$', E'local value, functions, params = ...\nvalue = string.upper(value)\nlocal others = functions.getselectresponse(\"SELECT count(*) FROM provisioning_values WHERE param_id=\\'\"..params.value.device.value.mac.param_id..\"\\' AND device_id!=\\'\"..params.value.device_id.value..\"\\' AND value=\\'\"..value..\"\\'\")\nif tonumber(others[1].count) > 0 then\n\treturn value, \"MAC Address must be unique\"\nend\nreturn value')", "INSERT INTO provisioning_params VALUES(default, 'template', 'select', 'Template', '', '', '2', '', null)", "INSERT INTO provisioning_params VALUES(default, 'registrar', 'text', 'SIP Registrar', '', '', '3', '', null)", "INSERT INTO provisioning_params VALUES(default, 'digitmap', 'text', 'Digit Map', 'Phone dial pattern based on section 2.1.5 of RFC 3435, plus a comma to turn dialtone back on', '', '4', '^[*#0-9xT|,.%[%]-]*$', null)", diff --git a/upgradeprovisioning b/upgradeprovisioning index 1b74551..e6da87f 100755 --- a/upgradeprovisioning +++ b/upgradeprovisioning @@ -598,6 +598,8 @@ if [ "$version" -lt "9" ]; then psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='cybermicgain'), '$a', '$a', '$a')" provisioning done + psql -U postgres -c "UPDATE provisioning_params SET descr='Capitalized hex digits with no punctuation' WHERE descr='Capitalized hex digits with no puncuation'" provisioning + # database psql -U postgres -c "UPDATE provisioning_params SET value='9' WHERE name='databaseversion'" provisioning fi |