Skip to content

Commit a19d30c

Browse files
committed
Unbreak on OpenBSD, underprivileged users from packages start with
_underscore, as well as such groups, therefore on OpenBSD, the user:group is _puppetdb:_puppetdb Because of that, instead of the single default in params.pp, move the definition of puppetdb_user and puppetdb_group into one of the OS specific case statement.
1 parent 6be627d commit a19d30c

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

manifests/params.pp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464

6565
$puppetdb_package = 'puppetdb'
6666
$puppetdb_service = 'puppetdb'
67-
$puppetdb_user = 'puppetdb'
68-
$puppetdb_group = 'puppetdb'
6967
$masterless = false
7068

7169
if !($puppetdb_version in ['latest','present','absent']) and versioncmp($puppetdb_version, '3.0.0') < 0 {
@@ -129,12 +127,23 @@
129127

130128
case $::osfamily {
131129
'RedHat', 'Suse', 'Archlinux': {
130+
$puppetdb_user = 'puppetdb'
131+
$puppetdb_group = 'puppetdb'
132132
$puppetdb_initconf = '/etc/sysconfig/puppetdb'
133133
}
134134
'Debian': {
135+
$puppetdb_user = 'puppetdb'
136+
$puppetdb_group = 'puppetdb'
135137
$puppetdb_initconf = '/etc/default/puppetdb'
136138
}
137-
'OpenBSD','FreeBSD': {
139+
'OpenBSD': {
140+
$puppetdb_user = '_puppetdb'
141+
$puppetdb_group = '_puppetdb'
142+
$puppetdb_initconf = undef
143+
}
144+
'FreeBSD': {
145+
$puppetdb_user = 'puppetdb'
146+
$puppetdb_group = 'puppetdb'
138147
$puppetdb_initconf = undef
139148
}
140149
default: {

0 commit comments

Comments
 (0)