Index: tools/dubbelipcheck.sh
===================================================================
--- tools/dubbelipcheck.sh	(revision 10690)
+++ 	(revision )
@@ -1,84 +1,0 @@
-#!/bin/sh
-#
-# dubbelipcheck.sh
-# Scriptje om in de wleiden.conf files van Wireless Leiden
-# te controleren of er geen dubbele ip addressen bestaan
-#
-# Rick van der Zwet (rick@wirelessleiden.nl)
-genesis_nodes_dir="`dirname $0`/../nodes"
-allowed_dubbel_ip="172.31.255.1 172.31.255.2 192.168.1.[0-9]\{1,3\} 0.0.0.0"
-TMPDIR=`mktemp -d -t $(basename $0 .sh).XXXXX`
-
-ERRNO=0
-
-#zoek alle ip address in de files op
-init()
-{
-	files=`find $genesis_nodes_dir/*/wleiden.conf | grep -e "[A-Z]Node\|proxy"`
-	
-	master_ips=`cat $files | grep '^$master_ip' |\
-						sed -e 's/[^0-9]*\([0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\).*$/\1/'`
-	link_ips=`cat $files | grep ^IP | grep -v '$master_ip' |\
-					sed -e 's/IP=//' -e 's/\/[0-9]*//' -e 's/[[:space:]]*$//'`
-        echo "$master_ips $link_ips" | sort 
-	echo "$master_ips $link_ips" | sort > $TMPDIR/all_ips
-	echo "$master_ips $link_ips" | sort -u > $TMPDIR/all_ips_no_double
-}
-
-
-#check up dubbele ip addressen
-dubbelIpCheck() {
-	dubbel_ips=`comm -23 $TMPDIR/all_ips $TMPDIR/all_ips_no_double | sort -u`
-}
-
-
-#verwijder toegestane dubbele ip's
-verwijderToegestaneIps() {
-	for allowed in $allowed_dubbel_ip; do
-		dubbel_ips=`echo $dubbel_ips | sed s/$allowed//`
-	done
-}
-
-
-#print resultaten
-results() {
-	if [ "$dubbel_ips" ]; then
-		for dubbel_ip in $dubbel_ips ; do
-			ERRNO=1
-			echo ""
-			echo "Dubbel ip gevonden: $dubbel_ip"
-			echo "Wordt gebruikt in:"
-			for file in $files ; do
-				grep -v '#' $file | grep "$dubbel_ip" | grep "^IP\|^$master_ip" > /dev/null && echo "  -$file"
-			done
-		done
-	else
-		echo "Geen dubbele ip's gevonden"
-	fi
-	echo ""
-	echo "Toegestane dubbele ip's:"
-	for ip in $allowed_dubbel_ip ; do
-		echo "   -$ip"
-	done
-}
-
-
-#verwijder tijdelijke files
-cleanup() {
-    rm -R $TMPDIR
-}
-
-
-
-#hoofdmodule
-main() {
-	init
-	dubbelIpCheck
-	verwijderToegestaneIps
-	results
-	cleanup
-}
-
-main
-exit $ERRNO
-
Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 10690)
+++ tools/gformat.py	(revision 10692)
@@ -161,16 +161,4 @@
 
 
-def get_proxylist():
-  """Get all available proxies proxyX sorting based on X number"""
-  proxylist = sorted([os.path.basename(x) for x in glob.glob("%s/proxy*" % NODE_DIR)],
-                key=lambda name: int(''.join([c for c in name if c in string.digits])),
-                cmp=lambda x,y: x - y) + sorted([os.path.basename(x) for x in glob.glob("%s/Proxy*" % NODE_DIR)])
-  return proxylist
-
-def get_hybridlist():
-  """Get all available hybrid nodes/proxies"""
-  hybridlist = sorted([os.path.basename(x) for x in glob.glob("%s/Hybrid*" % NODE_DIR)])
-  return hybridlist
-
 
 def valid_addr(addr):
@@ -178,9 +166,10 @@
   return str(addr).startswith('172.')
 
-
-def get_nodelist():
-  """ Get all available nodes - sorted """
-  nodelist = sorted([os.path.basename(x) for x in glob.glob("%s/CNode*" % NODE_DIR)])
-  return nodelist
+def get_system_list(prefix):
+  return sorted([os.path.basename(os.path.dirname(x)) for x in glob.glob("%s/%s*/wleiden.yaml" % (NODE_DIR, prefix))])
+
+get_hybridlist = lambda: get_system_list("Hybrid")
+get_nodelist = lambda: get_system_list("CNode")
+get_proxylist = lambda: get_system_list("Proxy")
 
 def get_hostlist():