Skip to content

Commit c6aec41

Browse files
kamilszymanskikamilszymanski
committed
Add supprot for contrib package
1 parent 78e183c commit c6aec41

File tree

2 files changed

+64
-34
lines changed

2 files changed

+64
-34
lines changed

‎manifests/contrib.pp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Class: postgresql::contrib
2+
#
3+
# This class installs the postgresql contrib package.
4+
#
5+
# Parameters:
6+
# [*package_name*] - The name of the postgresql contrib package.
7+
# [*package_ensure*] - The ensure value of the package.
8+
#
9+
# Actions:
10+
#
11+
# Requires:
12+
#
13+
# Sample Usage:
14+
#
15+
# class { 'postgresql::contrib': }
16+
#
17+
class postgresql::contrib (
18+
$package_name = $postgresql::params::contrib_package_name,
19+
$package_ensure = 'present'
20+
) inherits postgresql::params {
21+
22+
package { 'postgresql-contrib':
23+
ensure => $package_ensure,
24+
name => $package_name,
25+
}
26+
}

‎manifests/params.pp

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,23 @@
2828
# correct paths to the postgres dirs.
2929

3030
class postgresql::params(
31-
$version = $::postgres_default_version,
32-
$manage_package_repo = false,
33-
$package_source = undef,
34-
$locale = undef,
35-
$charset = 'UTF8',
36-
$custom_datadir = undef,
37-
$custom_confdir = undef,
38-
$custom_bindir = undef,
39-
$custom_client_package_name = undef,
40-
$custom_server_package_name = undef,
41-
$custom_devel_package_name = undef,
42-
$custom_java_package_name = undef,
43-
$custom_service_name = undef,
44-
$custom_user = undef,
45-
$custom_group = undef,
46-
$run_initdb = undef
31+
$version = $::postgres_default_version,
32+
$manage_package_repo = false,
33+
$package_source = undef,
34+
$locale = undef,
35+
$charset = 'UTF8',
36+
$custom_datadir = undef,
37+
$custom_confdir = undef,
38+
$custom_bindir = undef,
39+
$custom_client_package_name = undef,
40+
$custom_server_package_name = undef,
41+
$custom_contrib_package_name = undef,
42+
$custom_devel_package_name = undef,
43+
$custom_java_package_name = undef,
44+
$custom_service_name = undef,
45+
$custom_user = undef,
46+
$custom_group = undef,
47+
$run_initdb = undef
4748
) {
4849
$user = pick($custom_user, 'postgres')
4950
$group = pick($custom_group, 'postgres')
@@ -109,21 +110,23 @@
109110
$persist_firewall_command = '/sbin/iptables-save > /etc/sysconfig/iptables'
110111

111112
if $version == $::postgres_default_version {
112-
$client_package_name = pick($custom_client_package_name, 'postgresql')
113-
$server_package_name = pick($custom_server_package_name, 'postgresql-server')
114-
$devel_package_name = pick($custom_devel_package_name, 'postgresql-devel')
115-
$java_package_name = pick($custom_java_package_name, 'postgresql-jdbc')
113+
$client_package_name = pick($custom_client_package_name, 'postgresql')
114+
$server_package_name = pick($custom_server_package_name, 'postgresql-server')
115+
$contrib_package_name = pick($custom_contrib_package_name,'postgresql-contrib')
116+
$devel_package_name = pick($custom_devel_package_name, 'postgresql-devel')
117+
$java_package_name = pick($custom_java_package_name, 'postgresql-jdbc')
116118
$service_name = pick($custom_service_name, 'postgresql')
117119
$bindir = pick($custom_bindir, '/usr/bin')
118120
$datadir = pick($custom_datadir, '/var/lib/pgsql/data')
119121
$confdir = pick($custom_confdir, $datadir)
120122
} else {
121-
$version_parts = split($version, '[.]')
122-
$package_version = "${version_parts[0]}${version_parts[1]}"
123-
$client_package_name = pick($custom_client_package_name, "postgresql${package_version}")
124-
$server_package_name = pick($custom_server_package_name, "postgresql${package_version}-server")
125-
$devel_package_name = pick($custom_devel_package_name, "postgresql${package_version}-devel")
126-
$java_package_name = pick($custom_java_package_name, "postgresql${package_version}-jdbc")
123+
$version_parts = split($version, '[.]')
124+
$package_version = "${version_parts[0]}${version_parts[1]}"
125+
$client_package_name = pick($custom_client_package_name, "postgresql${package_version}")
126+
$server_package_name = pick($custom_server_package_name, "postgresql${package_version}-server")
127+
$contrib_package_name = pick($custom_contrib_package_name,"postgresql${package_version}-contrib")
128+
$devel_package_name = pick($custom_devel_package_name, "postgresql${package_version}-devel")
129+
$java_package_name = pick($custom_java_package_name, "postgresql${package_version}-jdbc")
127130
$service_name = pick($custom_service_name, "postgresql-${version}")
128131
$bindir = pick($custom_bindir, "/usr/pgsql-${version}/bin")
129132
$datadir = pick($custom_datadir, "/var/lib/pgsql/${version}/data")
@@ -154,14 +157,15 @@
154157
}
155158
}
156159

157-
$client_package_name = pick($custom_client_package_name, "postgresql-client-${version}")
158-
$server_package_name = pick($custom_server_package_name, "postgresql-${version}")
159-
$devel_package_name = pick($custom_devel_package_name, 'libpq-dev')
160-
$java_package_name = pick($custom_java_package_name, 'libpostgresql-jdbc-java')
161-
$bindir = pick($custom_bindir, "/usr/lib/postgresql/${version}/bin")
162-
$datadir = pick($custom_datadir, "/var/lib/postgresql/${version}/main")
163-
$confdir = pick($custom_confdir, "/etc/postgresql/${version}/main")
164-
$service_status = "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'"
160+
$client_package_name = pick($custom_client_package_name, "postgresql-client-${version}")
161+
$server_package_name = pick($custom_server_package_name, "postgresql-${version}")
162+
$contrib_package_name = pick($custom_contrib_package_name, "postgresql-contrib-${version}")
163+
$devel_package_name = pick($custom_devel_package_name, 'libpq-dev')
164+
$java_package_name = pick($custom_java_package_name, 'libpostgresql-jdbc-java')
165+
$bindir = pick($custom_bindir, "/usr/lib/postgresql/${version}/bin")
166+
$datadir = pick($custom_datadir, "/var/lib/postgresql/${version}/main")
167+
$confdir = pick($custom_confdir, "/etc/postgresql/${version}/main")
168+
$service_status = "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'"
165169
}
166170

167171
default: {

0 commit comments

Comments
 (0)