From ef8cc1fc7b4621d88cfa91cd04c49e4b43c51432 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Mon, 22 Apr 2013 18:35:14 +0000 Subject: rename sympa::public_list to sympa::list::public --- deployment/lists/manifests/init.pp | 48 +++++++++++++++++----------------- modules/sympa/manifests/list/public.pp | 14 ++++++++++ modules/sympa/manifests/public_list.pp | 14 ---------- 3 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 modules/sympa/manifests/list/public.pp delete mode 100644 modules/sympa/manifests/public_list.pp diff --git a/deployment/lists/manifests/init.pp b/deployment/lists/manifests/init.pp index 0b129425..96bcaa85 100644 --- a/deployment/lists/manifests/init.pp +++ b/deployment/lists/manifests/init.pp @@ -22,7 +22,7 @@ class lists { topics => 'atelier', } - sympa::public_list {'atelier-discuss': + sympa::list::public {'atelier-discuss': subject => 'Discussions about artwork, web, marketing, communication', topics => 'atelier', } @@ -33,21 +33,21 @@ class lists { topics => 'atelier', } - sympa::public_list {'bugsquad-discuss': + sympa::list::public {'bugsquad-discuss': subject => 'Bugsquad team discussions', topics => 'bugsquad', } - sympa::public_list {'dev': + sympa::list::public {'dev': subject => 'Developement discussion list', topics => 'developers', } - sympa::public_list {'discuss': + sympa::list::public {'discuss': subject => 'General discussion list', } - sympa::public_list {'i18n-discuss': + sympa::list::public {'i18n-discuss': subject => 'Translation team discussions', topics => 'i18n', } @@ -68,77 +68,77 @@ class lists { # please check that the list use the proper code for # language ( not to be confused with tld or country code ) - sympa::public_list {'i18n-af': + sympa::list::public {'i18n-af': subject => 'Translation to Afrikaans', topics => 'i18n', } - sympa::public_list {'i18n-de': + sympa::list::public {'i18n-de': subject => 'Translation to German', topics => 'i18n', } - sympa::public_list {'i18n-et': + sympa::list::public {'i18n-et': subject => 'Translation to Estonian', topics => 'i18n', } - sympa::public_list {'i18n-fr': + sympa::list::public {'i18n-fr': subject => 'Translation to French', topics => 'i18n', } - sympa::public_list {'i18n-el': + sympa::list::public {'i18n-el': subject => 'Translation to Greek', topics => 'i18n', } - sympa::public_list {'i18n-nl': + sympa::list::public {'i18n-nl': subject => 'Translation to Dutch', topics => 'i18n', } - sympa::public_list {'i18n-pt_br': + sympa::list::public {'i18n-pt_br': subject => 'Translation to Brazilian Portuguese', topics => 'i18n', } - sympa::public_list {'i18n-pl': + sympa::list::public {'i18n-pl': subject => 'Translation to Polish', topics => 'i18n', } - sympa::public_list {'i18n-ru': + sympa::list::public {'i18n-ru': subject => 'Translation to Russian', topics => 'i18n', } - sympa::public_list {'i18n-tr': + sympa::list::public {'i18n-tr': subject => 'Translation to Turkish', topics => 'i18n', } - sympa::public_list {'i18n-it': + sympa::list::public {'i18n-it': subject => 'Translation to Italian', topics => 'i18n', } - sympa::public_list {'i18n-en': + sympa::list::public {'i18n-en': subject => 'Translation to English', topics => 'i18n', } - sympa::public_list {'i18n-ro': + sympa::list::public {'i18n-ro': subject => 'Translation to Romanian', topics => 'i18n', } - sympa::public_list {'i18n-zh_tw': + sympa::list::public {'i18n-zh_tw': subject => 'Translation to Taiwanese', topics => 'i18n', } - sympa::public_list {'qa-discuss': + sympa::list::public {'qa-discuss': subject => 'Discussions about QA tasks and requests', topics => 'qa', } @@ -150,7 +150,7 @@ class lists { topics => 'qa', } - sympa::public_list {'forums-discuss': + sympa::list::public {'forums-discuss': subject => 'Discuss forums matters, policies and processes, as well as publish summaries of notable events/feedback', topics => 'forums', } @@ -162,7 +162,7 @@ class lists { topics => 'forums', } - sympa::public_list {'doc-discuss': + sympa::list::public {'doc-discuss': subject => 'Discussions about Mageia documentation', topics => 'doc', } @@ -195,7 +195,7 @@ class lists { topics => 'sysadmin', } - sympa::public_list {'sysadmin-discuss': + sympa::list::public {'sysadmin-discuss': subject => 'Sysadmin team discussions', topics => 'sysadmin', } @@ -268,7 +268,7 @@ class lists { topics => 'governance', } - sympa::public_list {'local-discuss': + sympa::list::public {'local-discuss': subject => 'Discussions about Local Community Team', topics => 'local', } diff --git a/modules/sympa/manifests/list/public.pp b/modules/sympa/manifests/list/public.pp new file mode 100644 index 00000000..cb281910 --- /dev/null +++ b/modules/sympa/manifests/list/public.pp @@ -0,0 +1,14 @@ +# public discussion list +# reply_to is set to the list +define sympa::list::public($subject, + $language = 'en', + $topics = false) { + include sympa::variable + list { $name: + subject => $subject, + language => $language, + topics => $topics, + sender_subscriber => true, + reply_to => "$name@$sympa::variable::vhost", + } +} diff --git a/modules/sympa/manifests/public_list.pp b/modules/sympa/manifests/public_list.pp deleted file mode 100644 index b14ff052..00000000 --- a/modules/sympa/manifests/public_list.pp +++ /dev/null @@ -1,14 +0,0 @@ -# public discussion list -# reply_to is set to the list -define sympa::public_list($subject, - $language = 'en', - $topics = false) { - include sympa::variable - list { $name: - subject => $subject, - language => $language, - topics => $topics, - sender_subscriber => true, - reply_to => "$name@$sympa::variable::vhost", - } -} -- cgit v1.2.1