diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp
deleted file mode 100644
index e69de29..0000000
diff --git a/manifests/nagios/config.pp b/manifests/nagios/config.pp
new file mode 100644
index 0000000..07eadfb
--- /dev/null
+++ b/manifests/nagios/config.pp
@@ -0,0 +1,24 @@
+## confdroid_nagios::server::nagios::config.pp
+# Module name: confdroid_nagios
+# Author: 12ww1160 (12ww1160@confdroid.com)
+# @summary  Class manages the nagios objects definitions.
+#############################################################################
+class confdroid_nagios::nagios::config (
+
+) inherits confdroid_nagios::params {
+  if $ng_nagios_server == $fqdn {
+    require confdroid_nagios::nagios::objects::commands
+    #require confdroid_nagios::nagios::objects::template_rules
+    #require confdroid_nagios::nagios::objects::contacts
+    #require confdroid_nagios::nagios::objects::add_contact_rules
+    #require confdroid_nagios::nagios::objects::contactgroups
+    #require confdroid_nagios::nagios::objects::add_contactgroups_rules
+    #require confdroid_nagios::nagios::objects::hostgroups
+    #require confdroid_nagios::nagios::objects::add_hostgroup_rules
+    #require confdroid_nagios::nagios::objects::servicegroups
+    #require confdroid_nagios::nagios::objects::add_servicegroup_rules
+    #require confdroid_nagios::nagios::objects::timeperiods
+    #require confdroid_nagios::nagios::objects::add_timeperiod_rules
+    require confdroid_nagios::nagios::resources::resource
+  }
+}
diff --git a/manifests/nagios/objects/commands.pp b/manifests/nagios/objects/commands.pp
index 1fd5770..3d6bf11 100644
--- a/manifests/nagios/objects/commands.pp
+++ b/manifests/nagios/objects/commands.pp
@@ -8,7 +8,7 @@
 class confdroid_nagios::nagios::objects::commands (
 
 ) inherits confdroid_nagios::params {
-  if $fqdn == $ng_nagios_server {
+  if $ng_nagios_server == $fqdn {
     @@nagios_command { 'notify-host-by-email':
       ensure       => present,
       command_name => 'notify-host-by-email',
diff --git a/manifests/nagios/resources/resource.pp b/manifests/nagios/resources/resource.pp
index 6435cd1..4136a72 100644
--- a/manifests/nagios/resources/resource.pp
+++ b/manifests/nagios/resources/resource.pp
@@ -11,7 +11,7 @@
 class confdroid_nagios::nagios::resources::resource (
 
 ) inherits confdroid_nagios::params {
-  if $fqdn == $ng_nagios_server {
+  if $ng_nagios_server == $fqdn {
     concat { $ng_resource_file:
       ensure   => present,
       owner    => 'root',
diff --git a/manifests/nagios/resources/resource_df.pp b/manifests/nagios/resources/resource_df.pp
index 8c114ea..346e5ce 100644
--- a/manifests/nagios/resources/resource_df.pp
+++ b/manifests/nagios/resources/resource_df.pp
@@ -19,7 +19,7 @@ define confdroid_nagios::nagios::resources::resource_df (
   $ng_resource_file = $confdroid_nagios::params::ng_resource_file
   $fqdn = $facts['networking']['fqdn']
 
-  if $fqdn == $ng_nagios_server {
+  if $ng_nagios_server == $fqdn {
     concat::fragment { "rule_${name}":
       target  => $ng_resource_file,
       content => template($ng_resource_rule_erb),
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 2a241da..374cc0b 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -9,8 +9,7 @@ class confdroid_nagios::server::service (
   require confdroid_nagios::server::files
   if $ng_nagios_server == $fqdn {
     require confdroid_nagios::server::access_rules
-    require confdroid_nagios::nagios::resources::resource
-    require confdroid_nagios::nagios::objects::commands
+    require confdroid_nagios::nagios::config
 
     exec { 'ng_restart_httpd':
       command     => 'systemctl restart httpd',