diff options
Diffstat (limited to 'modules/sympa')
| -rw-r--r-- | modules/sympa/manifests/list.pp | 3 | ||||
| -rw-r--r-- | modules/sympa/manifests/list/announce.pp | 4 | ||||
| -rw-r--r-- | modules/sympa/manifests/list/public.pp | 4 | ||||
| -rw-r--r-- | modules/sympa/manifests/server.pp | 11 | ||||
| -rw-r--r-- | modules/sympa/templates/config | 12 | ||||
| -rw-r--r-- | modules/sympa/templates/sympa.conf | 4 |
6 files changed, 29 insertions, 9 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', diff --git a/modules/sympa/templates/config b/modules/sympa/templates/config index ccf2fff9..4262f3ca 100644 --- a/modules/sympa/templates/config +++ b/modules/sympa/templates/config @@ -2,7 +2,7 @@ archive period month mail_access owner -<%- if public_archive -%> +<%- if public_archive and not @critical -%> web_access public <%- else -%> web_access private @@ -38,6 +38,16 @@ subject <%= subject %> custom_subject <%= custom_subject %> +<%- if @critical -%> +info conceal + +subscribe auth owner + +unsubscribe auth_notify + +invite owner +<% end %> + lang <%= language %> owner diff --git a/modules/sympa/templates/sympa.conf b/modules/sympa/templates/sympa.conf index eff7749b..edfaba15 100644 --- a/modules/sympa/templates/sympa.conf +++ b/modules/sympa/templates/sympa.conf @@ -409,7 +409,7 @@ bounce_path /var/lib/sympa/bounce ## prevented. arc_path /var/lib/sympa/arc -###\\\\ Miscelaneous ////### +###\\\\ Miscellaneous ////### ## Local part of Sympa email address ## Local part (the part preceding the "@" sign) of the address by which mail @@ -496,7 +496,7 @@ review_page_size 25 ## page. viewlogs_page_size 25 -###\\\\ Web interface parameters: Miscelaneous ////### +###\\\\ Web interface parameters: Miscellaneous ////### ## HTTP cookies validity domain ## If beginning with a dot ("."), the cookie is available within the specified |