diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101124/ed0d31e3/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101124/ed0d31e3/attachment.html | 173 |
1 files changed, 173 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101124/ed0d31e3/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101124/ed0d31e3/attachment.html new file mode 100644 index 000000000..139925ccb --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101124/ed0d31e3/attachment.html @@ -0,0 +1,173 @@ +<!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>[437] the previous trick didn't work as tags are dependent in the order of</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>437</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-24 00:17:48 +0100 (Wed, 24 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>the previous trick didn't work as tags are dependent in the order of +declaration ( and that's bad (tm) ). This one is safer.</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestscommonpp">puppet/manifests/common.pp</a></li> +<li><a href="#puppetmodulesopensshmanifestsinitpp">puppet/modules/openssh/manifests/init.pp</a></li> +<li><a href="#puppetmodulesopensshtemplatessshd_config">puppet/modules/openssh/templates/sshd_config</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesopensshtemplatessshd_config_ldap">puppet/modules/openssh/templates/sshd_config_ldap</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestscommonpp">Modified: puppet/manifests/common.pp</a> +=================================================================== +--- puppet/manifests/common.pp 2010-11-23 23:17:47 UTC (rev 436) ++++ puppet/manifests/common.pp 2010-11-23 23:17:48 UTC (rev 437) +@@ -87,7 +87,7 @@ + class default_mageia_server { + include timezone + +- include openssh ++ include openssh::server + include default_ssh_root_key + include base_packages + include ntp + +<a id="puppetmodulesopensshmanifestsinitpp">Modified: puppet/modules/openssh/manifests/init.pp</a> +=================================================================== +--- puppet/modules/openssh/manifests/init.pp 2010-11-23 23:17:47 UTC (rev 436) ++++ puppet/modules/openssh/manifests/init.pp 2010-11-23 23:17:48 UTC (rev 437) +@@ -1,31 +1,36 @@ + class openssh { ++ class server { ++ # some trick to manage sftp server, who is arch dependent on mdv ++ $path_to_sftp = "$lib_dir/ssh/" + +- # some trick to manage sftp server, who is arch dependent on mdv +- $path_to_sftp = "$lib_dir/ssh/" ++ package { "openssh-server": ++ ensure => installed ++ } + +- package { "openssh-server": +- ensure => installed +- } ++ service { sshd: ++ ensure => running, ++ path => "/etc/init.d/sshd", ++ subscribe => [ Package["openssh-server"] ] ++ } + +- service { sshd: +- ensure => running, +- path => "/etc/init.d/sshd", +- subscribe => [ Package["openssh-server"], File["sshd_config"] ] +- } + +- file { "sshd_config": +- path => "/etc/ssh/sshd_config", +- ensure => present, +- owner => root, +- group => root, +- mode => 644, +- require => Package["openssh-server"], +- content => template("openssh/sshd_config") ++ file { "/etc/ssh/sshd_config": ++ ensure => present, ++ owner => root, ++ group => root, ++ mode => 644, ++ require => Package["openssh-server"], ++ content => template("openssh/sshd_config"), ++ notify => Service["sshd"] ++ } + } + +- +- class ssh_keys_from_ldap { ++ class ssh_keys_from_ldap inherits server { + ++ File ["/etc/ssh/sshd_config"] { ++ content => template("openssh/sshd_config","openssh/sshd_config_ldap") ++ } ++ + package { 'python-ldap': + ensure => installed, + } + +<a id="puppetmodulesopensshtemplatessshd_config">Modified: puppet/modules/openssh/templates/sshd_config</a> +=================================================================== +--- puppet/modules/openssh/templates/sshd_config 2010-11-23 23:17:47 UTC (rev 436) ++++ puppet/modules/openssh/templates/sshd_config 2010-11-23 23:17:48 UTC (rev 437) +@@ -45,11 +45,7 @@ + #PubkeyAuthentication yes + #AuthorizedKeysFile .ssh/authorized_keys + +-<% if all_tags.include?('openssh::ssh_keys_from_ldap') %> +-AuthorizedKeysFile /var/lib/config/pubkeys/%u/authorized_keys +-<% end %> + +- + # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts + #RhostsRSAAuthentication no + # similar for protocol version 2 + +<a id="puppetmodulesopensshtemplatessshd_config_ldap">Added: puppet/modules/openssh/templates/sshd_config_ldap</a> +=================================================================== +--- puppet/modules/openssh/templates/sshd_config_ldap (rev 0) ++++ puppet/modules/openssh/templates/sshd_config_ldap 2010-11-23 23:17:48 UTC (rev 437) +@@ -0,0 +1,3 @@ ++ ++AuthorizedKeysFile /var/lib/config/pubkeys/%u/authorized_keys ++ + +</pre></div> + +</body> +</html>
\ No newline at end of file |