Skip to content

Commit da9f338

Browse files
committed
Drop further code for Debian 6 and Ubuntu 10
8cc1660 dropped support for these OS versions, but left this code in. This greatly simplifies the code. Fixes: 8cc1660
1 parent 0a2cb69 commit da9f338

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

manifests/params.pp

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -158,28 +158,12 @@
158158
$user = pick($user, 'postgres')
159159
$group = pick($group, 'postgres')
160160

161-
if $postgresql::globals::manage_package_repo == true {
162-
$needs_initdb = pick($needs_initdb, true)
163-
$service_name = pick($service_name, 'postgresql')
164-
} else {
165-
$needs_initdb = pick($needs_initdb, false)
166-
$service_name = $facts['os']['name'] ? {
167-
'Debian' => pick($service_name, 'postgresql'),
168-
'Ubuntu' => $::lsbmajdistrelease ? {
169-
/^10/ => pick($service_name, "postgresql-${version}"),
170-
default => pick($service_name, 'postgresql'),
171-
},
172-
default => undef
173-
}
174-
}
161+
$needs_initdb = pick($needs_initdb, $postgresql::globals::manage_package_repo == true)
162+
$service_name = pick($service_name, 'postgresql')
175163

176164
$client_package_name = pick($client_package_name, "postgresql-client-${version}")
177165
$server_package_name = pick($server_package_name, "postgresql-${version}")
178-
if $facts['os']['name'] == 'Debian' and $facts['os']['release']['major'] == '10' and $postgresql::globals::manage_package_repo != true {
179-
$contrib_package_name = pick($contrib_package_name, 'postgresql-contrib')
180-
} else {
181-
$contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
182-
}
166+
$contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
183167
if $postgis_version and versioncmp($postgis_version, '2') < 0 {
184168
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis")
185169
} elsif $postgis_version and versioncmp($postgis_version, '3') >= 0 {
@@ -188,13 +172,7 @@
188172
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis-${postgis_version}")
189173
}
190174
$devel_package_name = pick($devel_package_name, 'libpq-dev')
191-
$java_package_name = $facts['os']['name'] ? {
192-
'Debian' => $facts['os']['release']['major'] ? {
193-
'6' => pick($java_package_name, 'libpg-java'),
194-
default => pick($java_package_name, 'libpostgresql-jdbc-java'),
195-
},
196-
default => pick($java_package_name, 'libpostgresql-jdbc-java'),
197-
}
175+
$java_package_name = pick($java_package_name, 'libpostgresql-jdbc-java')
198176
$perl_package_name = pick($perl_package_name, 'libdbd-pg-perl')
199177
$plperl_package_name = pick($plperl_package_name, "postgresql-plperl-${version}")
200178
$plpython_package_name = pick($plpython_package_name, "postgresql-plpython-${version}")

0 commit comments

Comments
 (0)