Recommit for updates in build 192

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html

@@ -234,40 +234,7 @@
 136
 137
 138
-139
+139</pre>
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/nagios.pp', line 6</span>
@@ -404,39 +371,6 @@ class confdroid_nagios::server::nagios (
       mode                =&gt; &#39;0640&#39;,
       notify              =&gt; Service[$ng_service],
     }
-
-    resources { [&#39;nagios_host&#39;,
-        &#39;nagios_hostgroup&#39;,
-        &#39;nagios_hostdependency&#39;,
-        &#39;nagios_hostescalation&#39;,
-        &#39;nagios_hostextinfo&#39;,
-        &#39;nagios_service&#39;,
-        &#39;nagios_servicegroup&#39;,
-        &#39;nagios_servicedependency&#39;,
-        &#39;nagios_serviceescalation&#39;,
-        &#39;nagios_serviceextinfo&#39;,
-        &#39;nagios_contact&#39;,
-        &#39;nagios_contactgroup&#39;,
-        &#39;nagios_command&#39;,
-      &#39;nagios_timeperiod&#39;]:
-        purge =&gt; true,
-    }
-
-    # collect resources and populate /etc/nagios/conf.d/nagios_*.cfg
-    Nagios_host &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_hostgroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_hostdependency &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_hostescalation &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_hostextinfo &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_service &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_servicegroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_servicedependency &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_serviceescalation &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_serviceextinfo &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_contact &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_contactgroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_command &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
-    Nagios_timeperiod &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html

@@ -125,7 +125,41 @@
 27
 28
 29
-30</pre>
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -153,6 +187,40 @@ class confdroid_nagios::server::service (
       hasstatus  =&gt; true,
       require    =&gt; Exec[&#39;ng_restart_httpd&#39;],
     }
+
+    resources { [&#39;nagios_host&#39;,
+        &#39;nagios_hostgroup&#39;,
+        &#39;nagios_hostdependency&#39;,
+        &#39;nagios_hostescalation&#39;,
+        &#39;nagios_hostextinfo&#39;,
+        &#39;nagios_service&#39;,
+        &#39;nagios_servicegroup&#39;,
+        &#39;nagios_servicedependency&#39;,
+        &#39;nagios_serviceescalation&#39;,
+        &#39;nagios_serviceextinfo&#39;,
+        &#39;nagios_contact&#39;,
+        &#39;nagios_contactgroup&#39;,
+        &#39;nagios_command&#39;,
+      &#39;nagios_timeperiod&#39;]:
+        purge =&gt; true,
+    }
+
+    # collect resources and populate /etc/nagios/conf.d/nagios_*.cfg
+    Nagios_host &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_hostgroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_hostdependency &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_hostescalation &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_hostextinfo &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_service &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_servicegroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_servicedependency &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_serviceescalation &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_serviceextinfo &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_contact &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_contactgroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_command &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+    Nagios_timeperiod &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+
   }
 }</pre>
       </td>