diff --git a/install_virtualenv.sh b/install_virtualenv.sh new file mode 100755 index 00000000..9c80b08c --- /dev/null +++ b/install_virtualenv.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +# halt on errors +set -e + +## bash debug mode togle below +#set -x + +if [ -z "$VIRTUAL_ENV" ]; then + + virtualenv -p python3 AILENV + + echo export AIL_HOME=$(pwd) >> ./AILENV/bin/activate + echo export AIL_BIN=$(pwd)/bin/ >> ./AILENV/bin/activate + echo export AIL_FLASK=$(pwd)/var/www/ >> ./AILENV/bin/activate + echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate + echo export AIL_ARDB=$(pwd)/ardb/src/ >> ./AILENV/bin/activate + + . ./AILENV/bin/activate + +fi + +pip3 install -U pip +pip3 install 'git+https://github.com/D4-project/BGP-Ranking.git/@7e698f87366e6f99b4d0d11852737db28e3ddc62#egg=pybgpranking&subdirectory=client' +pip3 install -U -r requirements.txt + +# Pyfaup +pushd faup/src/lib/bindings/python/ +python3 setup.py install +popd + +# Py tlsh +pushd tlsh/py_ext +python3 setup.py build +python3 setup.py install + +# Download the necessary NLTK corpora and sentiment vader +HOME=$(pwd) python3 -m textblob.download_corpora +python3 -m nltk.downloader vader_lexicon +python3 -m nltk.downloader punkt +popd + +pushd ${AIL_FLASK} +./update_thirdparty.sh +popd diff --git a/installing_deps.sh b/installing_deps.sh index f21852b1..1a889b31 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -85,19 +85,9 @@ if [ ! -f configs/core.cfg ]; then cp configs/core.cfg.sample configs/core.cfg fi -if [ -z "$VIRTUAL_ENV" ]; then +# create AILENV + intall python packages +./install_virtualenv.sh - virtualenv -p python3 AILENV - - echo export AIL_HOME=$(pwd) >> ./AILENV/bin/activate - echo export AIL_BIN=$(pwd)/bin/ >> ./AILENV/bin/activate - echo export AIL_FLASK=$(pwd)/var/www/ >> ./AILENV/bin/activate - echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate - echo export AIL_ARDB=$(pwd)/ardb/src/ >> ./AILENV/bin/activate - - . ./AILENV/bin/activate - -fi pushd ${AIL_BIN}helper/gen_cert ./gen_root.sh @@ -109,32 +99,8 @@ popd cp ${AIL_BIN}helper/gen_cert/server.crt ${AIL_FLASK}server.crt cp ${AIL_BIN}helper/gen_cert/server.key ${AIL_FLASK}server.key -pushd ${AIL_FLASK} -./update_thirdparty.sh -popd - mkdir -p $AIL_HOME/PASTES -pip3 install -U pip -pip3 install 'git+https://github.com/D4-project/BGP-Ranking.git/@7e698f87366e6f99b4d0d11852737db28e3ddc62#egg=pybgpranking&subdirectory=client' -pip3 install -U -r requirements.txt - -# Pyfaup -pushd faup/src/lib/bindings/python/ -python3 setup.py install -popd - -# Py tlsh -pushd tlsh/py_ext -python3 setup.py build -python3 setup.py install - -# Download the necessary NLTK corpora and sentiment vader -HOME=$(pwd) python3 -m textblob.download_corpora -python3 -m nltk.downloader vader_lexicon -python3 -m nltk.downloader punkt -popd - #Create the file all_module and update the graph in doc $AIL_HOME/doc/generate_modules_data_flow_graph.sh diff --git a/var/www/static/image/ail-icon.png b/var/www/static/image/ail-icon.png index e79686ff..420577fd 100644 Binary files a/var/www/static/image/ail-icon.png and b/var/www/static/image/ail-icon.png differ diff --git a/var/www/templates/change_password.html b/var/www/templates/change_password.html index 695db7c8..11eaad6e 100644 --- a/var/www/templates/change_password.html +++ b/var/www/templates/change_password.html @@ -62,7 +62,7 @@
- +

Change Password

diff --git a/var/www/templates/login.html b/var/www/templates/login.html index f4ee664b..a0c01462 100644 --- a/var/www/templates/login.html +++ b/var/www/templates/login.html @@ -67,7 +67,7 @@ - +

Please sign in

diff --git a/var/www/templates/nav_bar.html b/var/www/templates/nav_bar.html index adbc1cf5..44be94b5 100644 --- a/var/www/templates/nav_bar.html +++ b/var/www/templates/nav_bar.html @@ -1,6 +1,6 @@