diff options
| author | Michael Scherer <misc@mageia.org> | 2010-12-17 00:50:56 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-12-17 00:50:56 +0000 |
| commit | ce5431d5c759f1974795149e37249a563402948e (patch) | |
| tree | 66cb4f3ec1c8af50caa6339a7c680a9d7971c424 | |
| parent | 81af7f6855015afd416e43d58401cd25d58f3880 (diff) | |
| download | puppet-ce5431d5c759f1974795149e37249a563402948e.tar puppet-ce5431d5c759f1974795149e37249a563402948e.tar.gz puppet-ce5431d5c759f1974795149e37249a563402948e.tar.bz2 puppet-ce5431d5c759f1974795149e37249a563402948e.tar.xz puppet-ce5431d5c759f1974795149e37249a563402948e.zip | |
- allow to set the topic of the list ( useful to sort them on interface
)
| -rw-r--r-- | modules/sympa/manifests/init.pp | 17 | ||||
| -rw-r--r-- | modules/sympa/templates/config | 5 |
2 files changed, 12 insertions, 10 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp index c5fd8e47..a163d42a 100644 --- a/modules/sympa/manifests/init.pp +++ b/modules/sympa/manifests/init.pp @@ -173,6 +173,7 @@ class sympa { define list($subject, $profile = false, $language = 'en', + $topics = false, $reply_to = false, $sender_email = false, $sender_ldap_group = false, @@ -232,7 +233,7 @@ class sympa { # various types of list that can be directly used # # - define public_list($subject, $language = 'en') { + define public_list($subject, $language = 'en', $topics = false) { list { $name: subject => $subject, # profile => "public", @@ -242,7 +243,7 @@ class sympa { # list where announce are sent by member of ldap_group # reply_to is set to $reply_to - define announce_list_group($subject, $reply_to, $sender_ldap_group, $language = 'en') { + define announce_list_group($subject, $reply_to, $sender_ldap_group, $language = 'en', $topics = false) { # profile + scenario list{ $name: subject => $subject, @@ -256,7 +257,7 @@ class sympa { # list where announce are sent by $email only # reply_to is set to $reply_to - define announce_list_email($subject, $reply_to, $sender_email, $language = 'en') { + define announce_list_email($subject, $reply_to, $sender_email, $language = 'en', $topics = false) { list{ $name: subject => $subject, profile => "", @@ -268,7 +269,7 @@ class sympa { # list where people cannot subscribe, where people from $ldap_group receive # mail, with public archive - define restricted_list($subject, $subscriber_ldap_group, $language = 'en') { + define restricted_list($subject, $subscriber_ldap_group, $language = 'en', $topics = false) { list{ $name: subject => $subject, profile => "", @@ -279,7 +280,7 @@ class sympa { } # same as restricted list, but anybody can post - define restricted_list_open($subject, $subscriber_ldap_group, $language = 'en') { + define restricted_list_open($subject, $subscriber_ldap_group, $language = 'en', $topics = false) { list{ $name: subject => $subject, profile => "", @@ -290,7 +291,7 @@ class sympa { } # list with private archive, restricted to member of $ldap_group - define private_list($subject, $subscriber_ldap_group, $language ='en') { + define private_list($subject, $subscriber_ldap_group, $language ='en', $topics = false) { list{ $name: subject => $subject, profile => "", @@ -304,7 +305,7 @@ class sympa { # list with private archive, restricted to member of $ldap_group # everybody can post # used for contact alias - define private_list_open($subject, $subscriber_ldap_group, $language ='en') { + define private_list_open($subject, $subscriber_ldap_group, $language ='en', $topics = false) { list{ $name: subject => $subject, profile => "", @@ -316,7 +317,7 @@ class sympa { # same as private_list, but post are restricted to $email # ( scripting ) - define private_list_email($subject, $subscriber_ldap_group, $sender_email, $language ='en') { + define private_list_email($subject, $subscriber_ldap_group, $sender_email, $language ='en', $topics = false) { list{ $name: subject => $subject, profile => "", diff --git a/modules/sympa/templates/config b/modules/sympa/templates/config index 9a91444c..0da03ccf 100644 --- a/modules/sympa/templates/config +++ b/modules/sympa/templates/config @@ -67,8 +67,9 @@ send subscriber_moderated <% end %> -#TODO topics -# topics +<% if topics %> +topics <%= topics %> +<% end %> <% if subscriber_ldap_group %> include_ldap_query |