diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-19 16:21:02 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-19 16:21:02 +0000 |
| commit | 65dbc8b65a7f98e759c22e14f8546c8c9a559747 (patch) | |
| tree | 9b5f82aff992ddb0991edc74a7b56ba36a257194 /modules/sympa | |
| parent | d41e3cbf65d55d23734b40411616270d004c6ea7 (diff) | |
| download | puppet-65dbc8b65a7f98e759c22e14f8546c8c9a559747.tar puppet-65dbc8b65a7f98e759c22e14f8546c8c9a559747.tar.gz puppet-65dbc8b65a7f98e759c22e14f8546c8c9a559747.tar.bz2 puppet-65dbc8b65a7f98e759c22e14f8546c8c9a559747.tar.xz puppet-65dbc8b65a7f98e759c22e14f8546c8c9a559747.zip | |
split scenario in a subdirectory, cleaner layout
Diffstat (limited to 'modules/sympa')
| -rw-r--r-- | modules/sympa/manifests/init.pp | 13 | ||||
| -rw-r--r-- | modules/sympa/manifests/list.pp | 8 | ||||
| -rw-r--r-- | modules/sympa/manifests/scenario/sender_email.pp | 6 | ||||
| -rw-r--r-- | modules/sympa/manifests/scenario/sender_ldap_group.pp | 7 |
4 files changed, 17 insertions, 17 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp index 2ce851ea..c97b04e7 100644 --- a/modules/sympa/manifests/init.pp +++ b/modules/sympa/manifests/init.pp @@ -94,19 +94,6 @@ class sympa { } } - define scenario_sender_ldap_group { - file { "/etc/sympa/scenari/send.restricted_$name": - content => template('sympa/scenari/sender.ldap_group') - } - } - - define scenario_sender_email { - $sender_email_file = regsubst($name,'\@','-at-') - file { "/etc/sympa/scenari/send.restricted_$sender_email_file": - content => template('sympa/scenari/sender.email') - } - } - # add each group that could be used in a sympa ml either as # - owner # - editor ( moderation ) diff --git a/modules/sympa/manifests/list.pp b/modules/sympa/manifests/list.pp index b27e0cff..8f2ac7e7 100644 --- a/modules/sympa/manifests/list.pp +++ b/modules/sympa/manifests/list.pp @@ -41,14 +41,14 @@ define sympa::list( $subject, } if $sender_ldap_group { - if ! defined(Sympa::Server::Scenario_sender_ldap_group[$sender_ldap_group]) { - sympa::server::scenario_sender_ldap_group { $sender_ldap_group: } + if ! defined(Sympa::Scenario::Sender_ldap_group[$sender_ldap_group]) { + sympa::scenario::sender_ldap_group { $sender_ldap_group: } } } if $sender_email { - if ! defined(Sympa::Server::Scenario_sender_email[$sender_email]) { - sympa::server::scenario_sender_email { $sender_email: } + if ! defined(Sympa::Scenario::Sender_email[$sender_email]) { + sympa::scenario::sender_email { $sender_email: } } } diff --git a/modules/sympa/manifests/scenario/sender_email.pp b/modules/sympa/manifests/scenario/sender_email.pp new file mode 100644 index 00000000..4f811189 --- /dev/null +++ b/modules/sympa/manifests/scenario/sender_email.pp @@ -0,0 +1,6 @@ +define sympa::scenario::sender_email { + $sender_email_file = regsubst($name,'\@','-at-') + file { "/etc/sympa/scenari/send.restricted_$sender_email_file": + content => template('sympa/scenari/sender.email') + } +} diff --git a/modules/sympa/manifests/scenario/sender_ldap_group.pp b/modules/sympa/manifests/scenario/sender_ldap_group.pp new file mode 100644 index 00000000..363af4f3 --- /dev/null +++ b/modules/sympa/manifests/scenario/sender_ldap_group.pp @@ -0,0 +1,7 @@ +define sympa::scenario::sender_ldap_group { + file { "/etc/sympa/scenari/send.restricted_$name": + content => template('sympa/scenari/sender.ldap_group') + } +} + + |