Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
2 changed files with 10 additions and 8 deletions
Showing only changes of commit 9902702f84 - Show all commits

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
echo "Running blootstrap install script" echo "Running intval3 install script"
apt-get update apt-get update
apt-get install git ufw nginx -y apt-get install git ufw nginx -y
@ -14,4 +14,4 @@ npm install -g pm2
echo "Installing bluetooth dependencies..." echo "Installing bluetooth dependencies..."
apt-get install bluetooth bluez libbluetooth-dev libudev-dev -y apt-get install bluetooth bluez libbluetooth-dev libudev-dev -y
echo "Finished installing blootstrap dependencies" echo "Finished installing intval3 dependencies"

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
echo "Running blootstrap install script" echo "Running intval3 install script"
apt-get update apt-get update
apt-get install git ufw nginx -y apt-get install git ufw nginx -y
@ -13,6 +13,8 @@ npm install -g pm2
echo "Installing bluetooth dependencies..." echo "Installing bluetooth dependencies..."
apt-get install bluetooth bluez libbluetooth-dev libudev-dev -y apt-get install bluetooth bluez libbluetooth-dev libudev-dev -y
systemctl disable bluetooth
hciconfig hci0 up
echo "Configuring ufw (firewall)..." echo "Configuring ufw (firewall)..."
ufw default deny incoming ufw default deny incoming
@ -22,13 +24,13 @@ ufw allow http
ufw allow https ufw allow https
ufw enable ufw enable
echo "Installing blootstrap project..." echo "Installing intval3 project..."
wget https://github.com/mattmcw/blootstrap/archive/master.zip wget https://github.com/sixteenmillimeter/intval3/archive/master.zip
unzip master.zip -d blootstrap/ unzip master.zip -d intval3/
rm master.zip rm master.zip
cd blootstrap cd intval3
npm install npm install
pm2 start process.json pm2 start process.json
echo "Finished installing blootstrap" echo "Finished installing intval3"