Skip to content

Make puppet_confdir configurable #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Make puppet_confdir configurable #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
make puppet_confdir configurable 
$settings::<> vars should generally be configurable because they hold
the compilers value. This can be a problem if for example you're trying
to use this module with Bolt, which returns a temp directory.
  • Loading branch information
@h0tw1r3
h0tw1r3 committed Dec 14, 2023
commit 56b42fc822b8fdbaee8ddf68fd53ac3f133385f9
1 change: 1 addition & 0 deletions manifests/globals.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
class puppetdb::globals (
$version = 'present',
$database = 'postgres',
Stdlib::Absolutepath $puppet_confdir = $settings::confdir,
) {

if !(fact('os.family') in ['RedHat', 'Suse', 'Archlinux', 'Debian', 'OpenBSD', 'FreeBSD']) {
Expand Down
12 changes: 6 additions & 6 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@
$etcdir = '/etc/puppetdb'
$vardir = '/var/lib/puppetdb'
$database_embedded_path = "${vardir}/db/db"
$puppet_confdir = pick($settings::confdir,'/etc/puppet')
$puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppet')
$puppet_service_name = 'puppetmaster'
}
'OpenBSD': {
$etcdir = '/etc/puppetdb'
$vardir = '/var/db/puppetdb'
$database_embedded_path = "${vardir}/db/db"
$puppet_confdir = pick($settings::confdir,'/etc/puppet')
$puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppet')
$puppet_service_name = 'puppetmasterd'
}
'FreeBSD': {
$etcdir = '/usr/local/etc/puppetdb'
$vardir = '/var/db/puppetdb'
$database_embedded_path = "${vardir}/db/db"
$puppet_confdir = pick($settings::confdir,'/usr/local/etc/puppet')
$puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppet')
$puppet_service_name = 'puppetmaster'
}
default: {
Expand All @@ -118,17 +118,17 @@
case fact('os.family') {
'RedHat', 'Suse', 'Archlinux','Debian': {
$etcdir = '/etc/puppetlabs/puppetdb'
$puppet_confdir = pick($settings::confdir,'/etc/puppetlabs/puppet')
$puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet')
$puppet_service_name = 'puppetserver'
}
'OpenBSD': {
$etcdir = '/etc/puppetlabs/puppetdb'
$puppet_confdir = pick($settings::confdir,'/etc/puppetlabs/puppet')
$puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet')
$puppet_service_name = undef
}
'FreeBSD': {
$etcdir = '/usr/local/etc/puppetlabs/puppetdb'
$puppet_confdir = pick($settings::confdir,'/usr/local/etc/puppetlabs/puppet')
$puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppetlabs/puppet')
$puppet_service_name = undef
}
default: {
Expand Down