Skip to content

Commit 7e7fc58

Browse files
committed
not installing postgresql-contrib if not need to
- In debian families: postgresql-contrib is a virtual package and it is not needed to be installed. - Archlinux does have postgresql-contrib but it isn't maintained - Gentoo provides contrib in the main package Referencies: https://packages.debian.org/bullseye/postgresql-contrib-13 https://packages.ubuntu.com/bionic/postgresql-contrib
1 parent 1de792f commit 7e7fc58

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

manifests/params.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@
135135
$java_package_name = pick($java_package_name, 'postgresql-jdbc')
136136
# Archlinux doesn't have develop packages
137137
$devel_package_name = pick($devel_package_name, 'postgresql-devel')
138-
# Archlinux does have postgresql-contrib but it isn't maintained
139-
$contrib_package_name = pick($contrib_package_name,'undef')
140138
# Archlinux postgresql package provides plperl
141139
$plperl_package_name = pick($plperl_package_name, 'undef')
142140
$plpython_package_name = pick($plpython_package_name, 'undef')
@@ -163,7 +161,6 @@
163161

164162
$client_package_name = pick($client_package_name, "postgresql-client-${version}")
165163
$server_package_name = pick($server_package_name, "postgresql-${version}")
166-
$contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
167164
if $postgis_version and versioncmp($postgis_version, '2') < 0 {
168165
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis")
169166
} elsif $postgis_version and versioncmp($postgis_version, '3') >= 0 {
@@ -203,7 +200,6 @@
203200

204201
$client_package_name = pick($client_package_name, 'UNSET')
205202
$server_package_name = pick($server_package_name, 'postgresql')
206-
$contrib_package_name = pick_default($contrib_package_name, undef)
207203
$devel_package_name = pick_default($devel_package_name, undef)
208204
$java_package_name = pick($java_package_name, 'jdbc-postgresql')
209205
$perl_package_name = pick($perl_package_name, 'DBD-Pg')

manifests/server/contrib.pp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@
88
String $package_name = $postgresql::params::contrib_package_name,
99
String[1] $package_ensure = 'present'
1010
) inherits postgresql::params {
11-
if $facts['os']['family'] == 'Gentoo' {
12-
fail('osfamily Gentoo does not have a separate "contrib" package, postgresql::server::contrib is not supported.')
13-
}
11+
if $package_name {
12+
package { 'postgresql-contrib':
13+
ensure => $package_ensure,
14+
name => $package_name,
15+
tag => 'puppetlabs-postgresql',
16+
}
1417

15-
package { 'postgresql-contrib':
16-
ensure => $package_ensure,
17-
name => $package_name,
18-
tag => 'puppetlabs-postgresql',
18+
anchor { 'postgresql::server::contrib::start': }
19+
-> Class['postgresql::server::install']
20+
-> Package['postgresql-contrib']
21+
-> Class['postgresql::server::service']
22+
anchor { 'postgresql::server::contrib::end': }
1923
}
20-
21-
anchor { 'postgresql::server::contrib::start': }
22-
-> Class['postgresql::server::install']
23-
-> Package['postgresql-contrib']
24-
-> Class['postgresql::server::service']
25-
anchor { 'postgresql::server::contrib::end': }
2624
}

0 commit comments

Comments
 (0)