[Mageia-sysadm] [587] - move file to subdirectory, easier to understand what's going on

[root at mageia.org]

Revision: 587
Author:   misc
Date:     2010-12-14 00:55:07 +0100 (Tue, 14 Dec 2010)
Log Message:
-----------
- move file to subdirectory, easier to understand what's going on

Modified Paths:
--------------
    puppet/modules/sympa/manifests/init.pp

Added Paths:
-----------
    puppet/modules/sympa/templates/data_sources/
    puppet/modules/sympa/templates/data_sources/ldap_group.incl
    puppet/modules/sympa/templates/search_filters/
    puppet/modules/sympa/templates/search_filters/group.ldap

Removed Paths:
-------------
    puppet/modules/sympa/templates/group.ldap
    puppet/modules/sympa/templates/ldap_group.incl

Modified: puppet/modules/sympa/manifests/init.pp
===================================================================
--- puppet/modules/sympa/manifests/init.pp	2010-12-13 23:55:05 UTC (rev 586)
+++ puppet/modules/sympa/manifests/init.pp	2010-12-13 23:55:07 UTC (rev 587)
@@ -91,7 +91,7 @@
                 owner => root,
                 group => root,
                 mode => 755,
-                content => template('sympa/group.ldap') 
+                content => template('sympa/search_filters/group.ldap') 
             }
         }
 
@@ -101,7 +101,7 @@
                 owner => root,
                 group => root,
                 mode => 755,
-                content => template('sympa/ldap_group.incl') 
+                content => template('sympa/data_sources/ldap_group.incl') 
             }
         }
 

Copied: puppet/modules/sympa/templates/data_sources/ldap_group.incl (from rev 586, puppet/modules/sympa/templates/ldap_group.incl)
===================================================================
--- puppet/modules/sympa/templates/data_sources/ldap_group.incl	                        (rev 0)
+++ puppet/modules/sympa/templates/data_sources/ldap_group.incl	2010-12-13 23:55:07 UTC (rev 587)
@@ -0,0 +1,18 @@
+include_ldap_2level_query
+        host     ldap.<%= domain %>
+        port     389
+        user     cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %>
+        passwd   <%= ldap_passwd %>
+
+        suffix1  ou=Groups,<%= dc_suffix %>
+        scope1   one
+        filter1  (&(objectClass=groupOfUniqueNames)(cn=<%= name %>))
+        attrs1   uniquemember
+        select1  all
+
+        suffix2  [attrs1]
+        scope2   base
+        filter2  (objectClass=inetOrgPerson)
+        attrs2   mail
+        select2  first
+

Deleted: puppet/modules/sympa/templates/group.ldap
===================================================================
--- puppet/modules/sympa/templates/group.ldap	2010-12-13 23:55:05 UTC (rev 586)
+++ puppet/modules/sympa/templates/group.ldap	2010-12-13 23:55:07 UTC (rev 587)
@@ -1,4 +0,0 @@
-host        ldap.<%= domain %>:389
-suffix      ou=People,<%= dc_suffix %>
-filter      (&(mail = [sender])(memberOf=cn=<%= name %>,ou=Group,<%= dc_suffix %>))
-scope       sub

Deleted: puppet/modules/sympa/templates/ldap_group.incl
===================================================================
--- puppet/modules/sympa/templates/ldap_group.incl	2010-12-13 23:55:05 UTC (rev 586)
+++ puppet/modules/sympa/templates/ldap_group.incl	2010-12-13 23:55:07 UTC (rev 587)
@@ -1,18 +0,0 @@
-include_ldap_2level_query
-        host     ldap.<%= domain %>
-        port     389
-        user     cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %>
-        passwd   <%= ldap_passwd %>
-
-        suffix1  ou=Groups,<%= dc_suffix %>
-        scope1   one
-        filter1  (&(objectClass=groupOfUniqueNames)(cn=<%= name %>))
-        attrs1   uniquemember
-        select1  all
-
-        suffix2  [attrs1]
-        scope2   base
-        filter2  (objectClass=inetOrgPerson)
-        attrs2   mail
-        select2  first
-

Copied: puppet/modules/sympa/templates/search_filters/group.ldap (from rev 586, puppet/modules/sympa/templates/group.ldap)
===================================================================
--- puppet/modules/sympa/templates/search_filters/group.ldap	                        (rev 0)
+++ puppet/modules/sympa/templates/search_filters/group.ldap	2010-12-13 23:55:07 UTC (rev 587)
@@ -0,0 +1,4 @@
+host        ldap.<%= domain %>:389
+suffix      ou=People,<%= dc_suffix %>
+filter      (&(mail = [sender])(memberOf=cn=<%= name %>,ou=Group,<%= dc_suffix %>))
+scope       sub
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101214/d1998bca/attachment-0001.html>