Author: varkoly Date: Thu Nov 25 12:33:23 2010 New Revision: 62891 URL: http://svn.opensuse.org/viewcvs/yast?rev=62891&view=rev Log: bnc#649549 - yast2-mail doesn't enable and start cyrus-imapd Modified: trunk/mail/src/Mail.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=62891&r1=62890&r2=62891&view=diff ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Thu Nov 25 12:33:23 2010 @@ -253,6 +253,7 @@ */ global define string ProbePackages () ``{ string message = ""; + boolean newcyrus = false; install_packages = []; remove_packages = []; @@ -302,11 +303,17 @@ install_packages = add(install_packages,"cyrus-imapd"); // Translators: popup message part, ends with a newline message = message + _("Cyrus-imapd, an IMAP server, will be installed.\n"); + newcyrus = true; } if( install_packages != [] ) { Package::DoInstall(install_packages); } + if( newcyrus ) + { + Service::Enable("cyrus") + Service::Start("cyrus") + } return message; } @@ -742,16 +749,19 @@ } else if (connection_type == `permanent) { + SCR::Write (.sysconfig.postfix.POSTFIX_NODAEMON, "no"); SCR::Write (nc_nd, "no"); SCR::Write (ex_di, "no"); } else if (connection_type == `dialup) { + SCR::Write (.sysconfig.postfix.POSTFIX_NODAEMON, "no"); SCR::Write (nc_nd, "yes"); SCR::Write (ex_di, "yes"); } else if (connection_type == `none) { + SCR::Write (.sysconfig.postfix.POSTFIX_NODAEMON, "no"); SCR::Write (nc_nd, "yes"); SCR::Write (ex_di, "no"); } @@ -821,6 +831,30 @@ } else if (mta == `postfix) { + if( smtp_use_TLS != "no" ) + { + string oms = outgoing_mail_server; + string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".(.*).:.*", "\\1") : oms; + string oms_port = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".*.:(.*)", "\\1") : ""; + + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? regexpsub (oms, ".(.*).", "\\1") : oms; + } + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, ".*:.*") ? regexpsub (oms, "(.*):.*", "\\1") : oms; + oms_port = regexpmatch (oms, ".*:.*") ? regexpsub (oms, ".*:(.*)", "\\1") : ""; + } + if( oms_port != "" ) + { + outgoing_mail_server = "[" + oms_no_brackets + "]:" + oms_port; + } + else + { + outgoing_mail_server = "[" + oms_no_brackets + "]"; + } + } SCR::Write (.sysconfig.postfix.POSTFIX_RELAYHOST, outgoing_mail_server); SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, smtp_use_TLS); } @@ -962,7 +996,10 @@ { enable_smtp_auth = size (smtp_auth) > 0; } - + if ( smtp_auth[0,"server"]:"" != outgoing_mail_server ) + { + smtp_auth[0,"server"]=outgoing_mail_server; + } if (mta == `sendmail) { SCR::Write (.mail.sendmail.auth.accounts, smtp_auth); Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=62891&r1=62890&r2=62891&view=diff ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Thu Nov 25 12:33:23 2010 @@ -62,7 +62,8 @@ term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future"))); string status = _("Mail server is not configured.")+"\n"+ _("Select configuration type according your personal needs")+"\n"+ - _("If you want to use sendmail as your MTA you have to use Standard configuration."); + _("If you want to use sendmail as your MTA you have to use Standard configuration.")+ + _("The Advanced configuration use LDAP as backend and will configure your system as LDAP-Client and setup an LDAP-Server if necessary."); if( first ) { tskip_ask = `VSpacing(1); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org