|
![](https://seccdn.libravatar.org/avatar/c1a4d1ec2995ddf5a2b6e14ef9366e4687b95a51155989e7c07277f2a93f4e6c?s=16&d=retro) |
98a8af6 |
From 59e9caeafb32bf957571ee69036216edc741a8a3 Mon Sep 17 00:00:00 2001
|
|
Lukas Bezdicka |
d311b40 |
From: =?UTF-8?q?Ivan=20Ne=C4=8Das?= <inecas@redhat.com>
|
|
Lukas Bezdicka |
d311b40 |
Date: Tue, 25 Nov 2014 18:14:37 +0100
|
|
Lukas Bezdicka |
d311b40 |
Subject: [PATCH] Fix against mongodb 2.6.5 from epel
|
|
Lukas Bezdicka |
d311b40 |
|
|
Lukas Bezdicka |
d311b40 |
The updated version of mongodb-server in epel7 2.6.5 (resp. it's
|
|
Lukas Bezdicka |
d311b40 |
systemd script) expects the pid file to be at
|
|
Lukas Bezdicka |
d311b40 |
/var/run/mongodb/mongod.pid.
|
|
Lukas Bezdicka |
d311b40 |
|
|
Lukas Bezdicka |
d311b40 |
We expect the same to happen in fedora 22
|
|
Lukas Bezdicka |
d311b40 |
---
|
|
Lukas Bezdicka |
d311b40 |
mongodb/manifests/params.pp | 7 ++++++-
|
|
Lukas Bezdicka |
d311b40 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
Lukas Bezdicka |
d311b40 |
|
|
Lukas Bezdicka |
d311b40 |
diff --git a/mongodb/manifests/params.pp b/mongodb/manifests/params.pp
|
|
Lukas Bezdicka |
d311b40 |
index 7789e27..7c273b2 100644
|
|
Lukas Bezdicka |
d311b40 |
--- a/mongodb/manifests/params.pp
|
|
Lukas Bezdicka |
d311b40 |
+++ b/mongodb/manifests/params.pp
|
|
Lukas Bezdicka |
d311b40 |
@@ -57,7 +57,12 @@ class mongodb::params inherits mongodb::globals {
|
|
Lukas Bezdicka |
d311b40 |
$dbpath = '/var/lib/mongodb'
|
|
Lukas Bezdicka |
d311b40 |
$logpath = '/var/log/mongodb/mongodb.log'
|
|
Lukas Bezdicka |
d311b40 |
$bind_ip = pick($::mongodb::globals::bind_ip, ['127.0.0.1'])
|
|
Lukas Bezdicka |
d311b40 |
- $pidfilepath = '/var/run/mongodb/mongodb.pid'
|
|
Lukas Bezdicka |
d311b40 |
+ if ($::operatingsystem == 'fedora' and versioncmp($::operatingsystemrelease, '22') >= 0 or
|
|
Lukas Bezdicka |
d311b40 |
+ $::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7.0') >= 0) {
|
|
Lukas Bezdicka |
d311b40 |
+ $pidfilepath = '/var/run/mongodb/mongod.pid'
|
|
Lukas Bezdicka |
d311b40 |
+ } else {
|
|
Lukas Bezdicka |
d311b40 |
+ $pidfilepath = '/var/run/mongodb/mongodb.pid'
|
|
Lukas Bezdicka |
d311b40 |
+ }
|
|
Lukas Bezdicka |
d311b40 |
$fork = true
|
|
Lukas Bezdicka |
d311b40 |
$journal = true
|
|
Lukas Bezdicka |
d311b40 |
}
|