diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101207/c892377e/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101207/c892377e/attachment-0001.html | 222 |
1 files changed, 222 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101207/c892377e/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101207/c892377e/attachment-0001.html new file mode 100644 index 000000000..009043e8a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101207/c892377e/attachment-0001.html @@ -0,0 +1,222 @@ +<!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>[526] - move the postgresql server bits to a subclass</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>526</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-12-07 03:40:24 +0100 (Tue, 07 Dec 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- move the postgresql server bits to a subclass</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +<li><a href="#puppetmodulespostgresqlmanifestsinitpp">puppet/modules/postgresql/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- puppet/manifests/nodes.pp 2010-12-07 02:40:23 UTC (rev 525) ++++ puppet/manifests/nodes.pp 2010-12-07 02:40:24 UTC (rev 526) +@@ -45,7 +45,7 @@ + # + include default_mageia_server + include bind::bind_master +- include postgresql ++ include postgresql::server + include dns_server + timezone::timezone { "Europe/Paris": } + + +<a id="puppetmodulespostgresqlmanifestsinitpp">Modified: puppet/modules/postgresql/manifests/init.pp</a> +=================================================================== +--- puppet/modules/postgresql/manifests/init.pp 2010-12-07 02:40:23 UTC (rev 525) ++++ puppet/modules/postgresql/manifests/init.pp 2010-12-07 02:40:24 UTC (rev 526) +@@ -1,72 +1,74 @@ + class postgresql { ++ class server { ++ $pgsql_data = "/var/lib/pgsql/data/" ++ $pg_version = '9.0' + +- $pgsql_data = "/var/lib/pgsql/data/" +- $pg_version = '9.0' +- +- # missing requires is corrected in cooker, +- # should be removed +- # once the fix is in a stable release +- package { "postgresql$pg_version-plpgsql": +- alias => "postgresql-plpgsql", +- ensure => installed, +- } +- +- package { "postgresql$pg_version-server": +- alias => "postgresql-server", +- ensure => installed, +- require => Package['postgresql-plpgsql'], +- } +- +- service { postgresql: +- ensure => running, +- subscribe => Package["postgresql-server"], +- hasstatus => true, +- } +- +- exec { "service postgresql reload": +- refreshonly => true, +- subscribe => [ File["postgresql.conf"], +- File["pg_ident.conf"], +- File["pg_hba.conf"] ] +- } +- +- file { '/etc/pam.d/postgresql': +- ensure => present, +- owner => root, +- group => root, +- mode => 644, +- content => template("postgresql/pam"), +- } +- +- file { "postgresql.conf": +- path => "$pgsql_data/postgresql.conf", +- ensure => present, +- owner => postgres, +- group => postgres, +- mode => 600, +- content => template("postgresql/postgresql.conf"), +- require => Package["postgresql-server"], +- } ++ # missing requires is corrected in cooker, ++ # should be removed ++ # once the fix is in a stable release ++ package { "postgresql$pg_version-plpgsql": ++ alias => "postgresql-plpgsql", ++ ensure => installed, ++ } + +- file { 'pg_hba.conf': +- path => "$pgsql_data/pg_hba.conf", +- ensure => present, +- owner => postgres, +- group => postgres, +- mode => 600, +- content => template("postgresql/pg_hba.conf"), +- require => Package["postgresql-server"], ++ package { "postgresql$pg_version-server": ++ alias => "postgresql-server", ++ ensure => installed, ++ require => Package['postgresql-plpgsql'], ++ } ++ ++ service { postgresql: ++ ensure => running, ++ subscribe => Package["postgresql-server"], ++ hasstatus => true, ++ } ++ ++ exec { "service postgresql reload": ++ refreshonly => true, ++ subscribe => [ File["postgresql.conf"], ++ File["pg_ident.conf"], ++ File["pg_hba.conf"] ] ++ } ++ ++ file { '/etc/pam.d/postgresql': ++ ensure => present, ++ owner => root, ++ group => root, ++ mode => 644, ++ content => template("postgresql/pam"), ++ } ++ ++ file { "postgresql.conf": ++ path => "$pgsql_data/postgresql.conf", ++ ensure => present, ++ owner => postgres, ++ group => postgres, ++ mode => 600, ++ content => template("postgresql/postgresql.conf"), ++ require => Package["postgresql-server"], ++ } ++ ++ file { 'pg_hba.conf': ++ path => "$pgsql_data/pg_hba.conf", ++ ensure => present, ++ owner => postgres, ++ group => postgres, ++ mode => 600, ++ content => template("postgresql/pg_hba.conf"), ++ require => Package["postgresql-server"], ++ } ++ ++ file { 'pg_ident.conf': ++ path => "$pgsql_data/pg_ident.conf", ++ ensure => present, ++ owner => postgres, ++ group => postgres, ++ mode => 600, ++ content => template("postgresql/pg_ident.conf"), ++ require => Package["postgresql-server"], ++ } + } + +- file { 'pg_ident.conf': +- path => "$pgsql_data/pg_ident.conf", +- ensure => present, +- owner => postgres, +- group => postgres, +- mode => 600, +- content => template("postgresql/pg_ident.conf"), +- require => Package["postgresql-server"], +- } + + # TODO convert it to a regular type ( so we can later change user and so on ) + define database($description="", $user="postgres") { + +</pre></div> + +</body> +</html>
\ No newline at end of file |