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 +8 -2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6c36e8351 - Show all commits

1
site/profiles/manifests/puppet/puppetdb.pp
View File

@ -34,5 +34,6 @@ class profiles::puppet::puppetdb(
class { 'puppetdb::server': class { 'puppetdb::server':
database_host => $listen_address, database_host => $listen_address,
postgresql_ssl_on => false, postgresql_ssl_on => false,
manage_firewall => false,
} }
} }

9
site/profiles/manifests/puppet/puppetmaster.pp
View File

@ -22,12 +22,17 @@
# #
# Limitations: # Limitations:
# This is designed to work on Unix-like systems. # This is designed to work on Unix-like systems.
class profiles::puppet::puppetmaster { class profiles::puppet::puppetmaster (
String $puppetdb_host = lookup('profiles::puppet::puppetdb::puppetdb_host'),
) {
include profiles::puppet::r10k include profiles::puppet::r10k
include profiles::puppet::g10k include profiles::puppet::g10k
include profiles::puppet::enc include profiles::puppet::enc
include profiles::puppet::autosign include profiles::puppet::autosign
include puppetdb::master::config
class { 'puppetdb::master::config':
puppetdb_server => $puppetdb_host,
}
class { 'profiles::puppet::server': class { 'profiles::puppet::server':
vardir => '/opt/puppetlabs/server/data/puppetserver', vardir => '/opt/puppetlabs/server/data/puppetserver',