diff --git a/app/scripts/resources/classes/scripts.php b/app/scripts/resources/classes/scripts.php index cab875b62b..f9df3b19ac 100644 --- a/app/scripts/resources/classes/scripts.php +++ b/app/scripts/resources/classes/scripts.php @@ -225,8 +225,8 @@ class scripts { $tmp .= " expire.directory = \"3600\";\n"; $tmp .= " expire.dialplan = \"3600\";\n"; $tmp .= " expire.languages = \"3600\";\n"; - $tmp .= " expire.sofia_conf = \"3600\";\n"; - $tmp .= " expire.acl_conf = \"3600\";\n"; + $tmp .= " expire.sofia = \"3600\";\n"; + $tmp .= " expire.acl = \"3600\";\n"; $tmp .= "\n"; $tmp .= "--set xml_handler\n"; $tmp .= " xml_handler = {}\n"; diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index 1255488575..898dcb89a4 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -312,8 +312,8 @@ include "root.php"; $tmp .= " expire.directory = \"3600\";\n"; $tmp .= " expire.dialplan = \"3600\";\n"; $tmp .= " expire.languages = \"3600\";\n"; - $tmp .= " expire.sofia_conf = \"3600\";\n"; - $tmp .= " expire.acl_conf = \"3600\";\n"; + $tmp .= " expire.sofia = \"3600\";\n"; + $tmp .= " expire.acl = \"3600\";\n"; $tmp .= "\n"; $tmp .= "--set xml_handler\n"; $tmp .= " xml_handler = {}\n"; diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua index dbdba378f0..bc739429c5 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua @@ -42,6 +42,11 @@ --set the cache if (XML_STRING == "-ERR NOT FOUND") or (XML_STRING == "-ERR CONNECTION FAILURE") then + --set a default value + if (expire["acl"] == nil) then + expire["acl"]= "3600"; + end + --connect to the database require "resources.functions.database_handle"; dbh = database_handle('system'); @@ -103,7 +108,7 @@ dbh:release(); --set the cache - result = trim(api:execute("memcache", "set configuration:acl.conf '"..XML_STRING:gsub("'", "'").."' "..expire["acl_conf"])); + result = trim(api:execute("memcache", "set configuration:acl.conf '"..XML_STRING:gsub("'", "'").."' "..expire["acl"])); --send the xml to the console if (debug["xml_string"]) then diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua index e26555ab29..af45ad6f84 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua @@ -35,6 +35,11 @@ --set the cache if (XML_STRING == "-ERR NOT FOUND") or (XML_STRING == "-ERR CONNECTION FAILURE") then + --set a default value + if (expire["sofia"] == nil) then + expire["sofia"]= "3600"; + end + --connect to the database require "resources.functions.database_handle"; dbh = database_handle('system'); @@ -258,7 +263,7 @@ dbh:release(); --set the cache - result = trim(api:execute("memcache", "set configuration:sofia.conf:" .. hostname .." '"..XML_STRING:gsub("'", "'").."' "..expire["sofia_conf"])); + result = trim(api:execute("memcache", "set configuration:sofia.conf:" .. hostname .." '"..XML_STRING:gsub("'", "'").."' "..expire["sofia"])); --send the xml to the console if (debug["xml_string"]) then