Skip to content

Commit

Permalink
Fix against mongodb 2.6.5 from epel
Browse files Browse the repository at this point in the history
The updated version of mongodb-server in epel7 2.6.5 (resp. it's
systemd script) expects the pid file to be at
/var/run/mongodb/mongod.pid.

We expect the same to happen in fedora 22

(cherry picked from commit c0a0e16)

Conflicts:
	mongodb/manifests/params.pp
  • Loading branch information
iNecas authored and strider committed Feb 16, 2015
1 parent ad51a20 commit fc58b47
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion mongodb/manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@
$dbpath = '/var/lib/mongodb'
$logpath = '/var/log/mongodb/mongodb.log'
$bind_ip = pick($bind_ip, ['127.0.0.1'])
$pidfilepath = '/var/run/mongodb/mongodb.pid'
if ($::operatingsystem == 'fedora' and versioncmp($::operatingsystemrelease, '22') >= 0 or
$::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
$pidfilepath = '/var/run/mongodb/mongod.pid'
} else {
$pidfilepath = '/var/run/mongodb/mongodb.pid'
}
$fork = true
$journal = true
}
Expand Down

0 comments on commit fc58b47

Please sign in to comment.