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
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [408] - split the module in 2 part, and add class to allow to more easyly
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B408%5D%20-%20split%20the%20module%20in%202%20part%2C%0A%09and%20add%20class%20to%20allow%20to%20more%20easyly&In-Reply-To=%3C20101123011110.A5EBA3FC92%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="000803.html">
<LINK REL="Next" HREF="000806.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [408] - split the module in 2 part, and add class to allow to more easyly</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B408%5D%20-%20split%20the%20module%20in%202%20part%2C%0A%09and%20add%20class%20to%20allow%20to%20more%20easyly&In-Reply-To=%3C20101123011110.A5EBA3FC92%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [408] - split the module in 2 part, and add class to allow to more easyly">root at mageia.org
</A><BR>
<I>Tue Nov 23 02:11:10 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000803.html">[Mageia-sysadm] [407] - use pam for openssh ( I am not sure if we need to restrict its use
</A></li>
<LI>Next message: <A HREF="000806.html">[Mageia-sysadm] [409] add class for scp and sftp
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#804">[ date ]</a>
<a href="thread.html#804">[ thread ]</a>
<a href="subject.html#804">[ subject ]</a>
<a href="author.html#804">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 408
Author: misc
Date: 2010-11-23 02:11:10 +0100 (Tue, 23 Nov 2010)
Log Message:
-----------
- split the module in 2 part, and add class to allow to more easyly
combine the autorized shell
Modified Paths:
--------------
puppet/modules/restrictshell/manifests/init.pp
puppet/modules/restrictshell/templates/membersh-conf.pl
Modified: puppet/modules/restrictshell/manifests/init.pp
===================================================================
--- puppet/modules/restrictshell/manifests/init.pp 2010-11-23 01:11:08 UTC (rev 407)
+++ puppet/modules/restrictshell/manifests/init.pp 2010-11-23 01:11:10 UTC (rev 408)
@@ -1,5 +1,12 @@
class restrictshell {
class shell {
+ file {"/etc/membersh-conf.d":
+ ensure => directory,
+ owner => root,
+ group => root,
+ mode => 755,
+ }
+
file { '/usr/local/bin/sv_membersh.pl':
ensure => present,
owner => root,
@@ -7,16 +14,7 @@
mode => 755,
content => template("restrictshell/sv_membersh.pl"),
}
- }
- class base {
- include shell
- $allow_svn = "0"
- $allow_git = "0"
- $allow_rsync = "0"
- $allow_pkgsubmit = "0"
-
- $ldap_pwfile = "/etc/ldap.secret"
file { '/etc/membersh-conf.pl':
ensure => present,
owner => root,
@@ -24,6 +22,9 @@
mode => 755,
content => template("restrictshell/membersh-conf.pl"),
}
+ }
+
+ class ssh_keys_from_ldap {
package { 'python-ldap':
ensure => installed,
@@ -37,6 +38,7 @@
mode => 755,
}
+ $ldap_pwfile = "/etc/ldap.secret"
file { '/usr/local/bin/ldap-sshkey2file.py':
ensure => present,
owner => root,
@@ -47,9 +49,32 @@
}
}
- class allow_svn_git_pkgsubmit inherits base {
- $allow_svn = "1"
- $allow_git = "1"
- $allow_pkgsubmit = "1"
+ define allow {
+ include shell
+ file { "/etc/membersh-conf.d/allow_$name.pl":
+ ensure => "present",
+ owner => root,
+ group => root,
+ mode => 755,
+ content => "\$use_$name = 1;\n",
+ }
}
+
+ # yes, we could directly use the allow, but this is
+ # a nicer syntax
+ class allow_git {
+ allow{ "git": }
+ }
+
+ class allow_rsync {
+ allow{ "rsync": }
+ }
+
+ class allow_pkgsubmit {
+ allow{ "pkgsubmit": }
+ }
+
+ class allow_svn {
+ allow{ "svn": }
+ }
}
Modified: puppet/modules/restrictshell/templates/membersh-conf.pl
===================================================================
--- puppet/modules/restrictshell/templates/membersh-conf.pl 2010-11-23 01:11:08 UTC (rev 407)
+++ puppet/modules/restrictshell/templates/membersh-conf.pl 2010-11-23 01:11:10 UTC (rev 408)
@@ -1,16 +1,18 @@
-$use_svn = "<%= allow_svn %>";
+
+
$bin_svn = "/usr/bin/svnserve";
$regexp_svn = "^svnserve -t\$";
#@prepend_args_svn = ( '-r', '/svn' );
@prepend_args_svn = ();
-$use_git = "<%= allow_git %>";
$bin_git = "/usr/bin/git-shell";
-$use_rsync = "<%= allow_rsync %>";
$bin_rsync = "/usr/bin/rsync";
$regexp_rsync = "^rsync --server";
$regexp_dir_rsync = "^/.*";
-$use_pkgsubmit = "<%= allow_pkgsubmit %>";
+foreach my $f (glob("/etc/membersh-conf.d/allow_*pl")) {
+ do($f)
+}
+1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101123/0c4827d6/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000803.html">[Mageia-sysadm] [407] - use pam for openssh ( I am not sure if we need to restrict its use
</A></li>
<LI>Next message: <A HREF="000806.html">[Mageia-sysadm] [409] add class for scp and sftp
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#804">[ date ]</a>
<a href="thread.html#804">[ thread ]</a>
<a href="subject.html#804">[ subject ]</a>
<a href="author.html#804">[ 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>
|
