diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-19 16:21:12 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-19 16:21:12 +0000 |
| commit | ff65f32f086c146276486930a0a78e81ca43852e (patch) | |
| tree | 3b11636920edf81cbb8baacf218e1ea6dc0c8e0f /modules/sympa | |
| parent | 935dc7ca41160ba3109b263f1b5200cea0a74253 (diff) | |
| download | puppet-ff65f32f086c146276486930a0a78e81ca43852e.tar puppet-ff65f32f086c146276486930a0a78e81ca43852e.tar.gz puppet-ff65f32f086c146276486930a0a78e81ca43852e.tar.bz2 puppet-ff65f32f086c146276486930a0a78e81ca43852e.tar.xz puppet-ff65f32f086c146276486930a0a78e81ca43852e.zip | |
split search filters in a separate file
Diffstat (limited to 'modules/sympa')
| -rw-r--r-- | modules/sympa/manifests/init.pp | 6 | ||||
| -rw-r--r-- | modules/sympa/manifests/list.pp | 4 | ||||
| -rw-r--r-- | modules/sympa/manifests/search_filter/ldap.pp | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp index 3f569a45..460e46bf 100644 --- a/modules/sympa/manifests/init.pp +++ b/modules/sympa/manifests/init.pp @@ -84,12 +84,6 @@ class sympa { source => 'puppet:///modules/sympa/topics.conf'; } - define ldap_search_filter { - file { "/etc/sympa/search_filters/$name.ldap": - content => template('sympa/search_filters/group.ldap') - } - } - # 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 8f2ac7e7..59417275 100644 --- a/modules/sympa/manifests/list.pp +++ b/modules/sympa/manifests/list.pp @@ -53,8 +53,8 @@ define sympa::list( $subject, } if $subscriber_ldap_group { - if ! defined(Sympa::Server::Ldap_search_filter[$subscriber_ldap_group]) { - sympa::server::ldap_search_filter { $subscriber_ldap_group: } + if ! defined(Sympa::Search_filter::Ldap[$subscriber_ldap_group]) { + sympa::search_filter::ldap { $subscriber_ldap_group: } } } } diff --git a/modules/sympa/manifests/search_filter/ldap.pp b/modules/sympa/manifests/search_filter/ldap.pp new file mode 100644 index 00000000..5cbc84f8 --- /dev/null +++ b/modules/sympa/manifests/search_filter/ldap.pp @@ -0,0 +1,5 @@ +define sympa::search_filter::ldap { + file { "/etc/sympa/search_filters/$name.ldap": + content => template('sympa/search_filters/group.ldap') + } +} |