diff --git a/hieradata/os/AlmaLinux/all_releases.yaml b/hieradata/os/AlmaLinux/all_releases.yaml index 9a85522..7e78309 100644 --- a/hieradata/os/AlmaLinux/all_releases.yaml +++ b/hieradata/os/AlmaLinux/all_releases.yaml @@ -1,8 +1,8 @@ # hieradata/os/almalinux/all_releases.yaml --- -profiles::yum::base::baseurl: http://repos.main.unkin.net/almalinux -profiles::yum::epel::baseurl: http://repos.main.unkin.net/epel -profiles::yum::unkin::baseurl: http://repos.main.unkin.net/unkin +profiles::yum::base::baseurl: https://repos.main.unkin.net/almalinux +profiles::yum::epel::baseurl: https://repos.main.unkin.net/epel +profiles::yum::unkin::baseurl: https://repos.main.unkin.net/unkin profiles::firewall::firewalld::ensure_package: 'absent' profiles::firewall::firewalld::ensure_service: 'stopped' profiles::firewall::firewalld::enable_service: false diff --git a/site/profiles/manifests/yum/global.pp b/site/profiles/manifests/yum/global.pp index 796b491..18a0d88 100644 --- a/site/profiles/manifests/yum/global.pp +++ b/site/profiles/manifests/yum/global.pp @@ -75,21 +75,25 @@ class profiles::yum::global ( # Setup base repos class { 'profiles::yum::base': managed_repos => $managed_repos, + require => Class['profiles::pki::vaultca'], } # Setup epel if included in managed_repos class { 'profiles::yum::epel': managed_repos => $managed_repos, + require => Class['profiles::pki::vaultca'], } # Setup puppet7 if included in managed_repos class { 'profiles::yum::puppet7': managed_repos => $managed_repos, + require => Class['profiles::pki::vaultca'], } # Setup unkin repo if included in managed_repos class { 'profiles::yum::unkin': managed_repos => $managed_repos, + require => Class['profiles::pki::vaultca'], } # setup dnf-autoupdate diff --git a/site/profiles/manifests/yum/mariadb.pp b/site/profiles/manifests/yum/mariadb.pp index df3d71e..3c6c4e6 100644 --- a/site/profiles/manifests/yum/mariadb.pp +++ b/site/profiles/manifests/yum/mariadb.pp @@ -3,7 +3,7 @@ # This class manages the mariadb yum repository for the system. # class profiles::yum::mariadb ( - String $baseurl = 'http://repos.main.unkin.net', + String $baseurl = 'https://repos.main.unkin.net', String $version = '11.2', Enum[ 'daily', @@ -20,5 +20,6 @@ class profiles::yum::mariadb ( target => '/etc/yum.repos.d/mariadb.repo', baseurl => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/", gpgkey => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/RPM-GPG-KEY-MariaDB", + require => Class['profiles::pki::vaultca'], } }