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

promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
Conversation 0 Commits 449 Files Changed 291 +9 -4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51d0ca16ec - Show all commits

6
hieradata/os/AlmaLinux/all_releases.yaml
View File

@ -1,8 +1,8 @@
# hieradata/os/almalinux/all_releases.yaml # hieradata/os/almalinux/all_releases.yaml
--- ---
profiles::yum::base::baseurl: http://repos.main.unkin.net/almalinux profiles::yum::base::baseurl: https://repos.main.unkin.net/almalinux
profiles::yum::epel::baseurl: http://repos.main.unkin.net/epel profiles::yum::epel::baseurl: https://repos.main.unkin.net/epel
profiles::yum::unkin::baseurl: http://repos.main.unkin.net/unkin profiles::yum::unkin::baseurl: https://repos.main.unkin.net/unkin
profiles::firewall::firewalld::ensure_package: 'absent' profiles::firewall::firewalld::ensure_package: 'absent'
profiles::firewall::firewalld::ensure_service: 'stopped' profiles::firewall::firewalld::ensure_service: 'stopped'
profiles::firewall::firewalld::enable_service: false profiles::firewall::firewalld::enable_service: false

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

@ -75,21 +75,25 @@ class profiles::yum::global (
# Setup base repos # Setup base repos
class { 'profiles::yum::base': class { 'profiles::yum::base':
managed_repos => $managed_repos, managed_repos => $managed_repos,
require => Class['profiles::pki::vaultca'],
} }
# Setup epel if included in managed_repos # Setup epel if included in managed_repos
class { 'profiles::yum::epel': class { 'profiles::yum::epel':
managed_repos => $managed_repos, managed_repos => $managed_repos,
require => Class['profiles::pki::vaultca'],
} }
# Setup puppet7 if included in managed_repos # Setup puppet7 if included in managed_repos
class { 'profiles::yum::puppet7': class { 'profiles::yum::puppet7':
managed_repos => $managed_repos, managed_repos => $managed_repos,
require => Class['profiles::pki::vaultca'],
} }
# Setup unkin repo if included in managed_repos # Setup unkin repo if included in managed_repos
class { 'profiles::yum::unkin': class { 'profiles::yum::unkin':
managed_repos => $managed_repos, managed_repos => $managed_repos,
require => Class['profiles::pki::vaultca'],
} }
# setup dnf-autoupdate # setup dnf-autoupdate

3
site/profiles/manifests/yum/mariadb.pp
View File

@ -3,7 +3,7 @@
# This class manages the mariadb yum repository for the system. # This class manages the mariadb yum repository for the system.
# #
class profiles::yum::mariadb ( class profiles::yum::mariadb (
String $baseurl = 'http://repos.main.unkin.net', String $baseurl = 'https://repos.main.unkin.net',
String $version = '11.2', String $version = '11.2',
Enum[ Enum[
'daily', 'daily',
@ -20,5 +20,6 @@ class profiles::yum::mariadb (
target => '/etc/yum.repos.d/mariadb.repo', target => '/etc/yum.repos.d/mariadb.repo',
baseurl => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/", baseurl => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/",
gpgkey => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/RPM-GPG-KEY-MariaDB", gpgkey => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/RPM-GPG-KEY-MariaDB",
require => Class['profiles::pki::vaultca'],
} }
} }