zarb-ml/mageia-sysadm/2010-November/000569.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

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [264] update binddn and password file
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B264%5D%20update%20binddn%20and%20password%20file&In-Reply-To=%3C20101117151307.5AEA53FC09%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="000568.html">
   <LINK REL="Next"  HREF="000570.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [264] update binddn and password file</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B264%5D%20update%20binddn%20and%20password%20file&In-Reply-To=%3C20101117151307.5AEA53FC09%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [264] update binddn and password file">root at mageia.org
       </A><BR>
    <I>Wed Nov 17 16:13:07 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="000568.html">[Mageia-sysadm] [263] - adapt the script to our infrastructure ( ie, use our domain, and create the directory holding the key )
</A></li>
        <LI>Next message: <A HREF="000570.html">[Mageia-sysadm] [265] - add a proto module for taking care of pam ( need pam_ldap, etc support, and a review of the pam config file too )
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#569">[ date ]</a>
              <a href="thread.html#569">[ thread ]</a>
              <a href="subject.html#569">[ subject ]</a>
              <a href="author.html#569">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 264
Author:   boklm
Date:     2010-11-17 16:13:07 +0100 (Wed, 17 Nov 2010)
Log Message:
-----------
update binddn and password file

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:28:30 UTC (rev 263)
+++ puppet/modules/restrictshell/manifests/init.pp	2010-11-17 15:13:07 UTC (rev 264)
@@ -1,10 +1,11 @@
-#TODO: add support for pkgsubmit
 class restrictshell {
   $allow_svn = &quot;0&quot;
   $allow_git = &quot;0&quot;
   $allow_rsync = &quot;0&quot;
   $allow_pkgsubmit = &quot;0&quot;
 
+  $ldap_pwfile = &quot;/etc/ldap.secret&quot;
+
   class allow_svn_git_pkgsubmit {
     $allow_svn = &quot;1&quot;
     $allow_git = &quot;1&quot;

Modified: puppet/modules/restrictshell/templates/ldap-sshkey2file.py
===================================================================
--- puppet/modules/restrictshell/templates/ldap-sshkey2file.py	2010-11-17 14:28:30 UTC (rev 263)
+++ puppet/modules/restrictshell/templates/ldap-sshkey2file.py	2010-11-17 15:13:07 UTC (rev 264)
@@ -18,8 +18,8 @@
 random.shuffle(uris)
 uri = &quot; &quot;.join(uris)
 timeout=5
-binddn=&quot;uid=sshkeyreader,ou=System Accounts,%s&quot; % basedn
-pwfile=&quot;/etc/sshkeyreader.pw&quot;
+binddn=&quot;cn=&lt;%= fqdn %&gt;,ou=Hosts,&quot; % basedn
+pwfile=&quot;&lt;%= ldap_pwfile %&gt;&quot;
 # 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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20101117/9a3e1b4a/attachment-0001.html&gt;
</PRE>


<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="000568.html">[Mageia-sysadm] [263] - adapt the script to our infrastructure ( ie, use our domain, and create the directory holding the key )
</A></li>
	<LI>Next message: <A HREF="000570.html">[Mageia-sysadm] [265] - add a proto module for taking care of pam ( need pam_ldap, etc support, and a review of the pam config file too )
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#569">[ date ]</a>
              <a href="thread.html#569">[ thread ]</a>
              <a href="subject.html#569">[ subject ]</a>
              <a href="author.html#569">[ 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>