promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
2 changed files with 16 additions and 9 deletions
Showing only changes of commit bed0ef3c79 - Show all commits

View File

@ -9,6 +9,8 @@ class profiles::defaults {
Package { Package {
ensure => present, ensure => present,
require => Class['profiles::base::repos']
} }
File { File {
@ -29,6 +31,11 @@ class profiles::defaults {
} }
Yumrepo { Yumrepo {
ensure => 'present',
enabled => 1,
gpgcheck => 1,
mirrorlist => 'absent',
require => Class['profiles::pki::vaultca'], require => Class['profiles::pki::vaultca'],
notify => Exec['dnf_makecache'],
} }
} }

View File

@ -52,13 +52,6 @@ class profiles::yum::global (
}, },
} }
Yumrepo {
ensure => 'present',
enabled => 1,
gpgcheck => 1,
mirrorlist => 'absent',
}
resources { 'yumrepo': resources { 'yumrepo':
purge => $purge, purge => $purge,
} }
@ -102,6 +95,13 @@ class profiles::yum::global (
require => Class['profiles::pki::vaultca'], require => Class['profiles::pki::vaultca'],
} }
# makecache if changes made to repos
exec {'dnf_makecache':
command => 'dnf makecache -q',
path => ['/usr/bin', '/bin'],
refreshonly => true,
}
# setup dnf-autoupdate # setup dnf-autoupdate
include profiles::yum::autoupdater include profiles::yum::autoupdater