NagiosGen: Migrate configuration to conf.d

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/doc/server/plugins/generators/nagiosgen.txt b/doc/server/plugins/generators/nagiosgen.txt
index d2643647b..1ccdd66c1 100644
--- a/doc/server/plugins/generators/nagiosgen.txt
+++ b/doc/server/plugins/generators/nagiosgen.txt
@@ -126,19 +126,19 @@ Create a nagios Bcfg2 bundle ``/var/lib/bcfg2/Bundler/nagios.xml``
 
     <Bundle>
       <Path name='/etc/nagiosgen.status'/>
-      <Group name='rh'>
+      <Group name='redhat'>
         <Group name='nagios-server'>
-          <Path name='/etc/nagios/nagiosgen.cfg'/>
+          <Path name='/etc/nagios/conf.d/bcfg2.cfg'/>
           <Package name='libtool-libs'/>
           <Package name='nagios'/>
           <Package name='nagios-www'/>
           <Service name='nagios'/>
         </Group>
       </Group>
-      <Group name='debian-lenny'>
+      <Group name='debian-wheezy'>
         <Group name='nagios-server'>
-          <Path name='/etc/nagios3/nagiosgen.cfg'
-                      altsrc='/etc/nagios/nagiosgen.cfg'/>
+          <Path name='/etc/nagios3/conf.d/bcfg2.cfg'
+                      altsrc='/etc/nagios/conf.d/bcfg2.cfg'/>
           <Package name='nagios3'/>
           <Package name='nagios3-common'/>
           <Package name='nagios3-doc'/>
@@ -161,10 +161,6 @@ Assign clients to nagios groups in
       <Bundle name='nagios'/>
     </Group>
 
-Update nagios configuration file to use ``nagiosgen.cfg``::
-
-    cfg_file=/etc/nagios/nagiosgen.cfg
-
 Note that some of these files are built on demand, each time a client
 in group "nagios-server" checks in with the Bcfg2 server. Local nagios
 instances can be configured to use the NagiosGen directory in the Bcfg2