Author: varkoly
Date: Sat Jul 26 08:16:36 2008
New Revision: 49427
URL: http://svn.opensuse.org/viewcvs/yast?rev=49427&view=rev
Log:
after setting up a local ldap-server we configure us as ldap client
implementing spam learning extensions
Modified:
trunk/mail/src/mail-server_dialogs.ycp
trunk/mail/src/mail-server_helps.ycp
trunk/mail/src/mail-server_ldap-setup.ycp
Modified: trunk/mail/src/mail-server_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=49427&r1=49426&r2=49427&view=diff
==============================================================================
--- trunk/mail/src/mail-server_dialogs.ycp (original)
+++ trunk/mail/src/mail-server_dialogs.ycp Sat Jul 26 08:16:36 2008
@@ -128,9 +128,7 @@
Ldap::LDAPInit();
LDAPSettings = (map ) Ldap::Export();
//tell Ldap module to create the default objects:
- if ( LDAPSettings [ "ldap_server" ]:"" == "" ) LDAPSettings [ "ldap_server" ] = "localhost";
- if ( LDAPSettings [ "ldap_server" ]:"" == "" ) LDAPSettings [ "ldap_server" ] = true;
- LDAPSettings [ "start_ldap" ] = true;
+ LDAPSettings [ "start_ldap" ] = true;
LDAPSettings [ "create_ldap" ] = true;
Ldap::Import(LDAPSettings);
//write the settings:
@@ -661,9 +659,11 @@
list<string> RBLList = (list<string>) MailServer::MailPrevention["RBLList"]:[];
list > AccessList = (list >) MailServer::MailPrevention["AccessList"]:[];
boolean VirusScanning = (boolean)MailServer::MailPrevention["VirusScanning"]:false;
+ boolean SpamLearning = (boolean)MailServer::MailPrevention["SpamLearning "]:false;
boolean BasicProtectionOff = false;
boolean BasicProtectionMedium = false;
boolean BasicProtectionHard = true;
+
if(BasicProtection == "off"){
BasicProtectionOff = true;
BasicProtectionHard = false;
@@ -685,9 +685,16 @@
RBLItems = add(RBLItems,my_item);
});
+ term SpamL = `Left(`CheckBox (`id(`SpamLearning), `opt(`disabled), _("Configure Spam Learning Extension"), false));
+ if( (string)MailServer::MailLocalDelivery["Type"]:"" == "cyrus" )
+ {
+ SpamL = `Left(`CheckBox (`id(`SpamLearning), `opt(`notify), _("Configure Spam Learning Extension"), SpamLearning));
+ }
term content = `VBox (
`Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)),
`VSpacing (1),
+ SpamL,
+ `VSpacing (1),
`Frame(_("SPAM Prevention"),
`HBox(
`HWeight(7,
@@ -1405,6 +1412,11 @@
MailServer::MailPrevention["Changed"] = true;
continue;
}
+ if( ret == `SpamLearning ) {
+ MailServer::MailPrevention["Changed"] = true;
+ UI::ChangeWidget(`id(`VirusScanning), `Value, true);
+ continue;
+ }
if(ret == `RBLAdd) {
string NewRLBServer = RBLAdd();
if( NewRLBServer != "") {
@@ -1440,7 +1452,8 @@
});
}
MailServer::MailPrevention["BasicProtection"] = (string)UI::QueryWidget(`id(`BasicProtection), `CurrentButton);
- MailServer::MailPrevention["VirusScanning"] = (boolean) UI::QueryWidget(`id(`VirusScanning), `Value);
+ MailServer::MailPrevention["VirusScanning"] = (boolean) UI::QueryWidget(`id(`VirusScanning), `Value);
+ MailServer::MailPrevention["SpamLearnig"] = (boolean) UI::QueryWidget(`id(`SpamLearning), `Value);
title = _("Mail Server SPAM Basic Prevention Configuration");
content = MailPreventionDialog(CID,CIDRBL);
helptext = HELPS["MailPrevention"]:"Bla Bla Bla";
Modified: trunk/mail/src/mail-server_helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_helps.ycp?rev=49427&r1=49426&r2=49427&view=diff
==============================================================================
--- trunk/mail/src/mail-server_helps.ycp (original)
+++ trunk/mail/src/mail-server_helps.ycp Sat Jul 26 08:16:36 2008
@@ -76,16 +76,27 @@
</p>
"),
- /* MailPrevention dialog help 1/2 */
+ /* MailPrevention dialog help 1/3 */
"MailPrevention" : _("<p><b><big>SPAM Prevention</big></b><br>
Postfix offers a variety of parameters that limit the delivery of unsolicited commercial e-mail (UCE).
In this dialog, configure this settings. For example, set access lists or RBL
(real-time blackhole list) name servers.
<br></p>
") +
- /* MailPrevention dialog help 2/2 */
+ /* MailPrevention dialog help 2/3 */
_("<p><b><big>Start Virus Scanner AMAVIS:</big></b><br>
-If you start the virus scanner AMAVIS, do not forget to install a virus scanner engine.
+If you start the virus scanner AMAVIS, your e-mails will be scanned for viruses and and for spams.
+The virus scanner engine <b>Clamavd</b> and the spam finder <b>SpamAssassin</b> will be installed
+and configured too. You can install other (comerciel) virus scanner engine.
+</p>
+"), +
+ /* MailPrevention dialog help 3/3 */
+_("<p><b><big>Configure Spam Learning Extension:</big></b><br>
+The spam learning extension can only configured if the local delivery method <b>cyrus imapd</b> is.
+In this case 2 shared folder <b>NesSpam</b> <b>NoSpam</b> will be created. In this folders can put
+anyone e-mails. E-mails which was not detected by the <b>SpamAssassin</b> you can put into the
+folder <p>NewSpam</p>. If you want your spam finder works good you have to put non spam mails into
+the folder <p>NoSpam</p> too. The e-mails in this folder can not be read by anyone.
</p>
"),
Modified: trunk/mail/src/mail-server_ldap-setup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_ldap-setup.ycp?rev=49427&r1=49426&r2=49427&view=diff
==============================================================================
--- trunk/mail/src/mail-server_ldap-setup.ycp (original)
+++ trunk/mail/src/mail-server_ldap-setup.ycp Sat Jul 26 08:16:36 2008
@@ -86,9 +86,15 @@
if(contains(args,"local"))
{
map LDB = MailServerLDAP::ConfigureLDAPServer();
- SCR::Write(.sysconfig.ldap.BASE_CONFIG_DN,LDB["suffix"]:"");
+ SCR::Write(.sysconfig.ldap.BASE_CONFIG_DN,"ou=ldapconfig,"+LDB["suffix"]:"");
SCR::Write(.sysconfig.ldap.BIND_DN,LDB["rootdn"]:"");
SCR::Write(.sysconfig.ldap,nil);
+ SCR::Write (add (.etc.ldap_conf.v."/etc/ldap.conf","host"), ["localhost"]);
+ SCR::Write (add (.etc.ldap_conf.v."/etc/ldap.conf","base"), [ LDB["suffix"]:""]);
+ SCR::Write (add (.etc.ldap_conf.v."/etc/ldap.conf","ldap_version"), ["3"]);
+ //SCR::Write (add (.etc.ldap_conf.v."/etc/ldap.conf","ldap_version"), ["3"]);
+ //SCR::Write (add (.etc.ldap_conf.v."/etc/ldap.conf","ssl"), ["start_tls"]);
+ SCR::Write(.etc.ldap_conf, nil);
}
return true;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
