--- a/bin/update	Thu Dec 19 02:30:00 2013 +0200
+++ b/bin/update	Thu Dec 19 02:38:03 2013 +0200
@@ -40,13 +40,13 @@
 REVERSE_DOMAIN=paivola.fi
 
 ## Do things
-function run_hosts {
-    # test
+function update {
     log "Testing hosts..."
     for hosts in $(list_files etc/hosts); do
         log_warn "TODO: check_hosts $hosts"
     done
 
+    ## Hosts
     log "Updating forward host zones..."
     for hosts in $(list_files etc/hosts); do
         update_hosts_forward    "var/zones/hosts/$hosts"            "$hosts" \
@@ -64,18 +64,8 @@
         update_hosts_reverse    "var/zones/hosts/$zone"             "$zone" \
             etc/reverse-zones-hosts/$zone/*
     done
-#    for zone in $(list_files etc/zones); do
-#        for reverse_hosts in $(zone_includes_grep var/include-cache/$zone etc/zones/$zone reverse-hosts/); do
-#            prefix="${reverse_hosts%_*}"
-#            hosts="${reverse_hosts#*_}"
-#
-#            update_hosts_reverse    "var/zones/reverse-hosts/${prefix}_${hosts}"    "$prefix" \
-#                "etc/hosts/$hosts"
-#        done
-#    done
-}
 
-function run_zones {
+    ## Zones
     log "Copying zone includes..."
     for zone in $(list_files etc/zones/includes); do
         copy                "var/zones/includes/$zone"      "etc/zones/includes/$zone"
@@ -85,7 +75,6 @@
     for zone in $(list_files etc/zones); do
         update_serial       "var/serials/$zone"             "etc/zones/$zone" \
             $(zone_includes var/include-cache/$zone etc/zones/$zone var/zones/)
-
     done
 
     log "Updating zones..."
@@ -98,17 +87,16 @@
         # check_zone          var/zones/$zone     $zone
         log_warn "TODO: check_zone $zone"
     done
-}
 
-function run_deploy {
+    ## Deploy
     log "Reload zones..."
         reload_zones
 
     log "Reload dhcp..."
         reload_dhcp
 
-    log "Commit etc..."
-        commit_data     etc
+    log "Commit..."
+        commit      etc
 }
 
 ## Main entry point
@@ -131,9 +119,7 @@
     done
 
     ## Go
-    run_hosts
-    run_zones
-    run_deploy
+    update
 }
 
 main "$@"