|
91 | 91 | $etcdir = '/etc/puppetdb' |
92 | 92 | $vardir = '/var/lib/puppetdb' |
93 | 93 | $database_embedded_path = "${vardir}/db/db" |
94 | | - $puppet_confdir = pick($settings::confdir,'/etc/puppet') |
| 94 | + $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppet') |
95 | 95 | $puppet_service_name = 'puppetmaster' |
96 | 96 | } |
97 | 97 | 'OpenBSD': { |
98 | 98 | $etcdir = '/etc/puppetdb' |
99 | 99 | $vardir = '/var/db/puppetdb' |
100 | 100 | $database_embedded_path = "${vardir}/db/db" |
101 | | - $puppet_confdir = pick($settings::confdir,'/etc/puppet') |
| 101 | + $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppet') |
102 | 102 | $puppet_service_name = 'puppetmasterd' |
103 | 103 | } |
104 | 104 | 'FreeBSD': { |
105 | 105 | $etcdir = '/usr/local/etc/puppetdb' |
106 | 106 | $vardir = '/var/db/puppetdb' |
107 | 107 | $database_embedded_path = "${vardir}/db/db" |
108 | | - $puppet_confdir = pick($settings::confdir,'/usr/local/etc/puppet') |
| 108 | + $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppet') |
109 | 109 | $puppet_service_name = 'puppetmaster' |
110 | 110 | } |
111 | 111 | default: { |
|
118 | 118 | case fact('os.family') { |
119 | 119 | 'RedHat', 'Suse', 'Archlinux','Debian': { |
120 | 120 | $etcdir = '/etc/puppetlabs/puppetdb' |
121 | | - $puppet_confdir = pick($settings::confdir,'/etc/puppetlabs/puppet') |
| 121 | + $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet') |
122 | 122 | $puppet_service_name = 'puppetserver' |
123 | 123 | } |
124 | 124 | 'OpenBSD': { |
125 | 125 | $etcdir = '/etc/puppetlabs/puppetdb' |
126 | | - $puppet_confdir = pick($settings::confdir,'/etc/puppetlabs/puppet') |
| 126 | + $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet') |
127 | 127 | $puppet_service_name = undef |
128 | 128 | } |
129 | 129 | 'FreeBSD': { |
130 | 130 | $etcdir = '/usr/local/etc/puppetlabs/puppetdb' |
131 | | - $puppet_confdir = pick($settings::confdir,'/usr/local/etc/puppetlabs/puppet') |
| 131 | + $puppet_confdir = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppetlabs/puppet') |
132 | 132 | $puppet_service_name = undef |
133 | 133 | } |
134 | 134 | default: { |
|
0 commit comments