Author: varkoly Date: Tue Jul 12 16:54:06 2011 New Revision: 64783 URL: http://svn.opensuse.org/viewcvs/yast?rev=64783&view=rev Log: Code clean up. Remove senceles tests Create the directory /var/db/dkim/ Modified: branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp Modified: branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl?rev=64783&r1=64782&r2=64783&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/agents/setup_dkim_verifying.pl Tue Jul 12 16:54:06 2011 @@ -15,7 +15,7 @@ #Generate the key if( ! -e "/var/db/dkim/$DOMAIN.pem" ){ print "Creating /var/db/dkim/$DOMAIN.pem\n"; - system( "amavisd genrsa /var/db/dkim/$DOMAIN.pem"); + system( "mkdir -p /var/db/dkim/; amavisd genrsa /var/db/dkim/$DOMAIN.pem;"); } #Introduce key into /etc/amavisd.conf Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp?rev=64783&r1=64782&r2=64783&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/Mail.ycp Tue Jul 12 16:54:06 2011 @@ -79,7 +79,7 @@ /** * Use a virus scanner (AMaViS). * amavisd-new (mta-independent) must be installed. - * It will be installed if amavis_allowed and it is not installed. + * It will be installed if is not installed. */ global boolean use_amavis = false; @@ -89,10 +89,6 @@ */ global boolean use_dkim = false; - /** - * Is amavis available on the installation media? - */ - global boolean amavis_allowed = true; /** * Domains for locally delivered mail. @@ -273,24 +269,8 @@ if (! Package::Installed ("clamav")) { - // #115295 - // Amavis alone will block incoming mail if no scanner is found - // We ship clamav but not on opensuse - // Clamav can work without clamav-db.rpm if set up manually - // so we do not check Installed "clamav-db" - y2milestone ("clamav not installed"); - if (! Package::AvailableAll (["clamav", "clamav-db"])) - { - // error popup. - Report::Error (_("AMaViS needs a virus scanner such as ClamAV -to do the actual scanning, but ClamAV was not found. -Configure a scanner manually.")); - } - else - { - install_packages = add (install_packages, "clamav"); - install_packages = add (install_packages, "clamav-db"); - } + install_packages = add (install_packages, "clamav"); + message = message + _("ClamAV, a virus scanner engine, will be installed.\n"); } } @@ -432,12 +412,8 @@ } // amavis - string amavis_pkg = "amavisd-new"; - amavis_allowed = PackageSystem::Installed (amavis_pkg) || - Mode::commandline (); - // || PackageSystem::Available (amavis_pkg); - use_amavis = amavis_allowed && (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes"); - use_dkim = use_amavis && (SCR::Read (.sysconfig.amavis.USE_DKIM) == "yes"); + use_amavis = (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes"); + use_dkim = use_amavis && (SCR::Read (.sysconfig.amavis.USE_DKIM) == "yes"); // local_domains string ld_s = ""; @@ -661,7 +637,6 @@ create_config = true; listen_remote = true; connection_type = `dialup; - amavis_allowed = true; use_amavis = true; use_dkim = true; // good example? Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp?rev=64783&r1=64782&r2=64783&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/ui.ycp Tue Jul 12 16:54:06 2011 @@ -256,22 +256,10 @@ ) ); - boolean amavis_allowed = Mail::amavis_allowed; - - term amavis_t = nil; - term dkim_t = nil; - if (amavis_allowed) - { - amavis_t = `Left (WJ_MakeWidget (`use_amavis)); - widgets = add (widgets, `use_amavis); - dkim_t = `Left (WJ_MakeWidget (`use_dkim)); - widgets = add (widgets, `use_dkim); - } - else - { - amavis_t = `Empty (`id (`use_amavis)); - dkim_t = `Empty (`id (`use_dkim)); - } + term amavis_t = `Left (WJ_MakeWidget (`use_amavis)); + widgets = add (widgets, `use_amavis); + term dkim_t = `Left (WJ_MakeWidget (`use_dkim)); + widgets = add (widgets, `use_dkim); contents = `HSquash ( `VBox ( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org