aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sympa/manifests/list
diff options
context:
space:
mode:
Diffstat (limited to 'modules/sympa/manifests/list')
-rw-r--r--modules/sympa/manifests/list/announce.pp21
-rw-r--r--modules/sympa/manifests/list/private.pp3
-rw-r--r--modules/sympa/manifests/list/private_email.pp17
-rw-r--r--modules/sympa/manifests/list/private_open.pp18
-rw-r--r--modules/sympa/manifests/list/public.pp16
-rw-r--r--modules/sympa/manifests/list/public_restricted.pp17
-rw-r--r--modules/sympa/manifests/list/restricted.pp15
7 files changed, 56 insertions, 51 deletions
diff --git a/modules/sympa/manifests/list/announce.pp b/modules/sympa/manifests/list/announce.pp
new file mode 100644
index 00000000..2dd1c647
--- /dev/null
+++ b/modules/sympa/manifests/list/announce.pp
@@ -0,0 +1,21 @@
+# list where announce are sent by $email or $ldap_group only
+# reply_to is set to $reply_to
+define sympa::list::announce($subject,
+ $reply_to,
+ $sender_email = false,
+ $sender_ldap_group = false,
+ $subscriber_ldap_group = false,
+ $language = 'en',
+ $topics = false,
+ $critical = false) {
+ list { $name:
+ subject => $subject,
+ language => $language,
+ topics => $topics,
+ reply_to => $reply_to,
+ 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/private.pp b/modules/sympa/manifests/list/private.pp
index d58d7ab2..c8d9b38e 100644
--- a/modules/sympa/manifests/list/private.pp
+++ b/modules/sympa/manifests/list/private.pp
@@ -1,15 +1,16 @@
# list with private archive, restricted to member of $ldap_group
define sympa::list::private($subject,
$subscriber_ldap_group,
+ $sender_email = false,
$language ='en',
$topics = false) {
list { $name:
subject => $subject,
- profile => '',
language => $language,
topics => $topics,
subscriber_ldap_group => $subscriber_ldap_group,
sender_ldap_group => $subscriber_ldap_group,
+ sender_email => $sender_email,
public_archive => false,
}
}
diff --git a/modules/sympa/manifests/list/private_email.pp b/modules/sympa/manifests/list/private_email.pp
deleted file mode 100644
index 54e70592..00000000
--- a/modules/sympa/manifests/list/private_email.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# same as private_list, but post are restricted to $email
-# ( scripting )
-define sympa::list::private_email($subject,
- $subscriber_ldap_group,
- $sender_email,
- $language ='en',
- $topics = false) {
- list { $name:
- subject => $subject,
- profile => '',
- language => $language,
- topics => $topics,
- subscriber_ldap_group => $subscriber_ldap_group,
- sender_email => $sender_email,
- public_archive => false,
- }
-}
diff --git a/modules/sympa/manifests/list/private_open.pp b/modules/sympa/manifests/list/private_open.pp
deleted file mode 100644
index 7f3f5105..00000000
--- a/modules/sympa/manifests/list/private_open.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# list with private archive, restricted to member of $ldap_group
-# everybody can post
-# used for contact alias
-define sympa::list::private_open( $subject,
- $subscriber_ldap_group,
- $language = 'en',
- $topics = false) {
- sympa::list { $name:
- subject => $subject,
- profile => '',
- language => $language,
- topics => $topics,
- subscriber_ldap_group => $subscriber_ldap_group,
- public_archive => false,
- }
-}
-
-
diff --git a/modules/sympa/manifests/list/public.pp b/modules/sympa/manifests/list/public.pp
new file mode 100644
index 00000000..7b97534a
--- /dev/null
+++ b/modules/sympa/manifests/list/public.pp
@@ -0,0 +1,16 @@
+# public discussion list
+# reply_to is set to the list
+define sympa::list::public($subject,
+ $language = 'en',
+ $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/list/public_restricted.pp b/modules/sympa/manifests/list/public_restricted.pp
new file mode 100644
index 00000000..5c316368
--- /dev/null
+++ b/modules/sympa/manifests/list/public_restricted.pp
@@ -0,0 +1,17 @@
+# list where only people from the ldap_group can post, and where
+# they are subscribed by default, but anybody else can subscribe
+# to read and receive messages
+define sympa::list::public_restricted($subject,
+ $subscriber_ldap_group,
+ $language = 'en',
+ $topics = false) {
+ list { $name:
+ subject => $subject,
+ topics => $topics,
+ language => $language,
+ subscriber_ldap_group => $subscriber_ldap_group,
+ sender_ldap_group => $subscriber_ldap_group,
+ subscription_open => true,
+ reply_to => "${name}@${sympa::variable::vhost}",
+ }
+}
diff --git a/modules/sympa/manifests/list/restricted.pp b/modules/sympa/manifests/list/restricted.pp
deleted file mode 100644
index 779cd3fb..00000000
--- a/modules/sympa/manifests/list/restricted.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# list where people cannot subscribe, where people from $ldap_group receive
-# mail, with public archive
-define sympa::list::restricted($subject,
- $subscriber_ldap_group,
- $language = 'en',
- $topics = false) {
- list { $name:
- subject => $subject,
- profile => '',
- topics => $topics,
- language => $language,
- subscriber_ldap_group => $subscriber_ldap_group,
- sender_ldap_group => $subscriber_ldap_group,
- }
-}