4 files changed, 16 insertions, 6 deletions

diff --git a/modules/sympa/manifests/list.pp b/modules/sympa/manifests/list.pp
index c45355f0..205d2719 100644
--- a/modules/sympa/manifests/list.pp
+++ b/modules/sympa/manifests/list.pp
@@ -7,7 +7,8 @@ define sympa::list( $subject,
                     $sender_ldap_group = false,
                     $subscriber_ldap_group = false,
                     $public_archive = true,
-                    $subscription_open = false) {
+                    $subscription_open = false,
+                    $critical = false) {
 
     include sympa::variable
     $ldap_password = extlookup('sympa_ldap','x')
diff --git a/modules/sympa/manifests/list/announce.pp b/modules/sympa/manifests/list/announce.pp
index 05445ff5..2dd1c647 100644
--- a/modules/sympa/manifests/list/announce.pp
+++ b/modules/sympa/manifests/list/announce.pp
@@ -6,7 +6,8 @@ define sympa::list::announce($subject,
                                   $sender_ldap_group = false,
                                   $subscriber_ldap_group = false,
                                   $language = 'en',
-                                  $topics = false) {
+                                  $topics = false,
+                                  $critical = false) {
     list { $name:
         subject               => $subject,
         language              => $language,
@@ -15,5 +16,6 @@ define sympa::list::announce($subject,
         sender_email          => $sender_email,
         sender_ldap_group     => $sender_ldap_group,
         subscriber_ldap_group => $subscriber_ldap_group,
+        critical              => $critical
     }
 }
diff --git a/modules/sympa/manifests/list/public.pp b/modules/sympa/manifests/list/public.pp
index f0062665..7b97534a 100644
--- a/modules/sympa/manifests/list/public.pp
+++ b/modules/sympa/manifests/list/public.pp
@@ -2,12 +2,14 @@
 # reply_to is set to the list
 define sympa::list::public($subject,
                           $language = 'en',
-                          $topics = false) {
+                          $topics = false,
+                          $sender_email = false) {
     include sympa::variable
     list { $name:
         subject                 => $subject,
         language                => $language,
         topics                  => $topics,
+        sender_email            => $sender_email,
         sender_subscriber       => true,
         reply_to                => "${name}@${sympa::variable::vhost}",
     }
diff --git a/modules/sympa/manifests/server.pp b/modules/sympa/manifests/server.pp
index b43e1077..bcdda789 100644
--- a/modules/sympa/manifests/server.pp
+++ b/modules/sympa/manifests/server.pp
@@ -10,12 +10,17 @@ class sympa::server(
               'perl-CGI-Fast',
               'perl-Socket6']: }
 
-    # sympa script start 5 differents script, I am not
+    # sympa script starts 5 different scripts; I am not
     # sure that puppet will correctly handle this
     service { 'sympa':
         subscribe => [ Package['sympa'], File['/etc/sympa/sympa.conf']]
     }
 
+    service { 'sympa-outgoing':
+        ensure   => running,
+        require  => Service['sympa']
+    }
+
     $pgsql_password = extlookup('sympa_pgsql','x')
     $ldap_password = extlookup('sympa_ldap','x')
 
@@ -30,8 +35,8 @@ class sympa::server(
 
     $vhost = $sympa::variable::vhost
     file { '/etc/sympa/sympa.conf':
-    # should be cleaner to have it root owned, but puppet do not support acl
-    # and in any case, config will be reset if it change
+    # should be cleaner to have it root owned, but puppet does not support acls
+    # and in any case, config will be reset if it changes
         owner   => 'sympa',
         group   => 'apache',
         mode    => '0640',