[Mageia-sysadm] [644] - allow to set the topic of the list ( useful to sort them on interface

[root at mageia.org]

Revision: 644
Author:   misc
Date:     2010-12-17 01:50:56 +0100 (Fri, 17 Dec 2010)
Log Message:
-----------
- allow to set the topic of the list ( useful to sort them on interface
  )

Modified Paths:
--------------
    puppet/modules/sympa/manifests/init.pp
    puppet/modules/sympa/templates/config

Modified: puppet/modules/sympa/manifests/init.pp
===================================================================
--- puppet/modules/sympa/manifests/init.pp	2010-12-17 00:50:55 UTC (rev 643)
+++ puppet/modules/sympa/manifests/init.pp	2010-12-17 00:50:56 UTC (rev 644)
@@ -173,6 +173,7 @@
     define list($subject, 
                 $profile = false, 
                 $language = 'en',
+                $topics = false,
                 $reply_to = false,
                 $sender_email = false,
                 $sender_ldap_group = false,
@@ -232,7 +233,7 @@
 #   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 @@
 
     # 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 @@
 
     # 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 @@
 
     # 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 @@
     }
 
     # 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 @@
     }
 
     # 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 @@
     # 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 @@
 
     # 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 => "",

Modified: puppet/modules/sympa/templates/config
===================================================================
--- puppet/modules/sympa/templates/config	2010-12-17 00:50:55 UTC (rev 643)
+++ puppet/modules/sympa/templates/config	2010-12-17 00:50:56 UTC (rev 644)
@@ -67,8 +67,9 @@
 <% end %>
 
 
-#TODO topics
-# topics 
+<% if topics %>
+topics <%= topics %>
+<% end %>
 
 <% if subscriber_ldap_group %>
 include_ldap_query
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101217/50e21c8a/attachment.html>