diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101123/0c4827d6/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101123/0c4827d6/attachment-0001.html | 183 |
1 files changed, 183 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101123/0c4827d6/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101123/0c4827d6/attachment-0001.html new file mode 100644 index 000000000..689946658 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101123/0c4827d6/attachment-0001.html @@ -0,0 +1,183 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[408] - split the module in 2 part, and add class to allow to more easyly</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>408</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-23 02:11:10 +0100 (Tue, 23 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- split the module in 2 part, and add class to allow to more easyly +combine the autorized shell</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesrestrictshellmanifestsinitpp">puppet/modules/restrictshell/manifests/init.pp</a></li> +<li><a href="#puppetmodulesrestrictshelltemplatesmembershconfpl">puppet/modules/restrictshell/templates/membersh-conf.pl</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesrestrictshellmanifestsinitpp">Modified: puppet/modules/restrictshell/manifests/init.pp</a> +=================================================================== +--- 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": } ++ } + } + +<a id="puppetmodulesrestrictshelltemplatesmembershconfpl">Modified: puppet/modules/restrictshell/templates/membersh-conf.pl</a> +=================================================================== +--- 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; + +</pre></div> + +</body> +</html>
\ No newline at end of file |