Author: varkoly Date: Mon Jul 20 10:42:27 2009 New Revision: 58117 URL: http://svn.opensuse.org/viewcvs/yast?rev=58117&view=rev Log: bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings Modified: trunk/mail/package/yast2-mail.changes trunk/mail/src/YaPI/MailServer.pm Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?rev=58117&r1=58116&r2=58117&view=diff ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Mon Jul 20 10:42:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 20 10:41:06 CEST 2009 - varkoly@suse.de + +- bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings +- alias map ldap search must be sub + +------------------------------------------------------------------- Tue Apr 14 12:42:18 CEST 2009 - varkoly@suse.de - bnc#490688 â rename mail server module from "Mail Transfer Agent" to "Mail Server" Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=58117&r1=58116&r2=58117&view=diff ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Mon Jul 20 10:42:27 2009 @@ -2960,7 +2960,16 @@ write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_folder.cf, ldap:/etc/postfix/ldapalias_maps.cf'); + my $alias_maps = read_attribute($MainCf,'alias_maps'); + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf'; + } + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf'; + } + write_attribute($MainCf,'alias_maps',$alias_maps); check_ldap_configuration('transport_maps',$ldapMap); check_ldap_configuration('smtp_tls_per_site',$ldapMap); check_ldap_configuration('masquerade_domains',$ldapMap); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org