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
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [526] - move the postgresql server bits to a subclass
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B526%5D%20-%20move%20the%20postgresql%20server%20bits%20to%20a%0A%09subclass&In-Reply-To=%3C20101207024025.3D4513FE29%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="001043.html">
<LINK REL="Next" HREF="001045.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [526] - move the postgresql server bits to a subclass</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B526%5D%20-%20move%20the%20postgresql%20server%20bits%20to%20a%0A%09subclass&In-Reply-To=%3C20101207024025.3D4513FE29%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [526] - move the postgresql server bits to a subclass">root at mageia.org
</A><BR>
<I>Tue Dec 7 03:40:25 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="001043.html">[Mageia-sysadm] [525] like the user type, add a database type
</A></li>
<LI>Next message: <A HREF="001045.html">[Mageia-sysadm] [527] create the database and user on the server, using exported ressources
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1044">[ date ]</a>
<a href="thread.html#1044">[ thread ]</a>
<a href="subject.html#1044">[ subject ]</a>
<a href="author.html#1044">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 526
Author: misc
Date: 2010-12-07 03:40:24 +0100 (Tue, 07 Dec 2010)
Log Message:
-----------
- move the postgresql server bits to a subclass
Modified Paths:
--------------
puppet/manifests/nodes.pp
puppet/modules/postgresql/manifests/init.pp
Modified: puppet/manifests/nodes.pp
===================================================================
--- 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": }
Modified: puppet/modules/postgresql/manifests/init.pp
===================================================================
--- 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") {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101207/c892377e/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001043.html">[Mageia-sysadm] [525] like the user type, add a database type
</A></li>
<LI>Next message: <A HREF="001045.html">[Mageia-sysadm] [527] create the database and user on the server, using exported ressources
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1044">[ date ]</a>
<a href="thread.html#1044">[ thread ]</a>
<a href="subject.html#1044">[ subject ]</a>
<a href="author.html#1044">[ 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>
|
