3 files changed, 24 insertions, 3 deletions
diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index e13e86b5..8a4394df 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -1,5 +1,5 @@
 class postfix {
-    package { ['postfix', 'nail']: }
+    package { postfix: }
 
     service { 'postfix':
         subscribe => Package['postfix'],
@@ -10,4 +10,15 @@ class postfix {
         content => '',
         notify  => Service['postfix'],
     }
+
+    file { '/etc/ssl/postfix/':
+        ensure => directory,
+    }
+
+    openssl::self_signed_splitted_cert { "${::hostname}.${::domain}":
+        filename  => 'postfix',
+        directory => '/etc/ssl/postfix/',
+        owner     => 'postfix',
+        group     => 'postfix'
+    }
 }
diff --git a/modules/postfix/manifests/server/primary.pp b/modules/postfix/manifests/server/primary.pp
index 3f089685..c14a8606 100644
--- a/modules/postfix/manifests/server/primary.pp
+++ b/modules/postfix/manifests/server/primary.pp
@@ -1,10 +1,16 @@
 class postfix::server::primary inherits postfix::server {
 
-    package { 'postfix-ldap': }
+    # Adding DKIM server
+    include opendkim
+    opendkim::domain{['mageia.org', 'sucuk.mageia.org', 'duvel.mageia.org', 'forums.mageia.org', 'madb.mageia.org','rabbit.mageia.org', 'fiona.mageia.org','identity.mageia.org', 'group.mageia.org', 'neru.mageia.org']:}
+    opendkim::trusted{['127.0.0.0/8', '212.85.158.0/24']:}
+
+    package { ['postfix-ldap', 'sqlite3-tools', 'dovecot-plugins-sqlite','rspamd']: }
 
     # council is here until we fully decide who has aliases in com team,
+
     # see https://bugs.mageia.org/show_bug.cgi?id=1345
-    # alumini is a special group for tracking previous members of
+    # alumni is a special group for tracking previous members of
     # the project, so they keep their aliases for a time
     $aliases_group = ['mga-founders',
                       'mga-packagers',
diff --git a/modules/postfix/manifests/simple_relay.pp b/modules/postfix/manifests/simple_relay.pp
index 265960ae..8911f781 100644
--- a/modules/postfix/manifests/simple_relay.pp
+++ b/modules/postfix/manifests/simple_relay.pp
@@ -2,4 +2,8 @@ class postfix::simple_relay inherits postfix {
     File['/etc/postfix/main.cf'] {
         content => template('postfix/simple_relay_main.cf'),
     }
+    file {
+        '/etc/postfix/sympa_aliases':
+            content => template('postfix/sympa_aliases');
+    }
 }