Merge branch 'dev' into master

This commit is contained in:
Starbeamrainbowlabs 2020-12-12 13:24:11 +00:00
commit 0c25fa10c8
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
3 changed files with 8 additions and 7 deletions

3
build
View file

@ -37,7 +37,8 @@ min_npm_version_major="6";
# Deployment settings # Deployment settings
deploy_ssh_user="ci"; deploy_ssh_user="ci";
deploy_ssh_host="aq.connectedhumber.org"; # deploy_ssh_host="aq.connectedhumber.org";
deploy_ssh_host="37.187.118.171";
deploy_ssh_port="22"; deploy_ssh_port="22";
deploy_root_dir="Air-Quality-Web"; deploy_root_dir="Air-Quality-Web";

View file

@ -4,6 +4,6 @@
This is the documentation for [Air Quality Web](https://github.com/ConnectedHumber/Air-Quality-Web/), the air quality web interface that displays data from sensors scattered about the globe. This is the documentation for [Air Quality Web](https://github.com/ConnectedHumber/Air-Quality-Web/), the air quality web interface that displays data from sensors scattered about the globe.
Despite being called _Air Quality Web_, this project is in fact a generic interface to display sensor data. Despite being called _Air Quality Web_, this project is in fact a generic interface to display sensor data and any data displayed should not be considered the definitive air quality data (consult your local council for this information).
Check out the sections in the sidebar for documentation on the installation process, configuring an installation, and the HTTP API provided. Check out the sections in the sidebar for documentation on the installation process, configuring an installation, and the HTTP API provided.

View file

@ -164,13 +164,13 @@ sudo mysql
**username** and **password** will be your dbUser and dbPassword which you need to access the database and **username** and **password** will be your dbUser and dbPassword which you need to access the database and
place in the settings files for dbLoader.py and the Air Quality Map. place in the settings files for dbLoader.py and the Air Quality Map.
## Update Node-Red & NPM ## Update Node & NPM
``` ```
cd $HOME; echo "deb https://apt.starbeamrainbowlabs.com/ ./ # apt.starbeamrainbowlabs.com" | sudo tee /etc/apt/sources.list.d/sbrl.list
curl -OL https://gitlab.com/sbrl/bin/raw/master/node-update; sudo curl -sSL https://apt.starbeamrainbowlabs.com/aptosaurus.asc -o /etc/apt/trusted.gpg.d/sbrl-aptosaurus.asc;
chmod +x node-update; sudo apt update
./node-update sudo apt install nodejs-sbrl
``` ```