Merge branch 'patch-1' into 'dev'
Fix bugs in INSTALL/ubuntu.sh See merge request Shinobi-Systems/Shinobi!186build-default-monitor-config-from-definitions
commit
99227558e0
|
@ -41,8 +41,8 @@ if [ ! -e "./super.json" ]; then
|
||||||
fi
|
fi
|
||||||
if ! [ -x "$(command -v ifconfig)" ]; then
|
if ! [ -x "$(command -v ifconfig)" ]; then
|
||||||
echo "============="
|
echo "============="
|
||||||
echo "Shinobi - Installing Net-Tools"
|
echo "Shinobi - Installing Net-Tools and Dos2Unix"
|
||||||
sudo apt install net-tools -y
|
sudo apt install net-tools dos2unix -y
|
||||||
fi
|
fi
|
||||||
if ! [ -x "$(command -v node)" ]; then
|
if ! [ -x "$(command -v node)" ]; then
|
||||||
echo "============="
|
echo "============="
|
||||||
|
@ -116,10 +116,10 @@ sudo npm install pm2@3.0.0 -g
|
||||||
echo "Shinobi - Finished"
|
echo "Shinobi - Finished"
|
||||||
sudo chmod -R 755 .
|
sudo chmod -R 755 .
|
||||||
touch INSTALL/installed.txt
|
touch INSTALL/installed.txt
|
||||||
dos2unix /home/Shinobi/INSTALL/shinobi
|
dos2unix INSTALL/shinobi
|
||||||
ln -s /home/Shinobi/INSTALL/shinobi /usr/bin/shinobi
|
ln -s `readlink -f INSTALL/shinobi` /usr/bin/shinobi
|
||||||
echo "Shinobi - Randomizing cron key"
|
echo "Shinobi - Randomizing cron key"
|
||||||
node /home/Shinobi/tools/modifyConfiguration.js addToConfig="{\"cron\":{\"key\":\"$(head -c 64 < /dev/urandom | sha256sum | awk '{print substr($1,1,60)}')\"}}"
|
node tools/modifyConfiguration.js addToConfig="{\"cron\":{\"key\":\"$(head -c 64 < /dev/urandom | sha256sum | awk '{print substr($1,1,60)}')\"}}"
|
||||||
echo "Shinobi - Start Shinobi and set to start on boot?"
|
echo "Shinobi - Start Shinobi and set to start on boot?"
|
||||||
echo "(y)es or (N)o"
|
echo "(y)es or (N)o"
|
||||||
read -r startShinobi
|
read -r startShinobi
|
||||||
|
|
Loading…
Reference in New Issue