Index: trunk/exodus/templates/nagios/exodus.cfg
===================================================================
--- trunk/exodus/templates/nagios/exodus.cfg	(revision 6615)
+++ trunk/exodus/templates/nagios/exodus.cfg	(revision 6617)
@@ -1,2 +1,12 @@
+# This configuration is generated on {% now "G:i j-n-Y" %} by exodus
+# You can fetch the latest config @ exodus under view/nagios
+{% for node in nodes %}
+{% include "nagios/object.nagios" %}{# generate host definition #}
+{% include "nagios/services/check_snmp.nagios" %}{# generate service definitions #}
+{% include "nagios/services/check_dns.nagios" %}
+{% include "nagios/services/check_pen.nagios" %}
+{% include "nagios/services/check_version.nagios" %}
+{% include "nagios/interface.nagios" %}{# generate interface services and dependencies #}
+{% endfor %}
 {# Main template for nagios configuration.                               #}
 {# Nagios object templates can be identified with the .nagios extension  #}
@@ -6,16 +16,2 @@
 {# and make use of the 'parents' directive in the object.cfg.            #}
 {# ? possibly inserted in template with template tags ?                  #}
-
-{% for node in nodes %}
-    {# generate host definition #}
-    {% include "nagios/object.nagios" %}
-    
-    {# generate service definitions #}
-    {% include "nagios/services/check_snmp.nagios" %}
-    {% include "nagios/services/check_dns.nagios" %}
-    {% include "nagios/services/check_pen.nagios" %}
-    {% include "nagios/services/check_version.nagios" %}
-    
-    {# generate interface services and dependencies #}
-    {% include "nagios/interface.nagios" %}  
-{% endfor %}
Index: trunk/exodus/templates/nagios/interface.nagios
===================================================================
--- trunk/exodus/templates/nagios/interface.nagios	(revision 6615)
+++ trunk/exodus/templates/nagios/interface.nagios	(revision 6617)
@@ -1,8 +1,6 @@
-{# This template file coordinates specific service checks for the various interface types #}
 {% for nic in node.interface_set.all %}
-    {% include nagios/services/check_if.nagios}
-    {# if it's a managed interface create a dependency to it's master#}
-    {% ifnotequal nic nic.link %}
-        {% include nagios/services/dependend_interface.nagios}
-    {% endifnotequal %}
+{% include "nagios/services/check_if.nagios" %}
+{% ifnotequal nic nic.link %}{# If the node is a client make it depend of it's master #}
+{% include "nagios/services/depend_interface.nagios" %}
+{% endifnotequal %}
 {% endfor %}
Index: trunk/exodus/templates/nagios/object.nagios
===================================================================
--- trunk/exodus/templates/nagios/object.nagios	(revision 6615)
+++ trunk/exodus/templates/nagios/object.nagios	(revision 6617)
@@ -1,13 +1,13 @@
 define host {
-    host_name       {{ node.name }}
-    alias           {{ node.name }}.{{ node.network.name }}
-    use             nodes
-    address         {{ node.masterip }}
-    check_command   check_alive
-    hostgroups      {{ node.network.name }}
-    notes           This configuration is generated on {% now "G:i j-n-Y" %} by exodus
-    notes_url       {% url exodus.views.viewNode node.name %}
-    icon_image      nodes.png
-    icon_image_alt  Node {{ node.name }}
+    host_name {{ node.name }}
+    alias {{ node.name }}.{{ node.network.name }}
+    use nodes
+    address {{ node.masterip }}
+    check_command check_alive
+    hostgroups {{ node.network.name }}
+    notes This configuration is generated on {% now "G:i j-n-Y" %} by exodus
+    notes_url http://rick.wleiden.net/exodus{% url exodus.views.viewNode node.name %}
+    icon_image nodes.png
+    icon_image_alt Node {{ node.name }}
     statusmap_image nodes.gd2
 }
Index: trunk/exodus/templates/nagios/services/check_dns.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/check_dns.nagios	(revision 6615)
+++ trunk/exodus/templates/nagios/services/check_dns.nagios	(revision 6617)
@@ -1,6 +1,6 @@
 define service {
-        host_name {{ node.name }}
-        service_description Check DNS
-        check_command check_dns
-        use generic_service
+    host_name {{ node.name }}
+    service_description Check DNS
+    check_command check_dns
+    use generic_service
 }
Index: trunk/exodus/templates/nagios/services/check_if.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/check_if.nagios	(revision 6615)
+++ trunk/exodus/templates/nagios/services/check_if.nagios	(revision 6617)
@@ -1,7 +1,7 @@
 define service {
-    host_name           {{ node.name }}
-    use                 check_if
+    host_name {{ node.name }}
     service_description Check interface {{ nic.iface }}
-    check_command       check_if!{{ nic.ip }}
-    servicegroups       all_interfaces
+    check_command check_if!{{ nic.ip }}
+    servicegroups all_interfaces {# todo: different interfaces in different groups#}
+    use generic_service
 }
Index: trunk/exodus/templates/nagios/services/check_pen.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/check_pen.nagios	(revision 6615)
+++ trunk/exodus/templates/nagios/services/check_pen.nagios	(revision 6617)
@@ -1,6 +1,6 @@
 define service {
-        host_name {{ node.name }}
-        service_description Check PEN
-        check_command check_dns_proxy_wl
-        use generic_service
+    host_name {{ node.name }}
+    service_description Check PEN
+    check_command check_dns_proxy_wl
+    use generic_service
 }
Index: trunk/exodus/templates/nagios/services/check_snmp.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/check_snmp.nagios	(revision 6615)
+++ trunk/exodus/templates/nagios/services/check_snmp.nagios	(revision 6617)
@@ -1,6 +1,6 @@
 define service {
-        host_name {{ node.name }}
-        service_description Check SNMP
-        check_command check_uptime
-        use generic_service
+    host_name {{ node.name }}
+    service_description Check SNMP
+    check_command check_uptime
+    use generic_service
 }
Index: trunk/exodus/templates/nagios/services/check_version.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/check_version.nagios	(revision 6615)
+++ trunk/exodus/templates/nagios/services/check_version.nagios	(revision 6617)
@@ -1,14 +1,13 @@
 define service {
-        host_name {{ node.name }}
-        service_description Check OS version
-        check_command check_version
-        use generic_service
+    host_name {{ node.name }}
+    service_description Check OS version
+    check_command check_version
+    use generic_service
 }
-
 define servicedependency{
-    host_name       {{ node.name }}
-    service_description     Check OS version
-    dependent_host_name     {{ node.name }}
-    dependent_service_description   Check SNMP
-    execution_failure_criteria  w,u,c
+    host_name {{ node.name }}
+    service_description Check OS version
+    dependent_host_name {{ node.name }}
+    dependent_service_description Check SNMP
+    execution_failure_criteria w,u,c
 }
Index: trunk/exodus/templates/nagios/services/depend_interface.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/depend_interface.nagios	(revision 6617)
+++ trunk/exodus/templates/nagios/services/depend_interface.nagios	(revision 6617)
@@ -0,0 +1,7 @@
+define servicedependency{
+    host_name {{ node.name }}
+    service_description Check interface {{ nic.iface }}
+    dependent_host_name {{ nic.link.node }}
+    dependent_service_description Check interface {{ nic.link.iface }}
+    execution_failure_criteria w,u,c
+}
Index: trunk/exodus/templates/nagios/services/dependend_interface.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/dependend_interface.nagios	(revision 6615)
+++ 	(revision )
@@ -1,7 +1,0 @@
-define servicedependency{
-    host_name       {{ node.name }}
-    service_description     Check interface {{ nic.iface }}
-    dependent_host_name     {{ nic.link.node }}
-    dependent_service_description   Check interface {{ nic.link.iface }}
-    execution_failure_criteria  w,u,c
-}
Index: trunk/exodus/templates/nagios/services/dependend_snmp.nagios
===================================================================
--- trunk/exodus/templates/nagios/services/dependend_snmp.nagios	(revision 6615)
+++ 	(revision )
@@ -1,14 +1,0 @@
-define service {
-        host_name {{ node.name }}
-        service_description Check OS version
-        check_command check_version
-        use generic_service
-}
-
-define servicedependency{
-    host_name       {{ node.name }}
-    service_description     Check OS version
-    dependent_host_name     {{ node.name }}
-    dependent_service_description   Check SNMP
-    execution_failure_criteria  w,u,c
-}