Cleanup and improvements

templates/boot.ipxe

@@ -9,7 +9,7 @@ dhcp
 goto node_${serial} || goto manual
 # Default behavior (non install mode) is to exit iPXE script
 
-{{ range (datasource "nodes" | jsonArray) }}
+{{ range datasource "nodes" }}
 {{- if .install }}
 # {{ .filename }}
 :node_{{ .serial }}
@@ -24,7 +24,7 @@ boot
 
 :manual
 menu Select node
-{{ range (datasource "nodes" | jsonArray) }}
+{{ range datasource "nodes" }}
 item {{ .serial }} {{ .hostname }}
 {{ end }}
 choose selected || goto cancel

templates/dnsmasq.conf

@@ -1,4 +1,4 @@
-{{ $tftpIp := (ds "dhcp").tftpIp -}}
+{{ $tftpIp := (ds "config").dhcp.tftpIp -}}
 
 enable-tftp
 tftp-root=/tftproot