diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
index 15a4329..62f0709 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
@@ -937,6 +937,24 @@ inherited by all classes except defines.
       
     </li>
   
+    <li>
+      
+        <span class='name'>ng_user</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;nagios&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The user to run the Nagios service as. Default is ‘nagios’.</p>
+</div>
+      
+    </li>
+  
     <li>
       
         <span class='name'>ng_contactgroup_members</span>
@@ -961,8 +979,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-101
-102
 103
 104
 105
@@ -1130,10 +1146,14 @@ inherited by all classes except defines.
 267
 268
 269
-270</pre>
+270
+271
+272
+273
+274</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 101</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 103</span>
 
 class confdroid_nagios::params (
 
@@ -1148,6 +1168,7 @@ class confdroid_nagios::params (
   String $ng_max_check_attempts     = &#39;10&#39;,
   String $ng_status_upd_interval    = &#39;10&#39;,
   String $ng_check_ext_commands     = &#39;1&#39;,
+  String $ng_user                   = &#39;nagios&#39;,
 
 # contact groups
   String $ng_contactgroup_name       = &#39;admins&#39;,
@@ -1211,6 +1232,7 @@ class confdroid_nagios::params (
 ) {
 # Default facts
   $fqdn                     = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
+  $hostname                 = $facts[&#39;networking&#39;][&#39;hostname&#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;]
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
index 10da427..db6d79d 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
@@ -124,7 +124,181 @@
 26
 27
 28
-29</pre>
+29
+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
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+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
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -151,6 +325,180 @@ class confdroid_nagios::server::service (
       hasstatus  =&gt; true,
       require    =&gt; Exec[&#39;ng_restart_httpd&#39;],
     }
+
+    @@nagios_host { &#39;localhost&#39;:
+      ensure              =&gt; $ng_ping_ensure,
+      alias               =&gt; &#39;localhost&#39;,
+      address             =&gt; &#39;127.0.0.1&#39;,
+      use                 =&gt; &#39;linux-server&#39;,
+      target              =&gt; $ng_target_localhost,
+      hostgroups          =&gt; &#39;linux-servers&#39;,
+      contacts            =&gt; &#39;ops&#39;,
+      max_check_attempts  =&gt; $ng_max_check_attempts,
+      notification_period =&gt; &#39;24x7&#39;,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      check_command       =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
+      notify              =&gt; Service[$ng_service],
+    }
+
+    @@nagios_service { &#39;check_nagios_localhost&#39;:
+      check_command       =&gt; $ng_nagios_service_cmd,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; &#39;localhost&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &#39;localhost_nagios_service&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      contacts            =&gt; &#39;ops&#39;,
+    }
+
+    @@nagios_host { $fqdn:
+      ensure              =&gt; $ng_ping_ensure,
+      alias               =&gt; $hostname,
+      address             =&gt; $fqdn,
+      use                 =&gt; &#39;linux-server&#39;,
+      target              =&gt; $ng_target_host,
+      hostgroups          =&gt; &#39;linux-servers&#39;,
+      contacts            =&gt; &#39;ops&#39;,
+      max_check_attempts  =&gt; $ng_max_check_attempts,
+      notification_period =&gt; &#39;24x7&#39;,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      check_command       =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
+      notify              =&gt; Service[$ng_user],
+    }
+
+    @@nagios_service { &quot;root_partition_${hostname}&quot;:
+      ensure              =&gt; $ng_disk_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; $fqdn,
+      contacts            =&gt; &#39;ops&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &quot;${hostname}_root_partition&quot;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+    }
+
+    if $ng_enable_swap_check == true {
+      @@nagios_service { &quot;Swap_Usage_${hostname}&quot;:
+        ensure              =&gt; $ng_swap_ensure,
+        check_command       =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $fqdn,
+        contacts            =&gt; &#39;ops&#39;,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${hostname}_swap_usage&quot;,
+        servicegroups       =&gt; &#39;linux-services&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; $ng_user,
+        group               =&gt; $ng_user,
+        mode                =&gt; &#39;0640&#39;,
+      }
+    }
+
+    @@nagios_service { &quot;Local_Users_${hostname}&quot;:
+      ensure              =&gt; $ng_users_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; $fqdn,
+      contacts            =&gt; &#39;ops&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &quot;${hostname}_local_users&quot;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+    }
+
+    @@nagios_service { &quot;Total Processes_${hostname}&quot;:
+      ensure              =&gt; $ng_procs_tot_ens,
+      check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; $fqdn,
+      contacts            =&gt; &#39;ops&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &quot;${hostname}_total_processes&quot;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+    }
+
+    @@nagios_service { &quot;Zombie Processes_${hostname}&quot;:
+      ensure              =&gt; $ng_procs_z_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; $fqdn,
+      contacts            =&gt; &#39;ops&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &quot;${hostname}_zombie_processes&quot;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+    }
+
+    @@nagios_service { &quot;Current_Load_${hostname}&quot;:
+      ensure              =&gt; $ng_load_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; $fqdn,
+      contacts            =&gt; &#39;ops&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &quot;${hostname}_current_load&quot;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#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>