diff --git a/bin/launch_lvldb.sh b/bin/launch_lvldb.sh
index 868a18e3..ef4dcb2c 100755
--- a/bin/launch_lvldb.sh
+++ b/bin/launch_lvldb.sh
@@ -7,13 +7,17 @@ lvdbhost='127.0.0.1'
lvdbdir="${AIL_HOME}/LEVEL_DB_DATA/"
db1_y='2013'
db2_y='2014'
-db2_y='2015'
-db2_y='2016'
+db3_y='2016'
+db4_y='3016'
nb_db=13
screen -dmS "LevelDB"
sleep 0.1
echo -e $GREEN"\t* Launching Levels DB servers"$DEFAULT
-#Add lines here with appropriates options.
-screen -S "LevelDB" -X screen -t "2016" bash -c '../redis-leveldb/redis-leveldb -H '$lvdbhost' -D '$lvdbdir'2016/ -P '$db2_y' -M '$nb_db'; read x'
+sleep 0.1
+screen -S "LevelDB" -X screen -t "2016" bash -c 'redis-leveldb -H '$lvdbhost' -D '$lvdbdir'2016/ -P '$db3_y' -M '$nb_db'; read x'
+
+# For Curve
+sleep 0.1
+screen -S "LevelDB" -X screen -t "3016" bash -c 'redis-leveldb -H '$lvdbhost' -D '$lvdbdir'3016/ -P '$db4_y' -M '$nb_db'; read x'
diff --git a/bin/launch_scripts.sh b/bin/launch_scripts.sh
index c7f4228f..4b1abc5f 100755
--- a/bin/launch_scripts.sh
+++ b/bin/launch_scripts.sh
@@ -10,7 +10,7 @@ echo -e $GREEN"\t* Launching ZMQ scripts"$DEFAULT
screen -S "Script" -X screen -t "Global" bash -c './Global.py; read x'
sleep 0.1
-screen -S "Script" -X screen -t "Duplicate" bash -c './Duplicate.py; read x'
+screen -S "Script" -X screen -t "Duplicate" bash -c './Duplicate_ssdeep_v2.py; read x'
sleep 0.1
screen -S "Script" -X screen -t "Attribute" bash -c './Attribute.py; read x'
sleep 0.1
@@ -36,4 +36,20 @@ screen -S "Script" -X screen -t "Curve" bash -c './Curve.py; read x'
sleep 0.1
screen -S "Script" -X screen -t "Indexer" bash -c './Indexer.py; read x'
sleep 0.1
+screen -S "Script" -X screen -t "Keys" bash -c './Keys.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "Phone" bash -c './Phone.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "Release" bash -c './Release.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "Cve" bash -c './Cve.py; read x'
+sleep 0.1
screen -S "Script" -X screen -t "WebStats" bash -c './WebStats.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "ModuleStats" bash -c './ModuleStats.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "SQLInjectionDetection" bash -c './SQLInjectionDetection.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "Browse_warning_paste" bash -c './Browse_warning_paste.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "SentimentAnalyser" bash -c './SentimentAnalyser.py; read x'
diff --git a/installing_deps.sh b/installing_deps.sh
index 6eecc805..805818e1 100755
--- a/installing_deps.sh
+++ b/installing_deps.sh
@@ -42,7 +42,7 @@ popd
# tlsh
test ! -d tlsh && git clone git://github.com/trendmicro/tlsh.git
pushd tlsh/
-./make
+./make.sh
popd
# REDIS LEVEL DB #
diff --git a/var/www/static/css/switch_checkbox.css b/var/www/static/css/switch_checkbox.css
new file mode 100644
index 00000000..07991af3
--- /dev/null
+++ b/var/www/static/css/switch_checkbox.css
@@ -0,0 +1,68 @@
+.switch {
+ position: relative;
+ display: inline-block;
+ vertical-align: top;
+ width: 56px;
+ height: 20px;
+ padding: 3px;
+ margin-left: 5px;
+ border-radius: 18px;
+ box-shadow: inset 0 -1px #fff,inset 0 1px 1px rgba(0,0,0,0.05);
+ cursor: pointer;
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+
+.switch-input {
+ position: absolute;
+ top: 0;
+ left: 0;
+ opacity: 0;
+}
+
+.switch-input:checked ~ .switch-label {
+ background: #67c2ef;
+ box-shadow: inset 0 1px 2px rgba(0,0,0,0.15),inset 0 0 3px rgba(0,0,0,0.2);
+}
+.switch-label {
+ position: relative;
+ display: block;
+ height: inherit;
+ font-size: 10px;
+ text-transform: uppercase;
+ background: #f9f9f9;
+ border-radius: inherit;
+ box-shadow: inset 0 1px 2px rgba(0,0,0,0.12),inset 0 0 2px rgba(0,0,0,0.15);
+ -webkit-transition: .15s ease-out;
+ -moz-transition: .15s ease-out;
+ -o-transition: .15s ease-out;
+ transition: .15s ease-out;
+ -webkit-transition-property: opacity background;
+ -moz-transition-property: opacity background;
+ -o-transition-property: opacity background;
+ transition-property: opacity background;
+}
+
+.switch-input:checked ~ .switch-handle {
+ left: 40px;
+ box-shadow: -1px 1px 5px rgba(0,0,0,0.2);
+}
+.switch-handle {
+ position: absolute;
+ top: 4px;
+ left: 4px;
+ width: 18px;
+ height: 18px;
+ background: white;
+ border-radius: 10px;
+ box-shadow: 1px 1px 5px rgba(0,0,0,0.2);
+ background-image: -webkit-linear-gradient(top,#fff 40%,#f0f0f0);
+ background-image: -moz-linear-gradient(top,#fff 40%,#f0f0f0);
+ background-image: -o-linear-gradient(top,#fff 40%,#f0f0f0);
+ background-image: linear-gradient(to bottom,#fff 40%,#f0f0f0);
+ -webkit-transition: left .15s ease-out;
+ -moz-transition: left .15s ease-out;
+ -o-transition: left .15s ease-out;
+ transition: left .15s ease-out;
+}
diff --git a/var/www/static/js/indexjavascript.js b/var/www/static/js/indexjavascript.js
index 69ffd32e..c936e9c7 100644
--- a/var/www/static/js/indexjavascript.js
+++ b/var/www/static/js/indexjavascript.js
@@ -90,7 +90,6 @@ var source = new EventSource('/_logs');
source.onmessage = function(event) {
var feed = jQuery.parseJSON( event.data );
- create_log_table(feed);
};
function pad_2(number)
@@ -309,7 +308,11 @@ $(document).ready(function () {
var tmp_values2 = [];
refresh();
update_values();
- create_queue_table();
+
+ if($('#button-toggle-queues').prop('checked'))
+ create_queue_table();
+ else
+ $("#queueing").html('');
for (i = 0; i < (glob_tabvar.row1).length; i++){
diff --git a/var/www/templates/index.html b/var/www/templates/index.html
index 92af324b..dc360008 100644
--- a/var/www/templates/index.html
+++ b/var/www/templates/index.html
@@ -12,6 +12,7 @@
+
@@ -57,6 +58,14 @@
+
+
+
Display queues
+
 }})