Recommit for updates in build 9

doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html

@@ -134,12 +134,12 @@ class confdroid_apache::monitoring::target (
     false: { notify { 'Nagios Service target for check_httpd has been disabled via parameters / ENC override': }
     }
     default: {
-      @@nagios_service { "check_http_${::hostname}":
+      @@nagios_service { "check_http_${fqdn}":
         check_command       => 'check_http',
         use                 => 'generic-service',
-        host_name           => $::fqdn,
+        host_name           => $fqdn,
         notification_period => '24x7',
-        service_description => "${::hostname}_check_http",
+        service_description => "${fqdn}_check_http",
         target              => $ae_target_service,
         owner               => 'nagios',
         group               => 'nagios',

doc/puppet_classes/confdroid_apache_3A_3Aparams.html

@@ -303,7 +303,7 @@ inherited by all classes except defines.
         <span class='type'>(<tt>Boolean</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>true</tt>)</em>
+        <em class="default">(defaults to: <tt>false</tt>)</em>
       
       
         &mdash;
@@ -488,7 +488,13 @@ inherited by all classes except defines.
 99
 100
 101
-102</pre>
+102
+103
+104
+105
+106
+107
+108</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 46</span>
@@ -505,7 +511,7 @@ class confdroid_apache::params (
   Boolean $ae_allow_user_dirs = false,
 
 # nagios
-  Boolean $ae_incl_target     = true,
+  Boolean $ae_incl_target     = false,
   String $ae_target_service  = &#39;/etc/nagios/conf.d/httpd_service.cfg&#39;,
 
 # firewall
@@ -515,6 +521,12 @@ class confdroid_apache::params (
   String $ae_https_port      = &#39;443&#39;,
 
 ) {
+# facts
+  $fqdn                             = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
+  $domain                           = $facts[&#39;networking&#39;][&#39;domain&#39;]
+  $os_name                          = $facts[&#39;os&#39;][&#39;name&#39;]
+  $os_release                       = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
+
 # service
   $ae_service         = &#39;httpd&#39;