Reaktor: add whatweb, update build process

3 files changed, 22 insertions, 7 deletions

diff --git a/Reaktor/Makefile b/Reaktor/Makefile
index dc3f8cac..2241dba6 100644
--- a/Reaktor/Makefile
+++ b/Reaktor/Makefile
@@ -1,13 +1,23 @@
-init:
-	cd ..;git submodule init; git submodule update
-	cd repos/gxfr/; git checkout master; git pull
-	cd repos/dnsrecon; git checkout master; git pull
-	cd repos/dnsmap; git checkout master; git pull
+submodules = gxfr dnsrecon bxfr whatweb
+security_modules = subdomains revip whatweb
+
+all: init all-mods
 
+init: init-submodules $(submodules)
+init-submodules: 
+	cd ..;git submodule init; git submodule update
+$(submodules):
+	cd repos/$@ ; git checkout master;git pull
 
+all-mods: $(addprefix public_commands/,$(security_modules))
+public_commands/%:commands/%
+	ln -s ../$< $@
 
 debian-autostart:
 	useradd reaktor ||:
-	cp autostart/reaktor-debian /etc/init.d/reaktor
-	cp autostart/reaktor /etc/default/
+	cp startup/init.d/reaktor-debian /etc/init.d/reaktor
+	cp startup/conf.d/reaktor /etc/default/
 	update-rc.d reaktor defaults
+supervisor-autostart:
+	useradd reaktor ||:
+	cp startup/supervisor/Reaktor.conf /etc/supervisor/conf.d/
diff --git a/Reaktor/commands/whatweb b/Reaktor/commands/whatweb
new file mode 100755
index 00000000..1c1d7791
--- /dev/null
+++ b/Reaktor/commands/whatweb
@@ -0,0 +1,5 @@
+#!/bin/sh
+#wrapper for WhatWeb
+whatweb_bin='../repos/whatweb/whatweb'
+[ -e "$whatweb_bin" ] || ( echo "Whatweb app does not exist" && exit 1 )
+$whatweb_bin "$1"
diff --git a/Reaktor/repos/whatweb b/Reaktor/repos/whatweb
new file mode 160000
+Subproject daab5f21f13024ee8ec47e88f668c5308d6b59d