summaryrefslogtreecommitdiff
path: root/src/mongo/installer
diff options
context:
space:
mode:
authorSridhar Nanjundeswaran <sridhar@10gen.com>2013-10-25 09:18:05 -0700
committerSridhar Nanjundeswaran <sridhar@10gen.com>2013-10-28 13:07:19 +0530
commit911461fc883aa34e0deec661261f0ea5486c105e (patch)
treedb36574e34522080255c7e15956489e92af33a73 /src/mongo/installer
parentd8ca8b5faa1447365403cfb8da16a041e7d31d95 (diff)
downloadmongo-911461fc883aa34e0deec661261f0ea5486c105e.tar.gz
SERVER-10870 - Replaced reference to mongod.conf with references to mongodb.conf.master and mongodb.conf.subagent
Diffstat (limited to 'src/mongo/installer')
-rw-r--r--src/mongo/installer/msi/wxs/BinaryFragment.wxs11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
index 04a8679cbe5..2776e171c22 100644
--- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs
+++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
@@ -87,10 +87,14 @@
<File Id="f_snmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb"
DiskId="1" KeyPath="yes" />
</Component>
- <Component Id="c_snmpConf" Guid="4DD0CAD3-97AB-4C11-987A-7ABCFF0D340C">
- <File Id="f_snmpConf" Name="mongod.conf" Source="$(var.EnterpriseBase)\docs\mongod.conf"
+ <Component Id="c_snmpConfMaster" Guid="0C8CAA6C-1473-4B14-9EE5-AF5A35B1DD8D">
+ <File Id="f_snmpConfMaster" Name="mongod.conf.master" Source="$(var.EnterpriseBase)\docs\mongod.conf.master"
DiskId="1" KeyPath="yes" />
</Component>
+ <Component Id="c_snmpConfSubagent" Guid="6FB66102-41A7-41BD-BB1F-1987E150FA78">
+ <File Id="f_snmpConfSubagent" Name="mongod.conf.subagent" Source="$(var.EnterpriseBase)\docs\mongod.conf.subagent"
+ DiskId="1" KeyPath="yes" />
+ </Component>
<Component Id="c_snmpMib" Guid="F3E98C6B-FE42-44E7-8A1F-E47BDDD0A3D7">
<File Id="f_snmpMib" Name="MONGO-MIB.txt" Source="$(var.EnterpriseBase)\docs\MONGO-MIB.txt"
DiskId="1" KeyPath="yes" />
@@ -161,7 +165,8 @@
<ComponentGroupRef Id="cg_EnterpriseBase" />
<ComponentRef Id="c_snmp" />
<ComponentRef Id="c_snmpPdb" />
- <ComponentRef Id="c_snmpConf" />
+ <ComponentRef Id="c_snmpConfMaster" />
+ <ComponentRef Id="c_snmpConfSubagent" />
<ComponentRef Id="c_snmpMib" />
</ComponentGroup>
<ComponentGroup Id="cg_DriverEnterprise">