SERVER-14750: convert config files to yaml for packages

2 files changed, 57 insertions, 123 deletions

diff --git a/debian/mongod.conf b/debian/mongod.conf
index 3c343aa67d4..7559d3a4659 100644
--- a/debian/mongod.conf
+++ b/debian/mongod.conf
@@ -1,75 +1,41 @@
 # mongod.conf
 
-# Where to store the data.
+# for documentation of all options, see:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
 
-# Note: if you run mongodb as a non-root user (recommended) you may
-# need to create and set permissions for this directory manually,
-# e.g., if the parent directory isn't mutable by the mongodb user.
-dbpath=/var/lib/mongodb
+# Where and how to store data.
+storage:
+  dbPath: /var/lib/mongodb
+  journal:
+    enabled: true
+#  engine:
+#  mmapv1:
+#  wiredTiger:
 
-#where to log
-logpath=/var/log/mongodb/mongod.log
+# where to write logging data.
+systemLog:
+  destination: file
+  logAppend: true
+  path: /var/log/mongodb/mongod.log
 
-logappend=true
+# network interfaces
+net:
+  port: 27017
+  bindIp: 127.0.0.1
 
-#port = 27017
 
-# Listen to local interface only. Comment out to listen on all interfaces. 
-bind_ip = 127.0.0.1
+#processManagement:
 
-# Disables write-ahead journaling
-# nojournal = true
+#security:
 
-# Enables periodic logging of CPU utilization and I/O wait
-#cpu = true
+#operationProfiling:
 
-# Turn on/off security.  Off is currently the default
-#noauth = true
-#auth = true
+#replication:
 
-# Verbose logging output.
-#verbose = true
+#sharding:
 
-# Inspect all client data for validity on receipt (useful for
-# developing drivers)
-#objcheck = true
+## Enterprise-Only Options:
 
-# Enable db quota management
-#quota = true
+#auditLog:
 
-# Set oplogging level where n is
-#   0=off (default)
-#   1=W
-#   2=R
-#   3=both
-#   7=W+some reads
-#diaglog = 0
-
-# Ignore query hints
-#nohints = true
-
-# Enable the HTTP interface (Defaults to port 28017).
-#httpinterface = true
-
-# Turns off server-side scripting.  This will result in greatly limited
-# functionality
-#noscripting = true
-
-# Turns off table scans.  Any query that would do a table scan fails.
-#notablescan = true
-
-# Disable data file preallocation.
-#noprealloc = true
-
-# Specify .ns file size for new databases.
-# nssize = <size>
-
-# Replication Options
-
-# in replicated mongo databases, specify the replica set name here
-#replSet=setname
-# maximum size in megabytes for replication operation log
-#oplogSize=1024
-# path to a key file storing authentication info for connections
-# between replica set members
-#keyFile=/path/to/keyfile
+#snmp:
diff --git a/rpm/mongod.conf b/rpm/mongod.conf
index 7c77ee7fbcb..f67ffce4fbb 100644
--- a/rpm/mongod.conf
+++ b/rpm/mongod.conf
@@ -1,76 +1,44 @@
 # mongod.conf
 
-#where to log
-logpath=/var/log/mongodb/mongod.log
+# for documentation of all options, see:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
 
-logappend=true
+# where to write logging data.
+systemLog:
+  destination: file
+  logAppend: true
+  path: /var/log/mongodb/mongod.log
 
-# fork and run in background
-fork=true
+# Where and how to store data.
+storage:
+  dbPath: /var/lib/mongo
+  journal:
+    enabled: true
+#  engine:
+#  mmapv1:
+#  wiredTiger:
 
-#port=27017
+# how the process runs
+processManagement:
+  fork: true  # fork and run in background
+  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
 
-dbpath=/var/lib/mongo
+# network interfaces
+net:
+  port: 27017
+  bindIp: 127.0.0.1  # Listen to local interface only, comment to listen on all interfaces.
 
-# location of pidfile
-pidfilepath=/var/run/mongodb/mongod.pid
 
-# Listen to local interface only. Comment out to listen on all interfaces. 
-bind_ip=127.0.0.1
+#security:
 
-# Disables write-ahead journaling
-# nojournal=true
+#operationProfiling:
 
-# Enables periodic logging of CPU utilization and I/O wait
-#cpu=true
+#replication:
 
-# Turn on/off security.  Off is currently the default
-#noauth=true
-#auth=true
+#sharding:
 
-# Verbose logging output.
-#verbose=true
+## Enterprise-Only Options
 
-# Inspect all client data for validity on receipt (useful for
-# developing drivers)
-#objcheck=true
+#auditLog:
 
-# Enable db quota management
-#quota=true
-
-# Set oplogging level where n is
-#   0=off (default)
-#   1=W
-#   2=R
-#   3=both
-#   7=W+some reads
-#diaglog=0
-
-# Ignore query hints
-#nohints=true
-
-# Enable the HTTP interface (Defaults to port 28017).
-#httpinterface=true
-
-# Turns off server-side scripting.  This will result in greatly limited
-# functionality
-#noscripting=true
-
-# Turns off table scans.  Any query that would do a table scan fails.
-#notablescan=true
-
-# Disable data file preallocation.
-#noprealloc=true
-
-# Specify .ns file size for new databases.
-# nssize=<size>
-
-# Replication Options
-
-# in replicated mongo databases, specify the replica set name here
-#replSet=setname
-# maximum size in megabytes for replication operation log
-#oplogSize=1024
-# path to a key file storing authentication info for connections
-# between replica set members
-#keyFile=/path/to/keyfile
+#snmp: