1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [587] - move file to subdirectory, easier to understand what's going on
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B587%5D%20-%20move%20file%20to%20subdirectory%2C%0A%09easier%20to%20understand%20what%27s%20going%20on&In-Reply-To=%3C20101213235507.6560D4015E%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="001151.html">
<LINK REL="Next" HREF="001152.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [587] - move file to subdirectory, easier to understand what's going on</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B587%5D%20-%20move%20file%20to%20subdirectory%2C%0A%09easier%20to%20understand%20what%27s%20going%20on&In-Reply-To=%3C20101213235507.6560D4015E%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [587] - move file to subdirectory, easier to understand what's going on">root at mageia.org
</A><BR>
<I>Tue Dec 14 00:55:07 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="001151.html">[Mageia-sysadm] [586] add friteuse, named chosen by blino for the forum server
</A></li>
<LI>Next message: <A HREF="001152.html">[Mageia-sysadm] [588] create the scenari for subscription ( web only )
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1153">[ date ]</a>
<a href="thread.html#1153">[ thread ]</a>
<a href="subject.html#1153">[ subject ]</a>
<a href="author.html#1153">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>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>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001151.html">[Mageia-sysadm] [586] add friteuse, named chosen by blino for the forum server
</A></li>
<LI>Next message: <A HREF="001152.html">[Mageia-sysadm] [588] create the scenari for subscription ( web only )
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1153">[ date ]</a>
<a href="thread.html#1153">[ thread ]</a>
<a href="subject.html#1153">[ subject ]</a>
<a href="author.html#1153">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
