unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ensure crypto-policices are managed before yumrepos #194

Merged
unkinben merged 1 commits from neoloc/crypto_policies_first into develop 2024-12-08 20:30:09 +11:00
Conversation 0 Commits 1 Files Changed 2 +16 -9
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
site/profiles/manifests/defaults.pp
View File

@ -9,8 +9,9 @@ class profiles::defaults {
Package { Package {
ensure => present, ensure => present,
require => Class['profiles::base::repos'] require => [
Class['profiles::base::repos'],
]
} }
File { File {
@ -34,7 +35,10 @@ class profiles::defaults {
ensure => 'present', ensure => 'present',
enabled => 1, enabled => 1,
gpgcheck => 1, gpgcheck => 1,
require => Class['profiles::pki::vaultca'], require => [
Class['profiles::pki::vaultca'],
Class['crypto_policies'],
],
notify => Exec['dnf_makecache'], notify => Exec['dnf_makecache'],
} }
} }

15
site/profiles/manifests/yum/global.pp
View File

@ -16,12 +16,15 @@ class profiles::yum::global (
purge => $purge, purge => $purge,
} }
#exec {'purge_almalinux_default_repos': # el9 needs to rpmdb rebuild after crypto-policies
# command => 'rm -f /etc/yum.repos.d/almalinux*.repo', if $facts['os']['release']['major'] == '9' {
# path => ['/bin', '/usr/bin'], exec { 'rebuild_rpmdb':
# onlyif => 'find /etc/yum.repos.d/ -type f -name *almalinux* | grep .', command => '/usr/bin/rpmdb --rebuilddb && /usr/bin/touch /root/almalinux9_upgrade_rebuilddb_flag',
# before => Resources['yumrepo'], unless => '/usr/bin/test -f /root/almalinux9_upgrade_rebuilddb_flag',
#} timeout => 180,
require => Class['crypto_policies'],
}
}
# download all gpg keys if a repo defines it # download all gpg keys if a repo defines it
$repos.each |$name, $repo| { $repos.each |$name, $repo| {