From ff65f32f086c146276486930a0a78e81ca43852e Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 19 Mar 2012 16:21:12 +0000
Subject: split search filters in a separate file

---
 modules/sympa/manifests/init.pp               | 6 ------
 modules/sympa/manifests/list.pp               | 4 ++--
 modules/sympa/manifests/search_filter/ldap.pp | 5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 modules/sympa/manifests/search_filter/ldap.pp

(limited to 'modules/sympa')

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')
+    }
+}
-- 
cgit v1.2.1