From 55f9c24d4b43d5366298a4290e7eb4a9fe29c9ee Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 31 Aug 2023 10:47:46 +0200 Subject: [PATCH] Drop postgresql 8.4/RHEL6 specific code --- manifests/globals.pp | 2 -- manifests/server/pg_hba_rule.pp | 3 --- spec/acceptance/server/grant_spec.rb | 12 +++++------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/manifests/globals.pp b/manifests/globals.pp index e3e81ae9f6..04599c1d9c 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -195,7 +195,6 @@ '9' => '13', '8' => '10', '7' => '9.2', - '6' => '8.4', default => undef, }, }, @@ -247,7 +246,6 @@ } $default_postgis_version = $globals_version ? { - '8.4' => '2.0', '9.0' => '2.1', '9.1' => '2.1', '91' => '2.1', diff --git a/manifests/server/pg_hba_rule.pp b/manifests/server/pg_hba_rule.pp index 24717b232c..1144327951 100644 --- a/manifests/server/pg_hba_rule.pp +++ b/manifests/server/pg_hba_rule.pp @@ -69,9 +69,6 @@ '9.2' => ['trust', 'reject', 'md5', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'], '9.1' => ['trust', 'reject', 'md5', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'], '9.0' => ['trust', 'reject', 'md5', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'radius', 'cert', 'pam'], - '8.4' => ['trust', 'reject', 'md5', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'cert', 'pam'], - '8.3' => ['trust', 'reject', 'md5', 'crypt', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'pam'], - '8.2' => ['trust', 'reject', 'md5', 'crypt', 'password', 'krb5', 'ident', 'ldap', 'pam'], default => ['trust', 'reject', 'scram-sha-256', 'md5', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam', 'crypt', 'bsd'] # lint:ignore:140chars } diff --git a/spec/acceptance/server/grant_spec.rb b/spec/acceptance/server/grant_spec.rb index 41b977eb96..51a4ac1416 100644 --- a/spec/acceptance/server/grant_spec.rb +++ b/spec/acceptance/server/grant_spec.rb @@ -79,16 +79,14 @@ class { 'postgresql::server': } end it 'is expected to run idempotently' do - idempotent_apply(pp) if Gem::Version.new(postgresql_version) >= Gem::Version.new('8.4.0') + idempotent_apply(pp) end it 'is expected to GRANT USAGE ON LANGUAGE plpgsql to ROLE' do - if Gem::Version.new(postgresql_version) >= Gem::Version.new('8.4.0') - ## Check that the privilege was granted to the user - psql("-d #{db} --command=\"SELECT 1 WHERE has_language_privilege('#{user}', 'plpgsql', 'USAGE')\"", superuser) do |r| - expect(r.stdout).to match(%r{$1 row$}) - expect(r.stderr).to eq('') - end + ## Check that the privilege was granted to the user + psql("-d #{db} --command=\"SELECT 1 WHERE has_language_privilege('#{user}', 'plpgsql', 'USAGE')\"", superuser) do |r| + expect(r.stdout).to match(%r{$1 row$}) + expect(r.stderr).to eq('') end end end pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy