Reaktor: replace dnsrecon for dnsmap

update init script
add supervisor config

4 files changed, 9 insertions, 6 deletions

diff --git a/Reaktor/repos/consolidate_dns/index b/Reaktor/repos/consolidate_dns/index
index 7336f211..c66e54bf 100755
--- a/Reaktor/repos/consolidate_dns/index
+++ b/Reaktor/repos/consolidate_dns/index
@@ -44,10 +44,7 @@ if dnsrecon_enabled:
   p.wait()
   reader = csv.reader(open(dnsrecon_tmp))
   for row in reader:
-    if row[1] in domains:
-      domains[row[1]] += row[2:]  
-    else:
-      domains[row[1]] = row[2:]
+    domains[row[1]] += row[2:]
   print ("...finished with [%d] domains" %reader.line_num)
   os.unlink(dnsrecon_tmp)
 
@@ -58,7 +55,7 @@ if gxfr_enabled:
   p.wait()
   reader = csv.reader(open(gxfr_tmp))
   for row in reader:
-    domains[row[0]] = row[1:]
+      domains[row[0]] += row[1:]
   print ("...finished with [%d] domains" %reader.line_num)
   os.unlink(gxfr_tmp)
 if bxfr_enabled:
@@ -68,7 +65,7 @@ if bxfr_enabled:
   p.wait()
   reader = csv.reader(open(bxfr_tmp))
   for row in reader:
-    domains[row[0]] = row[1:]
+    domains[row[0]] += row[1:]
   print ("...finished with [%d] domains" %reader.line_num)
   os.unlink(bxfr_tmp)
 
diff --git a/Reaktor/autostart/reaktor b/Reaktor/startup/conf.d/reaktor
index a4f3f8e1..a4f3f8e1 100644
--- a/Reaktor/autostart/reaktor
+++ b/Reaktor/startup/conf.d/reaktor
diff --git a/Reaktor/autostart/reaktor-debian b/Reaktor/startup/init.d/reaktor-debian
index a94384f4..a94384f4 100755
--- a/Reaktor/autostart/reaktor-debian
+++ b/Reaktor/startup/init.d/reaktor-debian
diff --git a/Reaktor/startup/supervisor/Reaktor.conf b/Reaktor/startup/supervisor/Reaktor.conf
new file mode 100644
index 00000000..497066e9
--- /dev/null
+++ b/Reaktor/startup/supervisor/Reaktor.conf
@@ -0,0 +1,6 @@
+[program:Reaktor]
+command=/usr/bin/python2.6 IRC/asybot.py
+environment=host='irc.freenode.net',target='#krebsco' 
+redirect_stderr=true
+user=reaktor
+directory=/krebs/Reaktor