Skip to content

Commit bbe0dac

Browse files
authored
Merge pull request #354 from puppetlabs/revert-350-postgrescontrib
Revert "postgresql version >=10 onwards does not require contrib package"
2 parents 6b70c48 + 17fb09c commit bbe0dac

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

manifests/database/postgresql.pp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,8 @@
5959
# Only install pg_trgm extension, if database it is actually managed by the module
6060
if $manage_database {
6161

62-
# from postgresql version 10 onwards, this extension is no longer inside
63-
# the contrib package, but is being bundled with the postgresql package itself
64-
if versioncmp($postgres_version, '10') < 0 {
65-
# get the pg contrib to use pg_trgm extension
66-
include postgresql::server::contrib
67-
}
62+
# get the pg contrib to use pg_trgm extension
63+
class { '::postgresql::server::contrib': }
6864

6965
postgresql::server::extension { 'pg_trgm':
7066
database => $database_name,

0 commit comments

Comments
 (0)