aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-09 11:15:10 +0000
committerMichael Scherer <misc@mageia.org>2011-01-09 11:15:10 +0000
commit8e656ffc17a0e2116c187602e4cad4a8ac8109b7 (patch)
tree28c83154b9b6ca445edde5eaf846ffef2c3fa4ac
parent5f1d2fcc1efd2020c46ae685a668906e84d77a17 (diff)
downloadpuppet-8e656ffc17a0e2116c187602e4cad4a8ac8109b7.tar
puppet-8e656ffc17a0e2116c187602e4cad4a8ac8109b7.tar.gz
puppet-8e656ffc17a0e2116c187602e4cad4a8ac8109b7.tar.bz2
puppet-8e656ffc17a0e2116c187602e4cad4a8ac8109b7.tar.xz
puppet-8e656ffc17a0e2116c187602e4cad4a8ac8109b7.zip
move lists to a subdirectory deployment ( to separate them from pure module )
-rw-r--r--deployment/lists/manifests/init.pp66
-rw-r--r--manifests/lists.pp65
-rw-r--r--manifests/nodes.pp2
3 files changed, 67 insertions, 66 deletions
diff --git a/deployment/lists/manifests/init.pp b/deployment/lists/manifests/init.pp
new file mode 100644
index 00000000..e4d93a25
--- /dev/null
+++ b/deployment/lists/manifests/init.pp
@@ -0,0 +1,66 @@
+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":
+ subject => "List about translation to Afrikaans",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-de":
+ subject => "List about translation to German",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-et":
+ subject => "List about translation to Estonian",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-fr":
+ subject => "List about translation to French",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-nl":
+ subject => "List about translation to Dutch",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-pt_br":
+ subject => "List about translation to Brazilian Portuguese",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-pl":
+ subject => "List about translation to Polish",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-ru":
+ subject => "List about translation to Russian",
+ topics => "i18n",
+ }
+
+ sympa::public_list {"i18n-tr":
+ subject => "List about translation to Turkish",
+ topics => "i18n",
+ }
+
+
+ sympa::announce_list_email {"sysadmin-commits":
+ subject => "List receiving commits mail from sysadmin team repository",
+ # FIXME change once we migrate
+ reply_to => "mageia-sysadm@$domain",
+ sender_email => "root@$domain",
+ topics => "sysadmin",
+ }
+
+ sympa::announce_list_email {"sysadmin-reports":
+ subject => "List receiving automated reports from various pieces of infrastructure",
+ # FIXME change once we migrate
+ reply_to => "mageia-sysadm@$domain",
+ sender_email => "root@$domain",
+ topics => "sysadmin",
+ }
+}
diff --git a/manifests/lists.pp b/manifests/lists.pp
deleted file mode 100644
index 4c141ef4..00000000
--- a/manifests/lists.pp
+++ /dev/null
@@ -1,65 +0,0 @@
-
-# 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":
- subject => "List about translation to Afrikaans",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-de":
- subject => "List about translation to German",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-et":
- subject => "List about translation to Estonian",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-fr":
- subject => "List about translation to French",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-nl":
- subject => "List about translation to Dutch",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-pt_br":
- subject => "List about translation to Brazilian Portuguese",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-pl":
- subject => "List about translation to Polish",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-ru":
- subject => "List about translation to Russian",
- topics => "i18n",
-}
-
-sympa::public_list {"i18n-tr":
- subject => "List about translation to Turkish",
- topics => "i18n",
-}
-
-
-sympa::announce_list_email {"sysadmin-commits":
- subject => "List receiving commits mail from sysadmin team repository",
- # FIXME change once we migrate
- reply_to => "mageia-sysadm@$domain",
- sender_email => "root@$domain",
- topics => "sysadmin",
-}
-
-sympa::announce_list_email {"sysadmin-reports":
- subject => "List receiving automated reports from various pieces of infrastructure",
- # FIXME change once we migrate
- reply_to => "mageia-sysadm@$domain",
- sender_email => "root@$domain",
- topics => "sysadmin",
-}
-
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 15c80b3a..eef556f8 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -96,7 +96,7 @@ node alamut {
include sympa::server
include postfix::primary_smtp
-# import "lists"
+ include lists
}
# buildnode