zarb-ml/mageia-sysadm/2010-November/000568.html


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

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [263] - adapt the script to our infrastructure ( ie, use our domain, and create the directory holding the key )
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B263%5D%20-%20adapt%20the%20script%20to%20our%20infrastructure%20%28%20ie%2C%0A%20use%20our%20domain%2C%20and%20create%20the%20directory%20holding%20the%20key%20%29&In-Reply-To=%3C20101117142830.6098A3FC09%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="000567.html">
   <LINK REL="Next"  HREF="000569.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [263] - adapt the script to our infrastructure ( ie, use our domain, and create the directory holding the key )</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B263%5D%20-%20adapt%20the%20script%20to%20our%20infrastructure%20%28%20ie%2C%0A%20use%20our%20domain%2C%20and%20create%20the%20directory%20holding%20the%20key%20%29&In-Reply-To=%3C20101117142830.6098A3FC09%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [263] - adapt the script to our infrastructure ( ie, use our domain, and create the directory holding the key )">root at mageia.org
       </A><BR>
    <I>Wed Nov 17 15:28:30 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="000567.html">[Mageia-sysadm] [262] - import mandriva script to export ssh keys (	need some cleaning )
</A></li>
        <LI>Next message: <A HREF="000569.html">[Mageia-sysadm] [264] update binddn and password file
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#568">[ date ]</a>
              <a href="thread.html#568">[ thread ]</a>
              <a href="subject.html#568">[ subject ]</a>
              <a href="author.html#568">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 263
Author:   misc
Date:     2010-11-17 15:28:30 +0100 (Wed, 17 Nov 2010)
Log Message:
-----------
- adapt the script to our infrastructure ( ie, use our domain, and create the directory holding the key ) 

Modified Paths:
--------------
    puppet/modules/restrictshell/manifests/init.pp
    puppet/modules/restrictshell/templates/ldap-sshkey2file.py

Modified: puppet/modules/restrictshell/manifests/init.pp
===================================================================
--- puppet/modules/restrictshell/manifests/init.pp	2010-11-17 14:17:29 UTC (rev 262)
+++ puppet/modules/restrictshell/manifests/init.pp	2010-11-17 14:28:30 UTC (rev 263)
@@ -31,6 +31,14 @@
     ensure =&gt; installed,
   }
 
+  $pubkeys_directory = &quot;/var/lib/pubkeys&quot;
+  file { $pubkeys_directory:
+    ensure =&gt; directory,
+    owner =&gt; root,
+    group =&gt; root,
+    mode =&gt; 755,
+  }
+
   file { '/usr/local/bin/ldap-sshkey2file.py':
     ensure =&gt; present,
     owner =&gt; root,

Modified: puppet/modules/restrictshell/templates/ldap-sshkey2file.py
===================================================================
--- puppet/modules/restrictshell/templates/ldap-sshkey2file.py	2010-11-17 14:17:29 UTC (rev 262)
+++ puppet/modules/restrictshell/templates/ldap-sshkey2file.py	2010-11-17 14:28:30 UTC (rev 263)
@@ -9,10 +9,12 @@
 except ImportError, e:
     print &quot;Please install python-ldap before running this program&quot;
     sys.exit(1)
-
-basedn=&quot;dc=mandriva,dc=com&quot;
+&lt;%
+dc_suffix = 'dc=' + domain.gsub('.',',dc=')
+%&gt;
+basedn=&quot;&lt;%= dc_suffix %&gt;&quot;
 peopledn=&quot;ou=people,%s&quot; % basedn
-uris=['<A HREF="ldap://kenobi.mandriva.com">ldap://kenobi.mandriva.com</A>','<A HREF="ldap://svn.mandriva.com">ldap://svn.mandriva.com</A>']
+uris=['<A HREF="ldap://ldap.&lt;%=">ldap://ldap.&lt;%=</A> domain %&gt;']
 random.shuffle(uris)
 uri = &quot; &quot;.join(uris)
 timeout=5
@@ -21,7 +23,7 @@
 # filter out disabled accounts also
 # too bad uidNumber doesn't support &gt;= filters
 filter=&quot;(&amp;(objectClass=inetOrgPerson)(objectClass=ldapPublicKey)(objectClass=posixAccount)(sshPublicKey=*)(!(shadowExpire=*)))&quot;
-keypathprefix=&quot;/var/lib/config/pubkeys&quot;
+keypathprefix=&quot;&lt;%= pubkeys_directory %&gt;&quot;
 
 def usage():
     print &quot;%s&quot; % sys.argv[0]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20101117/dbbd1aef/attachment.html&gt;
</PRE>


<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="000567.html">[Mageia-sysadm] [262] - import mandriva script to export ssh keys (	need some cleaning )
</A></li>
	<LI>Next message: <A HREF="000569.html">[Mageia-sysadm] [264] update binddn and password file
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#568">[ date ]</a>
              <a href="thread.html#568">[ thread ]</a>
              <a href="subject.html#568">[ subject ]</a>
              <a href="author.html#568">[ 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>