[yast-commit] r40235 - in /trunk/squid: agents/squid.scr src/Makefile.am src/Squid.ycp src/Squid2.pm src/complex.ycp src/dialogs.ycp src/squid.desktop src/squid_auto.ycp src/store_del.ycp src/wizards.ycp

Author: dfiser Date: Mon Aug 13 17:25:56 2007 New Revision: 40235 URL: http://svn.opensuse.org/viewcvs/yast?rev=40235&view=rev Log: Squid::Write function done. Module Squid is set as modified only when its was really modified. When user click on abort button and Squid is modified, he's asked if he really want to quit. When changed option cache_dir right permissions are set. Work on autoyast has begun. Removed: trunk/squid/src/Squid2.pm Modified: trunk/squid/agents/squid.scr trunk/squid/src/Makefile.am trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/squid.desktop trunk/squid/src/squid_auto.ycp trunk/squid/src/store_del.ycp trunk/squid/src/wizards.ycp Modified: trunk/squid/agents/squid.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/agents/squid.scr?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/agents/squid.scr (original) +++ trunk/squid/agents/squid.scr Mon Aug 13 17:25:56 2007 @@ -23,7 +23,7 @@ $["params" : [ $["match" : ["^[ \t]*([^ \t]+)[ \t]+(.+)[ \t]*$", "%s %s"]] ], - "comments" : ["[ \t]*#.*$", "^[ \t]*$", "[ \t]*$"], + "comments" : ["#.*$", "^[ \t]*$"], "options" : ["flat", "repeat_names", "global_values"] ] ) Modified: trunk/squid/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/Makefile.am (original) +++ trunk/squid/src/Makefile.am Mon Aug 13 17:25:56 2007 @@ -22,7 +22,6 @@ module_DATA = \ Squid.ycp \ - Squid2.pm \ SquidACL.ycp \ SquidErrorMessages.ycp Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Mon Aug 13 17:25:56 2007 @@ -39,6 +39,7 @@ import "Report"; import "Summary"; import "Message"; +import "Service"; /** * Defines path used in SCR::Read/Write functions @@ -144,12 +145,113 @@ } +global void SetDefaultValues() +{ + http_ports = [$["host" : "", + "port" : "3128", + "transparent" : false]]; + acls = [ + $[ "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":"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" ] + ]; + http_accesses = [ + $[ "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":[ "all" ], + "allow":false ] + ]; + refresh_patterns = [ + $[ "case_sensitive":true, + "max":"10080", + "min":"1440", + "percent":"20", + "regexp":"^ftp:" ], + $[ "case_sensitive":true, + "max":"1440", + "min":"1440", + "percent":"0", + "regexp":"^gopher:" ], + $[ "case_sensitive":true, + "max":"4320", + "min":"0", + "percent":"20", + "regexp":"." ] + ]; + settings = parameters; +} -global boolean Modified(){ + +global boolean GetModified(){ return modified; } +global void SetModified() +{ + y2debug("Squid::SetModified() - Squid modified"); + modified = true; +} + /** */ @@ -165,16 +267,15 @@ * Abort function * return boolean return true if abort */ -global boolean() AbortFunction = Modified; +global boolean() AbortFunction = GetModified; /** * Abort function * @return boolean return true if abort */ global define boolean Abort() ``{ - if(AbortFunction != nil) - { - return AbortFunction () == true; + if (AbortFunction != nil){ + return AbortFunction () == true; } return false; } @@ -211,6 +312,7 @@ global void AddACL(string name, string type, list<string> options) { + SetModified(); acls = add(acls, $[ "name" : name, "type" : type, "options" : options]); @@ -219,15 +321,20 @@ global void ModifyACL(integer id_item, string name, string type, list<string> options) { if (id_item >= 0 && id_item < size(acls)){ - acls[id_item] = $[ "name" : name, - "type" : type, - "options" : options]; + map tmp = $[ "name" : name, + "type" : type, + "options" : options]; + if (tmp != acls[id_item]:$[]){ + SetModified(); + acls[id_item] = tmp; + } } } global void DelACL(integer id_item) { if (id_item >= 0 && id_item < size(acls)){ + SetModified(); acls = remove(acls, id_item); } } @@ -369,6 +476,7 @@ global void AddHttpAccess(boolean allow, list<string> acl) { + SetModified(); http_accesses = add(http_accesses, $["allow" : allow, "acl" : acl]); } @@ -376,14 +484,20 @@ global void ModifyHttpAccess(integer id_item, boolean allow, list<string> acl) { if (id_item >= 0 && id_item < size(http_accesses)){ - http_accesses[id_item] = $["allow" : allow, - "acl" : acl]; + map tmp = $["allow" : allow, + "acl" : acl]; + + if (tmp != http_accesses[id_item]:$[]){ + SetModified(); + http_accesses[id_item] = tmp; + } } } global void DelHttpAccess(integer id_item) { if (id_item >= 0 && id_item < size(http_accesses)){ + SetModified(); http_accesses = remove(http_accesses, id_item); } } @@ -391,8 +505,10 @@ global void MoveHttpAccess(integer id_from, integer id_to) { if (id_from >= 0 && id_from < size(http_accesses) - && id_to >= 0 && id_to < size(http_accesses)){ + && id_to >= 0 && id_to < size(http_accesses) + && id_from != id_to){ + SetModified(); map tmp = http_accesses[id_from]:$[]; http_accesses[id_from] = http_accesses[id_to]:$[]; http_accesses[id_to] = tmp; @@ -413,7 +529,12 @@ global void SetSetting(string name, list value) { - settings[name] = value; + list tmp = value; + + if (tmp != settings[name]:[]){ + SetModified(); + settings[name] = value; + } } /******* SETTINGS END *****/ @@ -431,6 +552,7 @@ global void AddRefreshPattern(string regexp, string min, string percent, string max, boolean case_sensitive) { + SetModified(); refresh_patterns = add(refresh_patterns, $[ "regexp" : regexp, "min" : min, "percent" : percent, @@ -441,17 +563,22 @@ global void ModifyRefreshPattern(integer id_item, string regexp, string min, string percent, string max, boolean case_sensitive) { if (id_item >= 0 && id_item < size(refresh_patterns)){ - refresh_patterns[id_item] = $[ "regexp" : regexp, - "min" : min, - "percent" : percent, - "max" : max, - "case_sensitive" : case_sensitive]; + map tmp = $[ "regexp" : regexp, + "min" : min, + "percent" : percent, + "max" : max, + "case_sensitive" : case_sensitive]; + if (tmp != refresh_patterns[id_item]:$[]){ + SetModified(); + refresh_patterns[id_item] = tmp; + } } } global void DelRefreshPattern(integer id_item) { if (id_item >= 0 && id_item < size(refresh_patterns)){ + SetModified(); refresh_patterns = remove(refresh_patterns, id_item); } } @@ -459,8 +586,10 @@ global void MoveRefreshPattern(integer id_from, integer id_to) { if (id_from >= 0 && id_from < size(refresh_patterns) - && id_to >= 0 && id_to < size(refresh_patterns)){ + && id_to >= 0 && id_to < size(refresh_patterns) + && id_from != id_to){ + SetModified(); map tmp = refresh_patterns[id_from]:$[]; refresh_patterns[id_from] = refresh_patterns[id_to]:$[]; refresh_patterns[id_to] = tmp; @@ -481,6 +610,7 @@ global void AddHttpPort(string host, string port, boolean transparent) { + SetModified(); http_ports = add(http_ports, $["host" : host, "port" : port, "transparent" : transparent]); @@ -489,20 +619,29 @@ global void ModifyHttpPort(integer id_item, string host, string port, boolean transparent) { if (id_item >= 0 && id_item < size(http_ports)){ - http_ports[id_item] = $["host" : host, + map tmp = $["host" : host, "port" : port, "transparent" : transparent]; + if (tmp != http_ports[id_item]:$[]){ + SetModified(); + http_ports[id_item] = tmp; + } } } global void DelHttpPort(integer id_item) { if (id_item >= 0 && id_item < size(http_ports)){ + SetModified(); http_ports = remove(http_ports, id_item); } } /**** HTTP PORT END *****/ + + +/******************** READ **********************/ + /** * Verify and repair list of ACLs if something's wrong. */ @@ -780,6 +919,28 @@ return ok; } +boolean readAllSettings() +{ + boolean ok = true; + + if (!readHttpPorts()) ok = false; + Progress::NextStep(); + + if (!readRefreshPatterns()) ok = false; + Progress::NextStep(); + + if (!readACLs()) ok = false; + Progress::NextStep(); + + if (!readHttpAccesses()) ok = false; + Progress::NextStep(); + + if (!readRestSetting()) ok = false; + Progress::NextStep(); + + return ok; +} + /** * Read all squid settings * @return true on success @@ -790,101 +951,266 @@ Progress::New(_("Initializing squid Configuration"), " ", 5, - [_("Read the settings of Http Ports"), - _("Read the settings of Refresh Patterns"), - _("Read the settings of ACLs"), - _("Read the settings of Http Accesses"), - _("Read the rest settings")], + [_("Read the settings.")], [_("Reading the setting ...")], ""); if(Abort()) return false; Progress::NextStage(); - if (!readHttpPorts()) ok = false; - Progress::NextStage(); - - if (!readRefreshPatterns()) ok = false; - Progress::NextStage(); - - if (!readACLs()) ok = false; - Progress::NextStage(); + ok = readAllSettings(); - if (!readHttpAccesses()) ok = false; - Progress::NextStage(); - - if (!readRestSetting()) ok = false; - Progress::NextStage(); - - y2debug("================ Setting ======================"); + y2milestone("================ Setting ======================"); y2debug("Squid::Read - http_ports: %1",http_ports); y2debug("Squid::Read - http_accesses: %1", http_accesses); y2debug("Squid::Read - acls: %1", acls); y2debug("Squid::Read - refresh_patterns: %1", refresh_patterns); y2debug("Squid::Read - settings: %1", settings); - y2debug("================ Setting END =================="); + y2milestone("================ Setting END =================="); /* Error message */ if(!ok) Report::Error(_("Cannot read configuration file.")); - return true; + return ok; +} +/******************** READ END ******************/ + + + +/******************** WRITE *********************/ + + +boolean writeHttpPorts() +{ + boolean ok = true; + list<string> scr = []; + string tmp = ""; + + foreach (map value, http_ports, + { + tmp = value["host"]:""; + if (size(value["host"]:"") > 0) tmp = tmp + ":"; + tmp = tmp + value["port"]:""; + if (value["transparent"]:false) tmp = tmp + " transparent"; + + scr = add(scr, tmp); + }); + + y2debug("Squid::Write - http_port: %1", scr); + if (!SCR::Write(add(squid_path, "http_port"), scr)) + ok = false; + + return ok; +} + +boolean writeACLs() +{ + boolean ok = true; + list<string> scr = []; + string tmp = ""; + + foreach (map value, acls, + { + tmp = value["name"]:""; + tmp = tmp + " " + value["type"]:""; + tmp = tmp + " " + mergestring(value["options"]:[], " "); + scr = add(scr, tmp); + }); + + y2debug("Squid::Write - acl: %1", scr); + if (!SCR::Write(add(squid_path, "acl"), scr)) + ok = false; + + return ok; +} + + +boolean writeHttpAccesses() +{ + boolean ok = true; + list<string> scr = []; + string tmp = ""; + + foreach (map value, http_accesses, + { + if (value["allow"]:true){ + tmp = "allow"; + }else{ + tmp = "deny"; + } + tmp = tmp + " " + mergestring(value["acl"]:[], " "); + scr = add(scr, tmp); + }); + + y2debug("Squid::Write - http_access: %1", scr); + if (!SCR::Write(add(squid_path, "http_access"), scr)) + ok = false; + + return ok; +} + + +boolean writeRefreshPatterns() +{ + boolean ok = true; + list<string> scr = []; + string tmp = ""; + + foreach (map value, refresh_patterns, + { + tmp = ""; + if (!value["case_sensitive"]:false) tmp = "-i "; + tmp = tmp + value["regexp"]:""; + tmp = tmp + " " + value["min"]:""; + tmp = tmp + " " + value["percent"]:""; + tmp = tmp + " " + value["max"]:""; + scr = add(scr, tmp); + }); + + y2debug("Squid::Write - refresh_pattern: %1", scr); + if (!SCR::Write(add(squid_path, "refresh_pattern"), scr)) + ok = false; + + return ok; } + +boolean writeRestSetting() +{ + boolean ok = true; + string tmp = ""; + list<string> setting = nil; + + foreach (string key, list value, parameters, + { + tmp = mergestring(settings[key]:[], " "); + if (size(tmp) > 0){ + y2debug("Squid::Write - %1: %2", key, tmp); + if (!SCR::Write(add(squid_path, key), [tmp])){ + y2error("Squid::Write - cannot write %1 setting", key); + ok = false; + } + }else{ + y2debug("Squid::Write - %1: %2", key, nil); + if (!SCR::Write(add(squid_path, key), nil)){ + y2error("Squid::Write - cannot write %1 setting", key); + ok = false; + } + } + }); + + return ok; +} + +boolean writeAllSettings() +{ + if (!GetModified()){ + y2debug("Squid::Write - no setting to write, because nothing's changed"); + return true; + } + boolean ok = true; + + y2milestone("Squid::writeAllSettings started"); + + if (!writeHttpPorts()) ok = false; + if (!writeACLs()) ok = false; + if (!writeHttpAccesses()) ok = false; + if (!writeRefreshPatterns()) ok = false; + if (!writeRestSetting()) ok = false; + + if (ok){ + if (!SCR::Write(squid_path, nil)){ + y2error("Squid::Write - cannot write settings: `Write(%1, nil)", squid_path); + ok = false; + } + } + + y2milestone("Squid::writeAllSettings finished"); + + return ok; +} + + +boolean startService() +{ + boolean ok = true; + //verify config file + //if ((integer)SCR::Execute(.target.bash, "squid -k parse") != 0){ + // y2error("Squid::Write - startService - 'squid -k parse' failed"); + // return false; + //} + + if (Service::Status("squid") != 0){ + if (!Service::Start("squid")){ + ok = false; + Report::Error(Message::CannotStartService("squid")); + } + }else{ + if (!Service::Reload("squid")){ + ok = false; + Report::Error(Message::CannotRestartService("squid")); + } + } + + return ok; +} + + /** * Write all squid settings * @return true on success */ global boolean Write() { + boolean ok = true; - /* Squid read dialog caption */ - string caption = _("Saving squid Configuration"); - - // TODO FIXME And set the right number of stages - integer steps = 2; - - integer sl = 500; - sleep(sl); - - // TODO FIXME Names of real stages // We do not set help text here, because it was set outside - Progress::New(caption, " ", steps, [ - /* Progress stage 1/2 */ - _("Write the settings"), - /* Progress stage 2/2 */ - _("Run SuSEconfig") - ], [ - /* Progress step 1/2 */ - _("Writing the settings..."), - /* Progress step 2/2 */ - _("Running SuSEconfig..."), - /* Progress finished */ - _("Finished") - ], - "" - ); + Progress::New(_("Saving Squid Configuration"), + " ", + 2, + [ + /* Progress stage 1/2 */ + _("Write the settings"), + /* Progress stage 2/2 */ + _("Start Service") + ], + [ + /* Progress step 1/2 */ + _("Writing the settings..."), + /* Progress step 2/2 */ + _("Starting Service..."), + /* Progress finished */ + _("Finished") + ], + "" + ); // write settings if(Abort()) return false; Progress::NextStage(); - /* Error message */ - if(false) Report::Error (_("Cannot write settings.")); - sleep(sl); - // run SuSEconfig + if(!writeAllSettings()){ + Report::Error (_("Cannot write settings.")); + ok = false; + } + + // start Service if(Abort()) return false; Progress::NextStage (); - /* Error message */ - if(false) Report::Error (Message::SuSEConfigFailed()); - sleep(sl); + if (!write_only){ + if(!startService()) ok = false; + } if(Abort()) return false; /* Progress finished */ Progress::NextStage(); - sleep(sl); if(Abort()) return false; - return true; + return ok; } +/******************** WRITE END *****************/ + + + /** * Get all squid settings from the first parameter @@ -892,8 +1218,28 @@ * @param settings The YCP structure to be imported. * @return boolean True on success */ -global boolean Import (map settings) { - // TODO FIXME: your code here (fill the above mentioned variables)... +global boolean Import (map sett) { + if (sett == $[]){ + SetDefaultValues(); + SetModified(); + return true; + } + if (!haskey(sett, "http_ports") || + !haskey(sett, "acls") || + !haskey(sett, "http_accesses") || + !haskey(sett, "refresh_patterns") || + !haskey(sett, "settings")){ + + return false; + } + + http_ports = (list >)sett["http_ports"]:[]; + acls = (list >)sett["acls"]:[]; + http_accesses = (list >)sett["http_accesses"]:[]; + refresh_patterns = (list >)sett["refresh_patterns"]:[]; + settings = (map)sett["settings"]:$[]; + SetModified(); + return true; } @@ -903,8 +1249,11 @@ * @return map Dumped settings (later acceptable by Import ()) */ global map Export () { - // TODO FIXME: your code here (return the above mentioned variables)... - return $[]; + return $[ "http_ports" : http_ports, + "acls" : acls, + "http_accesses" : http_accesses, + "refresh_patterns" : refresh_patterns, + "settings" : settings ]; } /** @@ -912,6 +1261,7 @@ * @return summary of the current configuration */ global list Summary() { + string summary = ""; // TODO FIXME: your code here... /* Configuration summary text for autoyast */ return [ _("Configuration summary..."), [] ]; @@ -933,8 +1283,7 @@ * @return map with 2 lists. */ global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; + return $[ "install":["squid"], "remove":[] ]; } /* EOF */ Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Mon Aug 13 17:25:56 2007 @@ -46,16 +46,8 @@ -/** - * Return a modification status - * @return true if data was modified - */ -boolean Modified() { - return Squid::Modified(); -} - boolean ReallyAbort() { - return !Squid::Modified() || Popup::ReallyAbort(true); + return !Squid::GetModified() || Popup::ReallyAbort(true); } boolean PollAbort() { @@ -68,8 +60,8 @@ */ symbol ReadDialog() { Wizard::RestoreHelp(HELPS["read"]:""); - // Squid::AbortFunction = PollAbort; - //if (!Confirm::MustBeRoot()) return `abort; + Squid::AbortFunction = PollAbort; + if (!Confirm::MustBeRoot()) return `abort; boolean ret = Squid::Read(); return ret ? `next : `abort; } @@ -80,7 +72,7 @@ */ symbol WriteDialog() { Wizard::RestoreHelp(HELPS["write"]:""); - // Squid::AbortFunction = PollAbort; + Squid::AbortFunction = PollAbort; boolean ret = Squid::Write(); return ret ? `next : `abort; } Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Mon Aug 13 17:25:56 2007 @@ -43,6 +43,15 @@ include "squid/store_del.ycp"; +boolean reallyAbort() +{ + if (!Squid::GetModified()) + return true; + if (Popup::ReallyAbort(true)) + return true; + return false; +} + /** * Returns a widget with setting of units */ @@ -94,8 +103,7 @@ if (ret == `next) break; else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; + if (reallyAbort()) break; continue; }else if (ret == `add){ if (AddEditHttpPortDialog(nil)) @@ -152,8 +160,7 @@ if (ret == `next || ret == `back) break; else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; + if (reallyAbort()) break; continue; }else if (ret == `add){ if (AddEditRefreshPatternDialog(nil)) @@ -251,8 +258,7 @@ if (StoreDataFromCache2Dialog()) break; }else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; + if (reallyAbort()) break; continue; }else if (ret == `cache_dir){ CacheDirAdvancedSettingDialog(); @@ -314,8 +320,7 @@ if (ret == `next || ret == `back) break; else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; + if (reallyAbort()) break; continue; }else if (ret == `add_acl){ if (AddEditACLDialog(nil)){ @@ -421,8 +426,7 @@ if(StoreDataFromLoggingFrame() && StoreDataFromTimeoutsFrame()) break; }else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; + if (reallyAbort()) break; continue; }else if (ret == `access_log_browse){ tmp = UI::AskForExistingFile("/var/log", "*", "Access Log"); @@ -471,8 +475,7 @@ if (StoreDataFromMiscellaneousDialog()) break; }else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; + if (reallyAbort()) break; continue; } } Modified: trunk/squid/src/squid.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid.desktop?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/squid.desktop (original) +++ trunk/squid/src/squid.desktop Mon Aug 13 17:25:56 2007 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library X-KDE-RootOnly=true @@ -8,10 +8,10 @@ X-KDE-Library=yast2 X-SuSE-YaST-Call=squid -X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Group=Net_advanced X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true -X-SuSE-YaST-AutoInst= +X-SuSE-YaST-AutoInst=all X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=squid @@ -20,5 +20,5 @@ Exec=/sbin/yast2 squid Name=Squid -GenericName=squid +GenericName=Configure a Squid cache proxy server X-KDE-SubstituteUID=true Modified: trunk/squid/src/squid_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid_auto.ycp?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/squid_auto.ycp (original) +++ trunk/squid/src/squid_auto.ycp Mon Aug 13 17:25:56 2007 @@ -102,6 +102,13 @@ ret = Squid::Write(); Progress::set (progress_orig); } +else if (func == "SetModified"){ + Squid::SetModified(); + ret = true; +} +else if (func == "GetModified"){ + ret = Squid::GetModified(); +} /* Unknown function */ else { y2error("Unknown function: %1", func); @@ -116,3 +123,4 @@ /* EOF */ } +/* vim: set sw=4 ts=4 et ft=ycp : */ Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Mon Aug 13 17:25:56 2007 @@ -34,6 +34,7 @@ import "Label"; import "Report"; import "FileUtils"; +import "Popup"; import "Squid"; import "SquidACL"; @@ -152,10 +153,31 @@ tostring(UI::QueryWidget(`id("l2dirs"), `Value))]); return true; } + +/** + * Function which sets permissions 'chmod 750' and 'chown squid:root' + * to directory dir if exists. + * If dir does not exist, function returns true; + */ +boolean setWritePremissionsToCacheDir(string dir) +{ + if (!FileUtils::IsDirectory(dir)){ + y2debug("store_del::checkWritePremissionsCacheDir() - '%1' is not directory", dir); + return true; + } + + if ((integer)SCR::Execute(.target.bash, "chown squid:root " + dir) != 0 || + (integer)SCR::Execute(.target.bash, "chmod 750 " + dir) != 0){ + return (Popup::ContinueCancel(sformat(_("Unable to set correct permissions to directory %1."), dir))); + } + + return true; +} + boolean StoreDataFromCache2Dialog() { boolean ok = true; - + list squid_cache_dir = Squid::GetSetting("cache_dir"); string cache_dir = (string)UI::QueryWidget(`id("cache_dir"), `Value); if (size(cache_dir) == 0){ @@ -165,10 +187,13 @@ ok = false; } - if (ok){ - list set = Squid::GetSetting("cache_dir"); + if (ok && !setWritePremissionsToCacheDir(cache_dir)){ + ok = false; + } - Squid::SetSetting("cache_dir", [set[0]:"", cache_dir, set[1]:"", set[2]:"", set[3]:""]); + if (ok){ + Squid::SetSetting("cache_dir", [squid_cache_dir[0]:"", cache_dir, squid_cache_dir[2]:"", + squid_cache_dir[3]:"", squid_cache_dir[4]:""]); 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)), @@ -377,8 +402,6 @@ /******** LOGGING AND TIMEOUTS DIALOG ***********/ -//TODO: Here must be control, if is possible to create each log file (if it's not -// possible it causes breakdown of squid). boolean StoreDataFromLoggingFrame() { boolean ok = true; Modified: trunk/squid/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/wizards.ycp?rev=40235&r1=40234&r2=40235&view=diff ============================================================================== --- trunk/squid/src/wizards.ycp (original) +++ trunk/squid/src/wizards.ycp Mon Aug 13 17:25:56 2007 @@ -93,8 +93,8 @@ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainSequence() ) -// "write" : [ ``( WriteDialog() ), true ] + "main" : ``( MainSequence() ), + "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ @@ -105,12 +105,12 @@ ], "main" : $[ `abort : `abort, - `next : `next - ] /*, + `next : "write" + ], "write" : $[ `abort : `abort, `next : `next - ]*/ + ] ]; Wizard::CreateDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org