Skip to content

Commit 5d3cdc9

Browse files
author
Johan De Wit
committed
[mongos] set fork off by default (see issue #667)
1 parent 2636d3f commit 5d3cdc9

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

manifests/mongos/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
$pidfilepath = '/var/run/mongodb/mongos.pid'
4141
$unixsocketprefix = '/var/run/mongodb'
4242
$logpath = '/var/log/mongodb/mongos.log'
43-
$fork = true
43+
$fork = undef # https://github.com/voxpupuli/puppet-mongodb/issues/667
4444
$service_template = 'mongodb/mongos/RedHat/mongos.service-dropin.epp'
4545
}
4646
}

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
$logpath = '/var/log/mongodb/mongod.log'
5151
$pidfilepath = '/var/run/mongodb/mongod.pid'
5252
$config = '/etc/mongod.conf'
53-
$fork = true
53+
$fork = undef # https://github.com/voxpupuli/puppet-mongodb/issues/667
5454
$journal = true
5555
}
5656
'Debian': {

spec/classes/mongos_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
when 'RedHat', 'Suse'
3131
expected_content = <<~CONFIG
3232
configdb = 127.0.0.1:27019
33-
fork = true
3433
pidfilepath = /var/run/mongodb/mongos.pid
3534
logpath = /var/log/mongodb/mongos.log
3635
unixSocketPrefix = /var/run/mongodb

spec/classes/server_spec.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@
5959
with_content(%r{^systemLog\.path: #{log_path}$})
6060
end
6161

62-
if facts[:os]['family'] == 'Debian'
63-
it { is_expected.not_to contain_file(config_file).with_content(%r{fork}) }
64-
else
65-
it { is_expected.to contain_file(config_file).with_content(%r{^ fork: true$}) }
66-
end
62+
it { is_expected.not_to contain_file(config_file).with_content(%r{fork}) }
6763

6864
it { is_expected.to contain_file('/root/.mongoshrc.js').with_ensure('file').without_content(%r{db\.auth}) }
6965
it { is_expected.not_to contain_exec('fix dbpath permissions') }

0 commit comments

Comments
 (0)