(maint) Fix path to configuration files on FreeBSD

smortex · smortex · commit 8b6b926cbb29 · 2024-01-31T10:59:33.000-10:00
The FreeBSD ports install PuppetDB configuration in
/usr/local/etc/puppetdb.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -127,8 +127,8 @@
         $puppet_service_name = undef
       }
       'FreeBSD': {
-        $etcdir              = '/usr/local/etc/puppetlabs/puppetdb'
-        $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppetlabs/puppet')
+        $etcdir              = '/usr/local/etc/puppetdb'
+        $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppet')
         $puppet_service_name = 'puppetserver'
       }
       default: {

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,8 @@`
`127`	`127`	`$puppet_service_name = undef`
`128`	`128`	`}`
`129`	`129`	`'FreeBSD': {`
`130`		`- $etcdir = '/usr/local/etc/puppetlabs/puppetdb'`
`131`		`- $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppetlabs/puppet')`
	`130`	`+ $etcdir = '/usr/local/etc/puppetdb'`
	`131`	`+ $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppet')`
`132`	`132`	`$puppet_service_name = 'puppetserver'`
`133`	`133`	`}`
`134`	`134`	`default: {`