[yast-commit] r39654 - in /trunk/squid: src/Squid.ycp src/complex.ycp src/dialogs.ycp testsuite/tests/Squid.err testsuite/tests/Squid.out testsuite/tests/Squid.ycp testsuite/tests/SquidRead.out

Author: dfiser Date: Wed Jul 25 12:46:46 2007 New Revision: 39654 URL: http://svn.opensuse.org/viewcvs/yast?rev=39654&view=rev Log: Written most of init functions (except last 2 dialogs). Written store/del/move functions for parameters http_ports, refresh_patterns. Removed: trunk/squid/testsuite/tests/Squid.err trunk/squid/testsuite/tests/Squid.out trunk/squid/testsuite/tests/Squid.ycp Modified: trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp trunk/squid/testsuite/tests/SquidRead.out Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=39654&r1=39653&r2=39654&view=diff ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Wed Jul 25 12:46:46 2007 @@ -167,12 +167,65 @@ } +/******* ACL *******/ +global list > GetACLs() +{ + return acls; +} +/******* ACL END *******/ + +/******* HTTP_ACCESS ******/ +global list > GetHttpAccesses() +{ + return http_accesses; +} +/******* HTTP_ACCESS END ******/ +/******* SETTINGS *****/ +global map GetSettings() +{ + return settings; +} global list<string> GetSetting(string name) { return settings[name]:[]; } +global void SetSetting(string name, list value) +{ + settings[name] = value; +} +/******* SETTINGS END *****/ +/**** REFRESH PATTERN ****/ +global list > GetRefreshPatterns() +{ + return refresh_patterns; +} +global map GetRefreshPattern(integer id_item) +{ + return refresh_patterns[id_item]:$[]; +} +global void AddRefreshPattern(map data) +{ + refresh_patterns = add(refresh_patterns, data); +} +global void ModifyRefreshPattern(integer id_item, map data) +{ + refresh_patterns[id_item] = data; +} +global void DelRefreshPattern(integer id_item) +{ + refresh_patterns = remove(refresh_patterns, id_item); +} +global void MoveRefreshPattern(integer id_from, integer id_to) +{ + map tmp = refresh_patterns[id_from]:$[]; + refresh_patterns[id_from] = refresh_patterns[id_to]:$[]; + refresh_patterns[id_to] = tmp; +} +/**** REFRESH PATTERN END ****/ + +/**** HTTP PORT *****/ global list > GetHttpPorts() { return http_ports; @@ -184,7 +237,6 @@ global void AddHttpPort(map data) { http_ports = add(http_ports, data); - y2debug("====== %1",http_ports); } global void ModifyHttpPort(integer id_item, map data) { @@ -194,6 +246,7 @@ { http_ports = remove(http_ports, id_item); } +/**** HTTP PORT END *****/ /** * Same as splitstring(), but returns only non-empty strings. @@ -323,7 +376,7 @@ tmp_refresh_pattern["regexp"] = tmp[0]:""; tmp_refresh_pattern["min"] = tmp[1]:""; - tmp_refresh_pattern["percent"] = tmp[2]:""; + tmp_refresh_pattern["percent"] = deletechars(tmp[2]:"","%"); tmp_refresh_pattern["max"] = tmp[3]:""; refresh_patterns = add(refresh_patterns, tmp_refresh_pattern); @@ -389,6 +442,10 @@ }); + //special modification + settings["cache_replacement_policy"] = [mergestring(settings["cache_replacement_policy"]:[]," ")]; + settings["memory_replacement_policy"] = [mergestring(settings["memory_replacement_policy"]:[]," ")]; + return ok; } Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=39654&r1=39653&r2=39654&view=diff ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Wed Jul 25 12:46:46 2007 @@ -36,6 +36,8 @@ import "Wizard"; import "Wizard_hw"; import "Confirm"; +import "Report"; + import "Squid"; @@ -85,7 +87,24 @@ -/* Inits */ +/********************* INITS *****************/ +/** + * Do simple initialization of dialog. + * Given map has to be in form: + * $[ id_of_widget : value_on_which_has_to_be_set, + * .... + * ] + */ +void simpleInit(map m) +{ + foreach(string key, any value, m, + { + UI::ChangeWidget(`id(key), `Value, value); + }); +} + + + void InitHttpPortsTable() { list items = []; @@ -119,11 +138,129 @@ } } +void InitRefreshPatternsTable() +{ + list items = []; + integer i = 0; + foreach (map value, Squid::GetRefreshPatterns(), + { + items = add(items, `item(`id(i), value["regexp"]:"", value["min"]:"", + value["percent"]:"", value["max"]:"")); -/* Storing */ -void StoreDataFromAddEditHttpPortDialog(integer id_item) + i = i+1; + }); + + y2debug("complex::InitRefreshPatternsTable() - items: %1", items); + UI::ChangeWidget(`id("refresh_patterns"), `Items, items); + if (size(items) > 0){ + UI::ChangeWidget(`id(`edit), `Enabled, true); + UI::ChangeWidget(`id(`del), `Enabled, true); + UI::ChangeWidget(`id(`up), `Enabled, true); + UI::ChangeWidget(`id(`down), `Enabled, true); + }else{ + UI::ChangeWidget(`id(`edit), `Enabled, false); + UI::ChangeWidget(`id(`del), `Enabled, false); + UI::ChangeWidget(`id(`up), `Enabled, false); + UI::ChangeWidget(`id(`down), `Enabled, false); + } +} +void InitAddEditRefreshPatternDialog(integer id_item) { + if (id_item != nil){ + map values = Squid::GetRefreshPattern(id_item); + + UI::ChangeWidget(`id("regexp"), `Value, values["regexp"]:""); + UI::ChangeWidget(`id("min"), `Value, tointeger(values["min"]:"")); + UI::ChangeWidget(`id("percent"), `Value, tointeger(values["percent"]:"")); + UI::ChangeWidget(`id("max"), `Value, tointeger(values["max"]:"")); + UI::ChangeWidget(`id("regexp_case_insensitive"), `Value, !values["case_sensitive"]:true); + + y2debug("complex::InitAddEditRefreshPatternDialog() - values: %1",values); + } +} + +void InitCache2Dialog() +{ + map set = (map)Squid::GetSettings(); + simpleInit($[ + "cache_mem" : tointeger((set["cache_mem"]:[])[0]:""), + "cache_mem_units" : (set["cache_mem"]:[])[1]:"", + "cache_max_object_size" : tointeger((set["maximum_object_size"]:[])[0]:""), + "cache_max_object_size_units" : (set["maximum_object_size"]:[])[1]:"", + "cache_min_object_size" : tointeger((set["minimum_object_size"]:[])[0]:""), + "cache_min_object_size_units" : (set["minimum_object_size"]:[])[1]:"", + "cache_swap_low" : tointeger((set["cache_swap_low"]:[])[0]:""), + "cache_swap_high" : tointeger((set["cache_swap_high"]:[])[0]:""), + "cache_replacement_policy" : (set["cache_replacement_policy"]:[])[0]:"", + "memory_replacement_policy" : (set["memory_replacement_policy"]:[])[0]:"", + "cache_dir" : (set["cache_dir"]:[])[1]:"" + ]); + + +} +void InitCacheDirAdvancedSettingDialog() +{ + map set = (map)Squid::GetSettings(); + simpleInit($[ + //"type" : (set["cache_dir"]:[])[0]:"", + "mbytes" : tointeger((set["cache_dir"]:[])[2]:""), + "l1dirs" : tointeger((set["cache_dir"]:[])[3]:""), + "l2dirs" : tointeger((set["cache_dir"]:[])[4]:"") + ]); +} + + +void InitACLGroupsTable() +{ + list items = []; + integer i = 0; + + foreach(map value, Squid::GetACLs(), + { + items = add(items, `item(`id(i), value["name"]:"", value["type"]:"", + mergestring(value["options"]:[], " "))); + i = i+1; + }); + + UI::ChangeWidget(`id("acl"), `Items, items); + if (size(items) > 0){ + UI::ChangeWidget(`id(`edit_acl), `Enabled, true); + UI::ChangeWidget(`id(`del_acl), `Enabled, true); + }else{ + UI::ChangeWidget(`id(`edit_acl), `Enabled, false); + UI::ChangeWidget(`id(`del_acl), `Enabled, false); + } +} +void InitHttpAccessTable() +{ + list items = []; + integer i = 0; + + foreach(map value, Squid::GetHttpAccesses(), + { + items = add(items, `item(`id(i), (value["allow"]:true ? "allow" : "deny"), + mergestring(value["acl"]:[], " "))); + i = i+1; + }); + + UI::ChangeWidget(`id("http_access"), `Items, items); + if (size(items) > 0){ + UI::ChangeWidget(`id(`edit_http_access), `Enabled, true); + UI::ChangeWidget(`id(`del_http_access), `Enabled, true); + }else{ + UI::ChangeWidget(`id(`edit_http_access), `Enabled, false); + UI::ChangeWidget(`id(`del_http_access), `Enabled, false); + } +} +/********************* INITS END ****************/ + + + +/********************* STORING + DELETING ********************/ +boolean StoreDataFromAddEditHttpPortDialog(integer id_item) +{ + boolean ok = true; map data = $[ "host" : UI::QueryWidget(`id("host"), `Value), "port" : UI::QueryWidget(`id("port"), `Value), @@ -131,17 +268,123 @@ ]; y2debug("complex::StoreDataFromAddEditHttpPortDialog() - data: %1",data); - //Add - if (id_item == nil){ - Squid::AddHttpPort(data); + if (size(data["port"]:"") > 0){ + if (id_item == nil){ + Squid::AddHttpPort(data); + }else{ + Squid::ModifyHttpPort(id_item, data); + } }else{ - Squid::ModifyHttpPort(id_item, data); + Report::Error(_("Port number must not be empty.")); + ok = false; } + + return ok; } -void DelFromHttpPortsDialog(integer id_item) +void DelFromHttpPortsTable(integer id_item) { Squid::DelHttpPort(id_item); } + +boolean StoreDataFromAddEditRefreshPatternDialog(integer id_item) +{ + boolean ok = true; + map data = $[ + "regexp" : UI::QueryWidget(`id("regexp"), `Value), + "min" : tostring(UI::QueryWidget(`id("min"), `Value)), + "percent" : tostring(UI::QueryWidget(`id("percent"), `Value)), + "max" : tostring(UI::QueryWidget(`id("max"), `Value)), + "case_sensitive" : !(boolean)UI::QueryWidget(`id("regexp_case_insensitive"), `Value) + ]; + y2debug("complex::StoreDataFromAddEditRefreshPatternDialog() - data: %1", data); + + if (size(data["regexp"]:"") > 0){ + if (id_item == nil){ + Squid::AddRefreshPattern(data); + }else{ + Squid::ModifyRefreshPattern(id_item, data); + } + }else{ + Report::Error(_("Regular expression must not be empty.")); + ok = false; + } + + return ok; +} + +void DelFromRefreshPatternsTable(integer id_item) +{ + Squid::DelRefreshPattern(id_item); +} + +/** + * returns new position or nil if not moved + */ +integer MoveUpRefreshPattern(integer id_item) +{ + integer ret = nil; + + if (id_item > 0){ + Squid::MoveRefreshPattern(id_item, id_item - 1); + ret = id_item - 1; + } + return ret; +} +/** + * returns new position or nil if not moved + */ +integer MoveDownRefreshPattern(integer id_item) +{ + integer ret = nil; + + if (id_item < size(Squid::GetRefreshPatterns())-1){ + Squid::MoveRefreshPattern(id_item, id_item + 1); + ret = id_item + 1; + } + return ret; +} + + +boolean StoreDataFromCacheDirAdvancedSettingDialog() +{ + list set = Squid::GetSetting("cache_dir"); + Squid::SetSetting("cache_dir", + [set[0]:"", + set[1]:"", + tostring(UI::QueryWidget(`id("mbytes"), `Value)), + tostring(UI::QueryWidget(`id("l1dirs"), `Value)), + tostring(UI::QueryWidget(`id("l2dirs"), `Value))]); + return true; +} +boolean StoreDataFromCache2Dialog() +{ + boolean ok = true; + + string cache_dir = (string)UI::QueryWidget(`id("cache_dir"), `Value); + + if (size(cache_dir) > 0){ + list set = Squid::GetSetting("cache_dir"); + + Squid::SetSetting("cache_dir", [set[0]:"", cache_dir, set[1]:"", set[2]:"", set[3]:""]); + Squid::SetSetting("cache_mem", [tostring(UI::QueryWidget(`id("cache_mem"), `Value)), + UI::QueryWidget(`id("cache_mem_units"), `Value)]); + Squid::SetSetting("maximum_object_size", [tostring(UI::QueryWidget(`id("cache_max_object_size"), `Value)), + UI::QueryWidget(`id("cache_max_object_size_units"), `Value)]); + Squid::SetSetting("minimum_object_size", [tostring(UI::QueryWidget(`id("cache_min_object_size"), `Value)), + UI::QueryWidget(`id("cache_min_object_size_units"), `Value)]); + Squid::SetSetting("cache_swap_low", [tostring(UI::QueryWidget(`id("cache_swap_low"), `Value))]); + Squid::SetSetting("cache_swap_high", [tostring(UI::QueryWidget(`id("cache_swap_high"), `Value))]); + Squid::SetSetting("cache_replacement_policy", [UI::QueryWidget(`id("cache_replacement_policy"), `Value)]); + Squid::SetSetting("memory_replacement_policy", [UI::QueryWidget(`id("memory_replacement_policy"), `Value)]); + }else{ + ok = false; + Report::Error(_("Cache directory must not be empty.")); + } + + return ok; +} +/********************* STORING + DELETING END ********************/ + } /* vim: set sw=4 ts=4 et ft=ycp : */ Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=39654&r1=39653&r2=39654&view=diff ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Wed Jul 25 12:46:46 2007 @@ -33,7 +33,8 @@ import "Label"; import "Wizard"; -import "Squid"; + +//import "Squid"; include "squid/helps.ycp"; @@ -44,7 +45,7 @@ term sizeUnitWidget(string id) { return `ComboBox(`id(id), " ", - [`item("KB"), `item("MB")]); + [`item("B"), `item("KB"), `item("MB")]); } /** * Returns a widget with setting of units @@ -94,9 +95,10 @@ ret = false; break; }else if (ui == `ok){ - StoreDataFromAddEditHttpPortDialog(id_item); - ret = true; - break; + if (StoreDataFromAddEditHttpPortDialog(id_item)){ + ret = true; + break; + } } } @@ -110,6 +112,7 @@ any ret = nil; any http_port = nil; any tmp = nil; + integer id_item = nil; term dialog_contents = `VBox( @@ -143,10 +146,13 @@ if (AddEditHttpPortDialog(nil)) InitHttpPortsTable(); }else if (ret == `edit){ - if (AddEditHttpPortDialog((integer)UI::QueryWidget(`id("http_port"), `CurrentItem))) + id_item = (integer)UI::QueryWidget(`id("http_port"), `CurrentItem); + if (AddEditHttpPortDialog(id_item)){ InitHttpPortsTable(); + UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); + } }else if (ret == `del){ - DelFromHttpPortsDialog((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)); + DelFromHttpPortsTable((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)); InitHttpPortsTable(); } } @@ -155,7 +161,7 @@ } -boolean AddEditRefreshPattern(any id_item) +boolean AddEditRefreshPatternDialog(integer id_item) { boolean ret = false; any ui = nil; @@ -170,15 +176,15 @@ `CheckBox(`id("regexp_case_insensitive"), _("Case Insensitive")) ), `HBox( - `Bottom(`IntField(`id("min"), _("Min"), 1, 99999, 10)), + `Bottom(`IntField(`id("min"), _("Min"), 0, 99999, 0)), `Bottom(`Label(_("minutes"))) ), `HBox( - `Bottom(`IntField(`id("percent"), _("Percent"), 1, 99999, 10)), + `Bottom(`IntField(`id("percent"), _("Percent"), 0, 99999, 0)), `Bottom(`Label("%")) ), `HBox( - `Bottom(`IntField(`id("max"), _("Max"), 1, 99999, 10)), + `Bottom(`IntField(`id("max"), _("Max"), 0, 99999, 0)), `Bottom(`Label(_("minutes"))) ), @@ -192,6 +198,8 @@ UI::OpenDialog(`opt(`decorated), contents); + InitAddEditRefreshPatternDialog(id_item); + while (true){ ui = UI::UserInput(); @@ -199,8 +207,10 @@ ret = false; break; }else if (ui == `ok){ - ret = true; - break; + if (StoreDataFromAddEditRefreshPatternDialog(id_item)){ + ret = true; + break; + } } } @@ -210,11 +220,13 @@ any CacheDialog(){ any ret = nil; + integer id_item = 0; term dialog_contents = `VBox( `Left(`Label( _("Refresh Patterns"))), `HBox( - `Table(`id("refresh_patterns"), `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)), + `Table(`id("refresh_patterns"), `opt(`keepSorting), + `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)), `VBox( `PushButton(`id(`up), Label::UpButton()), `PushButton(`id(`down), Label::DownButton()) @@ -223,7 +235,7 @@ `HBox( `PushButton(`id(`add), Label::AddButton()), `PushButton(`id(`del), Label::DeleteButton()), - `PushButton(`id(`modify), Label::EditButton()), + `PushButton(`id(`edit), Label::EditButton()), `HStretch() ) ); @@ -231,6 +243,8 @@ Wizard::SetContentsButtons(_("Squid - Cache Setting"), dialog_contents, "help", Label::BackButton(), Label::NextButton()); + InitRefreshPatternsTable(); + while (true){ ret = UI::UserInput(); @@ -242,7 +256,29 @@ break; continue; }else if (ret == `add){ - AddEditRefreshPattern(nil); + if (AddEditRefreshPatternDialog(nil)) + InitRefreshPatternsTable(); + }else if (ret == `edit){ + id_item = (integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem); + if (AddEditRefreshPatternDialog(id_item)){ + InitRefreshPatternsTable(); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); + } + }else if (ret == `del){ + DelFromRefreshPatternsTable((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); + InitRefreshPatternsTable(); + }else if (ret == `up){ + id_item = MoveUpRefreshPattern((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); + if (id_item != nil){ + InitRefreshPatternsTable(); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); + } + }else if (ret == `down){ + id_item = MoveDownRefreshPattern((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); + if (id_item != nil){ + InitRefreshPatternsTable(); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); + } } } @@ -256,7 +292,7 @@ `VBox( `Left(`Label( _("Cache Directory Advanced Setting"))), - `ComboBox(`id("type"), _("Type"), []), + //`ComboBox(`id("type"), _("Type"), []), `HBox( `IntField(`id("mbytes"), _("Size"), 1, 99999, 10), `Bottom(`Label(_("MB"))) @@ -274,6 +310,9 @@ UI::OpenDialog(contents); + + InitCacheDirAdvancedSettingDialog(); + while (true){ ui = UI::UserInput(); @@ -281,8 +320,10 @@ ret = false; break; }else if (ui == `ok){ - ret = true; - break; + if (StoreDataFromCacheDirAdvancedSettingDialog()){ + ret = true; + break; + } } } @@ -304,19 +345,19 @@ ), `VSpacing(), `HBox( - `HSquash(`IntField(`id("cache_max_object_size"), _("Max Object Size"), 1, 99999, 10)), + `HSquash(`IntField(`id("cache_max_object_size"), _("Max Object Size"), 0, 99999, 0)), sizeUnitWidget("cache_max_object_size_units"), `HSpacing(3), - `HSquash(`IntField(`id("cache_min_object_size"), _("Min Object Size"), 1, 99999, 10)), + `HSquash(`IntField(`id("cache_min_object_size"), _("Min Object Size"), 0, 99999, 0)), sizeUnitWidget("cache_min_object_size_units"), `HStretch() ), `VSpacing(), `VSquash(`HBox( - `HSquash(`IntField(`id("cache_swap_low"), _("Swap Low-Water Mark"), 1, 100, 10)), + `HSquash(`IntField(`id("cache_swap_low"), _("Swap Low-Water Mark"), 0, 100, 0)), `Bottom(`Label("%")), `HSpacing(3), - `HSquash(`IntField(`id("cache_swap_high"), _("Swap High-Water Mark"), 1, 100, 10)), + `HSquash(`IntField(`id("cache_swap_high"), _("Swap High-Water Mark"), 0, 100, 0)), `Bottom(`Label("%")), `HStretch() )), @@ -342,15 +383,17 @@ Wizard::SetContentsButtons("Squid - Cache Setting 2", dialog_contents, "help", Label::BackButton(), Label::NextButton()); - UI::ChangeWidget(`id("cache_mem_units"), `Items, [`item("B"),`item("KB",true), `item("MB")]); + InitCache2Dialog(); while (true){ ret = UI::UserInput(); y2debug("Cache2Dialog(): ret == %1",ret); - if (ret == `next || ret == `back) break; - else if (ret == `abort || ret == `cancel){ + if (ret == `next || ret == `back){ + if (StoreDataFromCache2Dialog()) + break; + }else if (ret == `abort || ret == `cancel){ //if (Popup::ReallyAbort(true)) break; break; continue; @@ -372,7 +415,7 @@ `HBox( `PushButton(`id(`add_acl), Label::AddButton()), `PushButton(`id(`del_acl), Label::DeleteButton()), - `PushButton(`id(`modify_acl), Label::EditButton()), + `PushButton(`id(`edit_acl), Label::EditButton()), `HStretch() ), @@ -380,7 +423,7 @@ `Left(`Label(_("Access Control"))), `HBox( - `Table(`id("http_access"), `header(_("Allow/Deny"), _("ACL Groups"))), + `Table(`id("http_access"), `opt(`keepSorting), `header(_("Allow/Deny"), _("ACL Groups"))), `HSquash(`VBox( `HWeight(1, `PushButton(`id(`up_http_access), Label::UpButton())), `HWeight(1, `PushButton(`id(`down_http_access), Label::DownButton())) @@ -397,6 +440,9 @@ Wizard::SetContentsButtons(_("Squid - Access Control Setting"), dialog_contents, "help", Label::BackButton(), Label::NextButton()); + InitACLGroupsTable(); + InitHttpAccessTable(); + while (true){ ret = UI::UserInput(); Modified: trunk/squid/testsuite/tests/SquidRead.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/SquidRead.out?rev=39654&r1=39653&r2=39654&view=diff ============================================================================== --- trunk/squid/testsuite/tests/SquidRead.out (original) +++ trunk/squid/testsuite/tests/SquidRead.out Wed Jul 25 12:46:46 2007 @@ -2,7 +2,7 @@ Read .squid."http_port" ["localhost:3128", "80 transparent"] Return true Dump Squid::http_ports -Return [$["host":"localhost", "port":3128], $["host":"", "port":80, "transparent":true]] +Return [$["host":"localhost", "port":"3128"], $["host":"", "port":"80", "transparent":true]] Dump ------------------------------ Dump Squid::readHttpAccesses() Read .squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT !SSL_ports", "allow localhost", "allow localhost_public", "deny all"] @@ -14,7 +14,7 @@ Read .squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"] Return true Dump Squid::refresh_patterns -Return [$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20%", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0%", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20%", "regexp":"."]] +Return [$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20", "regexp":"."]] Dump ------------------------------ Dump Squid::readACLs() Read .squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src \t \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port 443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port 443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"] @@ -74,11 +74,11 @@ Dump Squid::acls Return [$["name":"QUERY", "options":["cgi-bin", "\\?"], "type":"urlpath_regex"], $["name":"apache", "options":["Server", "^Apache"], "type":"rep_header"], $["name":"all", "options":["0.0.0.0/0.0.0.0"], "type":"src"], $["name":"manager", "options":["cache_object"], "type":"proto"], $["name":"localhost", "options":["127.0.0.1/255.255.255.255"], "type":"src"], $["name":"localhost_public", "options":["10.20.1.241/255.255.255.255"], "type":"src"], $["name":"to_localhost", "options":["127.0.0.0/8"], "type":"dst"], $["name":"SSL_ports", "options":["443"], "type":"port"], $["name":"Safe_ports", "options":["80"], "type":"port"], $["name":"Safe_ports", "options":["21"], "type":"port"], $["name":"Safe_ports", "options":["443"], "type":"port"], $["name":"Safe_ports", "options":["70"], "type":"port"], $["name":"Safe_ports", "options":["210"], "type":"port"], $["name":"Safe_ports", "options":["1025-65535"], "type":"port"], $["name":"Safe_ports", "options":["280"], "type":"port"], $["name":"Safe_ports", "options":["488"], "type":"port"], $["name":"Safe_ports", "options":["591"], "type":"port"], $["name":"Safe_ports", "options":["777"], "type":"port"], $["name":"CONNECT", "options":["CONNECT"], "type":"method"]] Dump Squid::refresh_patterns -Return [$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20%", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0%", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20%", "regexp":"."]] +Return [$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20", "regexp":"."]] Dump Squid::http_accesses Return [$["acl":["manager", "localhost"], "allow":true], $["acl":["manager"], "allow":false], $["acl":["!Safe_ports"], "allow":false], $["acl":["CONNECT", "!SSL_ports"], "allow":false], $["acl":["localhost"], "allow":true], $["acl":["localhost_public"], "allow":true], $["acl":["all"], "allow":false]] Dump Squid::http_ports -Return [$["host":"localhost", "port":3128], $["host":"", "port":80, "transparent":true]] +Return [$["host":"localhost", "port":"3128"], $["host":"", "port":"80", "transparent":true]] Dump ------------------------------ Dump ----testing defualt values---- Dump Squid:Read() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org