Need to let everything pass through the filter, just don't log non tracked URL's.

2 files changed, 53 insertions, 22 deletions

diff --git a/TODO b/TODO
index e28ee93..32429d8 100644
--- a/TODO
+++ b/TODO
@@ -58,3 +58,34 @@ small bugs:
   - cobbler report with a random parameter produces no output
     that should be an error.
 
+===
+
+better default kickstarts ... from kickstart-list:
+
+%pre
+
+# Determine how many drives we have
+set $(list-harddrives)
+let numd=$#/2
+d1=$1
+d2=$3
+
+if [ $numd -ge 2 ] ; then
+cat << EOF >> /tmp/partinfo
+part pv.01 --size=1 --grow --fstype=ext3 --ondisk=$d1 volgroup volgrp01
+pv.01 part pv.02 --size=1 --grow --fstype=ext3 --ondisk=$d2 volgroup
+volgrp02 pv.02 #HOWEVER_YOU_WANT_TO_PARTITION EOF
+
+else
+
+cat << EOF >> /tmp/partinfo
+part pv.01 --size=1 --grow --fstype=ext3 --ondisk=$d1 volgroup volgrp01
+pv.01 #HOWEVER_YOU_WANT_TO_PARTITION EOF
+
+fi
+
+I then %include the partitioning back up in the command section:
+
+%include /tmp/partinfo 
+
+
diff --git a/watcher.py b/watcher.py
index 665d779..69d735d 100755
--- a/watcher.py
+++ b/watcher.py
@@ -22,29 +22,29 @@ def outputfilter(filter):
     request = filter.req
     connection = request.connection
 
+    log_it = True
     if request.the_request.find("cobbler_track") == -1:
-        # skip URL's not related to kickstart tracking
-        filter.close()
-        return
-
-    # write the timestamp
-    t = time.gmtime()
-    seconds = str(time.mktime(t))
-    logfile.write(seconds)
-    logfile.write("\t")
-    timestr = str(time.asctime(t))
-    logfile.write(timestr)
-    logfile.write("\t")
-
-    # write the IP address of the client
-    (address,port) = connection.remote_addr
-    logfile.write(address)
-    logfile.write("\t")
-
-    # write the filename being requested
-    logfile.write(request.the_request)
-    # logfile.write(request.filename)
-    logfile.write("\n")
+        log_it = False
+
+    if log_it:
+        # write the timestamp
+        t = time.gmtime()
+        seconds = str(time.mktime(t))
+        logfile.write(seconds)
+        logfile.write("\t")
+        timestr = str(time.asctime(t))
+        logfile.write(timestr)
+        logfile.write("\t")
+
+        # write the IP address of the client
+        (address,port) = connection.remote_addr
+        logfile.write(address)
+        logfile.write("\t")
+
+        # write the filename being requested
+        logfile.write(request.the_request)
+        # logfile.write(request.filename)
+        logfile.write("\n")
 
     # if requesting this file, don't return it
     if request.the_request.find("watcher.py") != -1: