diff --git a/.travis.yml b/.travis.yml index 7715aa8b..f911827a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,7 @@ install: script: - pushd bin - - ./launch_redis.sh - - ./launch_lvldb.sh - - ./launch_logs.sh - - ./launch_queues.sh + - ./LAUNCH.sh - popd - cd tests - nosetests --with-coverage --cover-package=../bin -d diff --git a/installing_deps.sh b/installing_deps.sh index 0becb8d6..f8f2846f 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -1,40 +1,43 @@ #!/bin/bash +# halt on errors set -e -set -x + +## bash debug mode togle below +#set -x sudo apt-get update sudo apt-get install python3-pip virtualenv python3-dev python3-tk libfreetype6-dev \ - screen g++ python-tk unzip libsnappy-dev cmake -y + screen g++ python-tk unzip libsnappy-dev cmake -qq #optional tor install -sudo apt-get install tor -y +sudo apt-get install tor -qq #Needed for bloom filters -sudo apt-get install libssl-dev libfreetype6-dev python-numpy -y +sudo apt-get install libssl-dev libfreetype6-dev python-numpy -qq #pyMISP #sudo apt-get -y install python3-pip # DNS deps -sudo apt-get install libadns1 libadns1-dev -y +sudo apt-get install libadns1 libadns1-dev -qq #Needed for redis-lvlDB -sudo apt-get install libev-dev libgmp-dev -y +sudo apt-get install libev-dev libgmp-dev -qq #Need for generate-data-flow graph -sudo apt-get install graphviz -y +sudo apt-get install graphviz -qq # install nosetests -sudo apt-get install python3-nose +sudo apt-get install python3-nose -qq # ssdeep -sudo apt-get install libfuzzy-dev -y -sudo apt-get install build-essential libffi-dev automake autoconf libtool -y +sudo apt-get install libfuzzy-dev -qq +sudo apt-get install build-essential libffi-dev automake autoconf libtool -qq # sflock, gz requirement -sudo apt-get install p7zip-full -y +sudo apt-get install p7zip-full -qq # REDIS # test ! -d redis/ && git clone https://github.com/antirez/redis.git diff --git a/installing_deps_archlinux.sh b/installing_deps_archlinux.sh old mode 100644 new mode 100755 diff --git a/var/www/update_thirdparty.sh b/var/www/update_thirdparty.sh index c06302dd..50adf2a0 100755 --- a/var/www/update_thirdparty.sh +++ b/var/www/update_thirdparty.sh @@ -2,7 +2,7 @@ set -e -wget http://dygraphs.com/dygraph-combined.js -O ./static/js/dygraph-combined.js +wget -q http://dygraphs.com/dygraph-combined.js -O ./static/js/dygraph-combined.js SBADMIN_VERSION='3.3.7' BOOTSTRAP_VERSION='4.2.1' @@ -12,28 +12,28 @@ D3_JS_VERSION='5.5.0' rm -rf temp mkdir temp -wget https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-${BOOTSTRAP_VERSION}-dist.zip -O temp/bootstrap${BOOTSTRAP_VERSION}.zip -wget https://github.com/FezVrasta/popper.js/archive/v1.14.3.zip -O temp/popper.zip -wget https://github.com/BlackrockDigital/startbootstrap-sb-admin/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}.zip -wget https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}-2.zip -wget https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip -O temp/FONT_AWESOME_4.7.0.zip -wget https://github.com/FortAwesome/Font-Awesome/archive/5.7.1.zip -O temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip -wget https://github.com/d3/d3/releases/download/v${D3_JS_VERSION}/d3.zip -O temp/d3_${D3_JS_VERSION}.zip +wget -q https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-${BOOTSTRAP_VERSION}-dist.zip -O temp/bootstrap${BOOTSTRAP_VERSION}.zip +wget -q https://github.com/FezVrasta/popper.js/archive/v1.14.3.zip -O temp/popper.zip +wget -q https://github.com/BlackrockDigital/startbootstrap-sb-admin/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}.zip +wget -q https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}-2.zip +wget -q https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip -O temp/FONT_AWESOME_4.7.0.zip +wget -q https://github.com/FortAwesome/Font-Awesome/archive/5.7.1.zip -O temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip +wget -q https://github.com/d3/d3/releases/download/v${D3_JS_VERSION}/d3.zip -O temp/d3_${D3_JS_VERSION}.zip # dateRangePicker -wget https://github.com/moment/moment/archive/2.22.2.zip -O temp/moment_2.22.2.zip -wget https://github.com/longbill/jquery-date-range-picker/archive/v0.18.0.zip -O temp/daterangepicker_v0.18.0.zip +wget -q https://github.com/moment/moment/archive/2.22.2.zip -O temp/moment_2.22.2.zip +wget -q https://github.com/longbill/jquery-date-range-picker/archive/v0.18.0.zip -O temp/daterangepicker_v0.18.0.zip -unzip temp/bootstrap${BOOTSTRAP_VERSION}.zip -d temp/ -unzip temp/popper.zip -d temp/ -unzip temp/${SBADMIN_VERSION}.zip -d temp/ -unzip temp/${SBADMIN_VERSION}-2.zip -d temp/ -unzip temp/FONT_AWESOME_4.7.0.zip -d temp/ -unzip temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip -d temp/ -unzip temp/d3_${D3_JS_VERSION}.zip -d temp/ +unzip -qq temp/bootstrap${BOOTSTRAP_VERSION}.zip -d temp/ +unzip -qq temp/popper.zip -d temp/ +unzip -qq temp/${SBADMIN_VERSION}.zip -d temp/ +unzip -qq temp/${SBADMIN_VERSION}-2.zip -d temp/ +unzip -qq temp/FONT_AWESOME_4.7.0.zip -d temp/ +unzip -qq temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip -d temp/ +unzip -qq temp/d3_${D3_JS_VERSION}.zip -d temp/ -unzip temp/moment_2.22.2.zip -d temp/ -unzip temp/daterangepicker_v0.18.0.zip -d temp/ +unzip -qq temp/moment_2.22.2.zip -d temp/ +unzip -qq temp/daterangepicker_v0.18.0.zip -d temp/ mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/js/bootstrap.min.js ./static/js/bootstrap4.min.js mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/js/bootstrap.min.js.map ./static/js/bootstrap.min.js.map @@ -70,38 +70,38 @@ mv temp/jquery-date-range-picker-0.18.0/dist/jquery.daterangepicker.min.js ./sta rm -rf temp JQVERSION="1.12.4" -wget http://code.jquery.com/jquery-${JQVERSION}.js -O ./static/js/jquery.js +wget -q http://code.jquery.com/jquery-${JQVERSION}.js -O ./static/js/jquery.js #Ressources for dataTable -wget https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js -O ./static/js/jquery.dataTables.min.js -wget https://cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.css -O ./static/css/dataTables.bootstrap.css -wget https://cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.js -O ./static/js/dataTables.bootstrap.js +wget -q https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js -O ./static/js/jquery.dataTables.min.js +wget -q https://cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.css -O ./static/css/dataTables.bootstrap.css +wget -q https://cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.js -O ./static/js/dataTables.bootstrap.js -wget https://cdn.datatables.net/1.10.18/css/dataTables.bootstrap4.min.css -O ./static/css/dataTables.bootstrap.min.css -wget https://cdn.datatables.net/1.10.18/js/dataTables.bootstrap4.min.js -O ./static/js/dataTables.bootstrap.min.js +wget -q https://cdn.datatables.net/1.10.18/css/dataTables.bootstrap4.min.css -O ./static/css/dataTables.bootstrap.min.css +wget -q https://cdn.datatables.net/1.10.18/js/dataTables.bootstrap4.min.js -O ./static/js/dataTables.bootstrap.min.js #Ressource for graph -wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.js -O ./static/js/jquery.flot.js -wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.pie.js -O ./static/js/jquery.flot.pie.js -wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.time.js -O ./static/js/jquery.flot.time.js -wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.stack.js -O ./static/js/jquery.flot.stack.js +wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.js -O ./static/js/jquery.flot.js +wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.pie.js -O ./static/js/jquery.flot.pie.js +wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.time.js -O ./static/js/jquery.flot.time.js +wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.stack.js -O ./static/js/jquery.flot.stack.js #Ressources for sparkline and canvasJS and slider -wget http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js -O ./static/js/jquery.sparkline.min.js +wget -q http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js -O ./static/js/jquery.sparkline.min.js mkdir temp -wget http://canvasjs.com/fdm/chart/ -O temp/canvasjs.zip -unzip temp/canvasjs.zip -d temp/ +wget -q http://canvasjs.com/fdm/chart/ -O temp/canvasjs.zip +unzip -qq temp/canvasjs.zip -d temp/ mv temp/jquery.canvasjs.min.js ./static/js/jquery.canvasjs.min.js -wget https://jqueryui.com/resources/download/jquery-ui-1.12.0.zip -O temp/jquery-ui.zip -unzip temp/jquery-ui.zip -d temp/ +wget -q https://jqueryui.com/resources/download/jquery-ui-1.12.0.zip -O temp/jquery-ui.zip +unzip -qq temp/jquery-ui.zip -d temp/ mv temp/jquery-ui-1.12.0/jquery-ui.min.js ./static/js/jquery-ui.min.js mv temp/jquery-ui-1.12.0/jquery-ui.min.css ./static/css/jquery-ui.min.css rm -rf temp mkdir -p ./static/image pushd static/image -wget https://www.circl.lu/assets/images/logos/AIL.png -O AIL.png +wget -q https://www.circl.lu/assets/images/logos/AIL.png -O AIL.png popd if ! [[ -n "$AIL_HOME" ]]