Skip to content

Add ADMIN OPTION when granting a role #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add ADMIN OPTION when granting a role #1618

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12ed576
update GPG key
vaol Jan 4, 2024
e8c1db2
specific GPG key for RH7
vaol Jan 5, 2024
2d652f7
add parameter with_admin_option
vaol Oct 13, 2024
602588f
add parameter with_admin_option
vaol Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
specific GPG key for RH7
  • Loading branch information
@vaol
vaol committed Jan 5, 2024
commit e8c1db205f8d121c496f0799566473940159aa5f
0 files/RPM-GPG-KEY-PGDG-common → files/RPM-GPG-KEY-PGDG-7
View file
Open in desktop
File renamed without changes.
26 changes: 11 additions & 15 deletions manifests/repo/yum_postgresql_org.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
# @api private
class postgresql::repo::yum_postgresql_org inherits postgresql::repo {
$version_parts = split($postgresql::repo::version, '[.]')
$package_version = "${version_parts[0]}${version_parts[1]}"
$gpg_key_path = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}"
$gpg_key_path_common = '/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-common'
$version_parts = split($postgresql::repo::version, '[.]')
$package_version = "${version_parts[0]}${version_parts[1]}"
$gpg_key_path = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}"

file { $gpg_key_path:
content => file('postgresql/RPM-GPG-KEY-PGDG'),
owner => 'root',
group => 'root',
mode => '0644',
before => Yumrepo['yum.postgresql.org'],
$gpg_key_file = $facts['os']['release']['major'] ? {
'7' => 'postgresql/RPM-GPG-KEY-PGDG-7',
default => 'postgresql/RPM-GPG-KEY-PGDG',
}

file { $gpg_key_path_common:
content => file('postgresql/RPM-GPG-KEY-PGDG-common'),
file { $gpg_key_path:
content => file($gpg_key_file),
owner => 'root',
group => 'root',
mode => '0644',
before => Yumrepo['pgdg-common'],
before => Yumrepo['yum.postgresql.org'],
}

if($facts['os']['name'] == 'Fedora') {
Expand All @@ -39,7 +35,7 @@
baseurl => $_baseurl,
enabled => 1,
gpgcheck => 1,
gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}",
gpgkey => "file://${gpg_key_path}",
proxy => $postgresql::repo::proxy,
}

Expand All @@ -48,7 +44,7 @@
baseurl => $_commonurl,
enabled => 1,
gpgcheck => 1,
gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-common',
gpgkey => "file://${gpg_key_path}",
proxy => $postgresql::repo::proxy,
}

Expand Down