Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10390)
+++ /tools/gformat.py	(revision 10391)
@@ -75,4 +75,43 @@
 DOWN = 20
 UNKNOWN = 90
+
+def get_yaml(item):
+  """ Get configuration yaml for 'item'"""
+  gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
+
+  f = open(gfile, 'r')
+  datadump = yaml.load(f,Loader=Loader)
+  f.close()
+
+  # Preformat certain needed variables for formatting and push those into special object
+  datadump['autogen_iface_keys'] = get_interface_keys(datadump)
+
+  wlan_count=0
+  for key in datadump['autogen_iface_keys']:
+    if datadump[key]['type'] in ['11a', '11b', '11g', 'wireless']:
+      datadump[key]['autogen_ifname'] = 'wlan%i' % wlan_count
+      wlan_count += 1
+    else:
+      datadump[key]['autogen_ifname'] = datadump[key]['interface'].split(':')[0]
+
+  dhcp_interfaces = [datadump[key]['autogen_ifname'] for key in datadump['autogen_iface_keys'] if datadump[key]['dhcp'] != 'no']
+  datadump['autogen_dhcp_interfaces'] = ' '.join(dhcp_interfaces)
+  datadump['autogen_item'] = item
+
+  datadump['autogen_realname'] = get_realname(datadump)
+  datadump['autogen_domain'] = datadump['domain'] if datadump.has_key('domain') else 'wleiden.net.'
+  datadump['autogen_fqdn'] = datadump['autogen_realname'] + '.' + datadump['autogen_domain']
+  return datadump
+
+
+def store_yaml(datadump, header=False):
+  """ Store configuration yaml for 'item'"""
+  item = datadump['autogen_item'] 
+  gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
+
+  f = open(gfile, 'w')
+  f.write(generate_wleiden_yaml(datadump, header))
+  f.close()
+
 
 
@@ -302,5 +341,5 @@
 dhcp-authoritative
 dhcp-fqdn
-domain=dhcp.{{ autogen_fqdn }}.{{ autogen_domain }}
+domain=dhcp.{{ autogen_fqdn }}
 domain-needed
 expand-hosts
@@ -353,5 +392,5 @@
   output = generate_header("#");
   output += Template("""\
-hostname='{{ autogen_fqdn }}.{{ autogen_domain }}'
+hostname='{{ autogen_fqdn }}'
 location='{{ location }}'
 nodetype="{{ nodetype }}"
@@ -495,42 +534,4 @@
   return output
 
-
-
-def get_yaml(item):
-  """ Get configuration yaml for 'item'"""
-  gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
-
-  f = open(gfile, 'r')
-  datadump = yaml.load(f,Loader=Loader)
-  f.close()
-
-  # Preformat certain needed variables for formatting and push those into special object
-  datadump['autogen_iface_keys'] = get_interface_keys(datadump)
-
-  wlan_count=0
-  for key in datadump['autogen_iface_keys']:
-    if datadump[key]['type'] in ['11a', '11b', '11g', 'wireless']:
-      datadump[key]['autogen_ifname'] = 'wlan%i' % wlan_count
-      wlan_count += 1
-    else:
-      datadump[key]['autogen_ifname'] = datadump[key]['interface'].split(':')[0]
-
-  dhcp_interfaces = [datadump[key]['autogen_ifname'] for key in datadump['autogen_iface_keys'] if datadump[key]['dhcp'] != 'no']
-  datadump['autogen_dhcp_interfaces'] = ' '.join(dhcp_interfaces)
-  datadump['autogen_item'] = item
-  datadump['autogen_fqdn'] = get_fqdn(datadump)
-
-  datadump['autogen_domain'] = datadump['domain'] if datadump.has_key('domain') else 'wleiden.net'
-  return datadump
-
-
-def store_yaml(datadump, header=False):
-  """ Store configuration yaml for 'item'"""
-  item = datadump['autogen_item'] 
-  gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
-
-  f = open(gfile, 'w')
-  f.write(generate_wleiden_yaml(datadump, header))
-  f.close()
 
 
@@ -607,5 +608,5 @@
 FreeBSD 9.0-RELEASE (kernel.wleiden) #0 r230587: Sun Jan 29 17:09:57 CET 2012
 
-  WWW: %(autogen_fqdn)s.wleiden.net - http://www.wirelessleiden.nl
+  WWW: %(autogen_fqdn)s - http://www.wirelessleiden.nl
   Loc: %(location)s
 
@@ -756,13 +757,13 @@
   print output
 
-def get_fqdn(datadump):
+def get_realname(datadump):
   # Proxy naming convention is special, as the proxy name is also included in
   # the nodename, when it comes to the numbered proxies.
   if datadump['nodetype'] == 'Proxy':
-    fqdn = datadump['nodetype'] + datadump['nodename'].replace('proxy','')
+    realname = datadump['nodetype'] + datadump['nodename'].replace('proxy','')
   else:
     # By default the full name is listed and also a shortname CNAME for easy use.
-    fqdn = datadump['nodetype'] + datadump['nodename']
-  return(fqdn)
+    realname = datadump['nodetype'] + datadump['nodename']
+  return(realname)
 
 
@@ -781,5 +782,5 @@
 
     # Proxy naming convention is special
-    fqdn = get_fqdn(datadump)
+    fqdn = datadump['autogen_realname']
     if datadump['nodetype'] == 'CNode':
       wleiden_cname[datadump['nodename']] = fqdn
@@ -1073,5 +1074,5 @@
         logger.info("# Processing: %s", host)
         datadump = get_yaml(host)
-        datadumps[get_fqdn(datadump)] = datadump
+        datadumps[datadump['autogen_realname']] = datadump
 
       for host,datadump in datadumps.iteritems():
Index: /tools/yaml2nag.py
===================================================================
--- /tools/yaml2nag.py	(revision 10390)
+++ /tools/yaml2nag.py	(revision 10391)
@@ -36,5 +36,5 @@
 
     if datadump['ileiden']:
-      hostgroups.append('node-ileiden')
+      hostgroups.append('nodes-ileiden')
 
     datadump['hostgroups'] = ','.join(hostgroups)
@@ -42,6 +42,6 @@
 define host{
   use        host-pnp
-  host_name  %(nodename)s
-  alias      %(nodename)s
+  host_name  %(autogen_realname)s
+  alias      %(autogen_realname)s
   address    %(masterip)s
   hostgroups %(hostgroups)s