Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

drop pakacke: yast2-mail-alias, move the module MailAlias into the

              package yast2
new package:  yast2-mail-plugins contains the plugins for yast2-users
              if configuring postfix with ldap backend  

svn path=/trunk/mail/; revision=37825
  • Loading branch information...
commit 019d90554a056e9ce1e309e2cb21b36aa19ca3ec 1 parent 2b53a52
@varkoly varkoly authored
Showing with 36 additions and 12 deletions.
  1. +1 −1  SUBDIRS
  2. +20 −3 src/MailServer.ycp
  3. +15 −8 yast2-mail.spec.in
View
2  SUBDIRS
@@ -1 +1 @@
-agents doc permissions src users-plugin testsuite
+agents doc permissions src users-plugin
View
23 src/MailServer.ycp
@@ -161,6 +161,7 @@ global boolean cyrus_installed = false;
global boolean postfix_installed = false;
global boolean fetchmail_installed = false;
global boolean sasl_installed = false;
+global boolean plugins_installed = false;
/*
* Help funktion to check the DNS Settings
@@ -311,6 +312,7 @@ global boolean Read() {
ldap_installed = Installed("yast2-ldap-client");
amavis_installed = Installed("amavisd-new");
sasl_installed = Installed("cyrus-sasl-plain");
+ plugins_installed = Installed("yast2-mail-plugins");
if(!ldap_installed) {
Report::Error(_("You have not installed all needed packages.") +
@@ -334,9 +336,6 @@ global boolean Read() {
return false;
}
}
- if( SCR::Read(.target.size, "/var/adm/yast2-mail-server-used") < 0) {
- YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,MailServer::LDAPDefaults);
- }
if(!sasl_installed)
{
if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") +
@@ -352,6 +351,24 @@ global boolean Read() {
return false;
}
}
+ if(!plugins_installed)
+ {
+ if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") +
+ "\n yast2-mail-plugins \n",
+ Label::InstallButton(),
+ Label::AbortButton(),
+ `focus_yes))
+ {
+ Package::DoInstall(["yast2-mail-plugins"]);
+ }
+ else
+ {
+ return false;
+ }
+ }
+ if( SCR::Read(.target.size, "/var/adm/yast2-mail-server-used") < 0) {
+ YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,MailServer::LDAPDefaults);
+ }
NetworkDevices::Read();
map<string,map> TMP = NetworkDevices::Export("modem");
View
23 yast2-mail.spec.in
@@ -7,7 +7,6 @@ BuildRequires: yast2-perl-bindings yast2-ldap-server yast2-users yast2-network
Requires: yast2 >= 2.11.11
Requires: yast2-users
Requires: yast2-ldap
-Requires: perl-NetxAP
Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp
Provides: yast2-config-sendmail yast2-config-sendmail-devel
@@ -20,6 +19,8 @@ Provides: yast2-trans-mail
Obsoletes: yast2-trans-mail
Provides: yast2-mail-server
Obsoletes: yast2-mail-server
+Provides: yast2-mail-aliases
+Obsoletes: yast2-mail-aliases
BuildArchitectures: noarch
@@ -28,11 +29,12 @@ Summary: Configuration of mail
%description
-
-%package aliases
-Summary: Configuration of mail, alias handling
+%package plugins
+Summary: Plugins for the yast2 users modul for enterprise mail server configuration.
Group: System/YaST
+Requires: perl-NetxAP
-%description aliases
+%description plugins
-
@PREP@
@@ -48,11 +50,10 @@ Group: System/YaST
%dir @yncludedir@/mail
@yncludedir@/mail/*
%dir @clientdir@
-@clientdir@/*
+@clientdir@/mail*
%dir @moduledir@
@moduledir@/Mail.ybc
@moduledir@/MailServer.ybc
-@moduledir@/UsersPluginMail.pm
@moduledir@/MailServer.ycp
@moduledir@/Mail.ycp
%dir @moduledir@/YaPI
@@ -94,10 +95,9 @@ Group: System/YaST
/etc/permissions.d/mail-server*
%doc @docdir@
-%files aliases
+#%files aliases
%defattr(-,root,root)
%dir @moduledir@
-@moduledir@/MailAliases.y*
@moduledir@/MailTable.pm
@moduledir@/MailTableInclude.pm
%dir @scrconfdir@
@@ -108,3 +108,10 @@ Group: System/YaST
@agentdir@/ag_fetchmailrc
@agentdir@/ag_mailtable
+%files plugins
+%defattr(-,root,root)
+%dir @moduledir@
+@moduledir@/UsersPluginMail.pm
+%dir @clientdir@
+@clientdir@/users*
+

0 comments on commit 019d905

Please sign in to comment.
Something went wrong with that request. Please try again.