Merge pull request gcgarner#40 from SensorsIot/experimental

Experimental Branch

.gitignore

@@ -2,5 +2,8 @@
 /services/
 /volumes/
 /backups/
+/.tmp/*
 docker-compose.yml
-.outofdate
+.outofdate
+
+!.gitkeep

.templates/nodered/build.sh

@@ -6,7 +6,13 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"Use the [SPACEBAR] to select the nodes you want preinstalled" 20 78 12 -- \
 	"node-red-node-pi-gpiod" " " "ON" \
 	"node-red-dashboard" " " "ON" \
+	"node-red-contrib-influxdb" " " "ON" \
+	"node-red-contrib-boolean-logic" " " "ON" \
+	"node-red-node-rbe" " " "ON" \
+	"node-red-configurable-ping" " " "ON" \
 	"node-red-node-openweathermap" " " "OFF" \
+	"node-red-contrib-discord" " " "OFF" \
+	"node-red-node-email" " " "on" \
 	"node-red-node-google" " " "OFF" \
 	"node-red-node-emoncms" " " "OFF" \
 	"node-red-node-geofence" " " "OFF" \
@@ -15,7 +21,6 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"node-red-node-smooth" " " "OFF" \
 	"node-red-node-darksky" " " "OFF" \
 	"node-red-node-sqlite" " " "OFF" \
-	"node-red-contrib-influxdb" " " "ON" \
 	"node-red-contrib-config" " " "OFF" \
 	"node-red-contrib-grove" " " "OFF" \
 	"node-red-contrib-diode" " " "OFF" \
@@ -29,7 +34,6 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"node-red-contrib-isonline" " " "OFF" \
 	"node-red-contrib-npm" " " "OFF" \
 	"node-red-contrib-file-function" " " "OFF" \
-	"node-red-contrib-boolean-logic" " " "OFF" \
 	"node-red-contrib-home-assistant-websocket" " " "OFF" \
 	"node-red-contrib-blynk-ws" " " "OFF" \
 	"node-red-contrib-owntracks" " " "OFF" \

README.md

@@ -1,13 +1,16 @@
 # IOT Stack
 IOTstack is a builder for docker-compose to easily make and maintain IoT stacks on the Raspberry Pi.
 
+
 ## Documentation for the project: 
 
 https://sensorsiot.github.io/IOTstack/
 
+
 ## Video
 https://youtu.be/a6mjt8tWUws
 
+
 ## Installation
 1. On the (RPi) lite image you will need to install git first
 
@@ -33,3 +36,22 @@ cd ~/IOTstack && bash ./menu.sh
 ```
 docker-compose up -d
 ```
+
+## Experimental Features
+Want to have the latest and greatest features? Switch to the experimental branch:
+```
+git pull && git checkout experimental
+./menu.sh
+```
+
+Do note that the experimental branch may be broken, or may break your setup, so ensure you have a good backup, and please report any issues.
+
+## Migrating from the old repo?
+```
+cd ~/IOTstack/
+git remote set-url origin https://github.com/SensorsIot/IOTstack.git
+git pull origin master
+docker-compose down
+./menu.sh
+docker-compose up -d
+```