Skip to content

Commit 7af3388

Browse files
author
Johan De Wit
committed
[mongos] set fork off by default (see issue #667)
1 parent a70205a commit 7af3388

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
@@ -45,7 +45,7 @@
4545
$pidfilepath = '/var/run/mongodb/mongos.pid'
4646
$unixsocketprefix = '/var/run/mongodb'
4747
$logpath = '/var/log/mongodb/mongos.log'
48-
$fork = true
48+
$fork = undef # https://github.com/voxpupuli/puppet-mongodb/issues/667
4949
$service_template = 'mongodb/mongos/RedHat/mongos.service-dropin.epp'
5050
}
5151
}

manifests/params.pp

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

spec/classes/mongos_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
when 'RedHat', 'Suse'
3535
expected_content = <<~CONFIG
3636
configdb = 127.0.0.1:27019
37-
fork = true
3837
pidfilepath = /var/run/mongodb/mongos.pid
3938
logpath = /var/log/mongodb/mongos.log
4039
unixSocketPrefix = /var/run/mongodb

spec/classes/server_spec.rb

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

82-
if facts[:os]['family'] == 'Debian'
83-
it { is_expected.not_to contain_file(config_file).with_content(%r{fork}) }
84-
else
85-
it { is_expected.to contain_file(config_file).with_content(%r{^ fork: true$}) }
86-
end
82+
it { is_expected.not_to contain_file(config_file).with_content(%r{fork}) }
8783

8884
it { is_expected.to contain_file('/root/.mongoshrc.js').with_ensure('file').without_content(%r{db\.auth}) }
8985
it { is_expected.to contain_file('/var/lib/mongo').with(ensure: 'directory', mode: '0750', owner: mongo_user, group: mongo_group) }

0 commit comments

Comments
 (0)