From 67b6d00e0afcb234f713e48bd7a114cf2e1027f2 Mon Sep 17 00:00:00 2001
From: Jonathan Baginski <jon@baginski.org>
Date: Thu, 12 May 2016 10:46:47 -0400
Subject: [PATCH 1/6] raspberry pi installation all-in-one

---
 .../asides/getting_started_navigation.html    |  1 +
 ...tallation-raspberry-pi-all-in-one.markdown | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 source/getting-started/installation-raspberry-pi-all-in-one.markdown

diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html
index 21c7496446d..82bc03dedce 100644
--- a/source/_includes/asides/getting_started_navigation.html
+++ b/source/_includes/asides/getting_started_navigation.html
@@ -8,6 +8,7 @@
         {% active_link /getting-started/ Installation %}
         <ul>
           <li>{% active_link /getting-started/installation-raspberry-pi/ Raspberry Pi %}</li>
+          <li>{% active_link /getting-started/installation-raspberry-pi-all-in-one/ Raspberry Pi All-In-One Installer %}</li>
           <li>{% active_link /getting-started/installation-docker/ Docker %}</li>
           <li>{% active_link /getting-started/installation-synology/ Synology NAS %}</li>
           <li>{% active_link /getting-started/installation-virtualenv/ VirtualEnv Linux Instructions %}</li>
diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
new file mode 100644
index 00000000000..a52331ea41a
--- /dev/null
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -0,0 +1,65 @@
+---
+layout: page
+title: "Raspberry Pi All-In-One Installer"
+date: 2016-05-12 01:39
+comments: true
+sharing: true
+footer: true
+---
+
+
+ 
+ Easily deploy a complete Home-Assistant server, complete with Websocket MQTT and Z-Wave support out of the box using Fabric! 
+ 
+ Start with a fresh Raspbian Jessie/Jessie-Lite or Debian 8 install, and the fabric script will do the following automatically:
+*  Create all needed directories
+*  Create needed service accounts
+*  Install OS and Python dependencies
+*  Setup a virtualenv to run Home-Assistant and components inside.
+*  Run as a service account
+*  Install Home-Assistant in a virtualenv
+*  Build and install Mosquitto from source with websocket support
+*  Build and Install Python-openzwave in the Home-Assistant virtualenv
+*  Add both Home-Assistant and Mosquitto to systemd services to start at boot
+
+<hr>
+
+**What is [Fabric](http://www.fabfile.org)?**
+ The official README says:
+>  "Fabric is a Python (2.5-2.7) library and command-line tool for streamlining the use of SSH for application deployment or systems administration tasks."
+ 
+<hr> 
+ 
+###  Usage:
+ **Setup:**
+ 
+ Simply install fabric locally:
+ ```pip3 install fabric3```
+ 
+ Ensure you're able to SSH into the target server.
+ 
+ 
+ Clone the repo : ``` git clone https://github.com/jbags81/fabric-home-assistant.git ``` on  your local host.
+ The repo contains a pre-configured default mosquitto.conf file. The only addition is an added listener for websockets listening on 9001. It also contains preconfigured systemd service profiles. For the fabric script to run successfully, it has to be ran from the root of the cloned repo. 
+ 
+ Edit ```fabfile.py``` and add the host info for the target host.
+ 
+
+ **Deploy:** 
+
+ 
+ Run the "deploy" job to build a new home-assistant server: ``` fab deploy ``` , then reboot. 
+ Everything will start at boot, and Home-Assistant is accessible now from **http://your_server_ip:8123**
+ 
+ The Home-Assistant configs are located in: ```/home/hass``` The virtualenv path, along with where all python packages will install is located at: ```/srv/hass/hass_venv```
+   
+<hr>
+ Fabric allows any of the underlying functions to be ran individually as well. Run ``` fab -l ``` to see a list of all callable jobs. 
+ 
+ Future support for non-virtualenv based servers will be added, along with the ability to auto upload existing or backup .yaml Home-Assistant configs. I'm also working on a turn-key devlopment script to make testing and development environments one click setups.. More to come!
+ 
+ 
+ 
+ 
+**Tested with Raspbian Jessie, Jessie-Lite, and Debian 8 (username and path modifications needed)**
+

From 7ec3d6cb05001ff90a131159a587c4b4cc092201 Mon Sep 17 00:00:00 2001
From: Jonathan Baginski <jon@baginski.org>
Date: Thu, 12 May 2016 12:13:21 -0400
Subject: [PATCH 2/6] Deleted verbage regarding future support

---
 .../installation-raspberry-pi-all-in-one.markdown              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
index a52331ea41a..111fde26dd0 100644
--- a/source/getting-started/installation-raspberry-pi-all-in-one.markdown
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -55,8 +55,7 @@ footer: true
    
 <hr>
  Fabric allows any of the underlying functions to be ran individually as well. Run ``` fab -l ``` to see a list of all callable jobs. 
- 
- Future support for non-virtualenv based servers will be added, along with the ability to auto upload existing or backup .yaml Home-Assistant configs. I'm also working on a turn-key devlopment script to make testing and development environments one click setups.. More to come!
+
  
  
  

From 3dd8346ae9b92157a48e91552b9a4d98212b5107 Mon Sep 17 00:00:00 2001
From: Jonathan Baginski <jon@baginski.org>
Date: Thu, 12 May 2016 12:45:31 -0400
Subject: [PATCH 3/6] Updated content layout

---
 ...tallation-raspberry-pi-all-in-one.markdown | 62 ++++++++-----------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
index 111fde26dd0..1d8e1c398f5 100644
--- a/source/getting-started/installation-raspberry-pi-all-in-one.markdown
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -6,12 +6,24 @@ comments: true
 sharing: true
 footer: true
 ---
+Easily deploy a complete Home-Assistant server, complete with Websocket MQTT and Z-Wave support out of the box using Fabric!
+
+**Usage:**
+*Start with a fresh Raspbian Jessie/Jessie-Lite or Debian 8 install*
+ 1. install fabric locally: ```pip3 install fabric3```
+ 2. Ensure you can SSH into Target Host
+ 3. Clone the repo : ``` git clone https://github.com/jbags81/fabric-home-assistant.git ``` on  your local host. (The repo contains a pre-configured default mosquitto.conf file. The only addition is an added listener for websockets listening on 9001. It also contains preconfigured systemd service profiles. For the fabric script to run successfully, it has to be ran from the root of the cloned repo.)
+ 4. Edit ```fabfile.py``` and add the host info for the target host.
+ 5. Run the "deploy" job to build home-assistant server: ``` fab deploy ```
+ 6. Reboot
 
 
- 
- Easily deploy a complete Home-Assistant server, complete with Websocket MQTT and Z-Wave support out of the box using Fabric! 
- 
- Start with a fresh Raspbian Jessie/Jessie-Lite or Debian 8 install, and the fabric script will do the following automatically:
+ Everything will start at boot, and Home-Assistant is accessible now from **http://your_server_ip:8123**
+
+ The Home-Assistant configs are located in: ```/home/hass``` The virtualenv path, along with where all python packages will install is located at: ```/srv/hass/hass_venv```
+
+ <hr>
+**The All-In-One Fabric script will do the following automatically:**
 *  Create all needed directories
 *  Create needed service accounts
 *  Install OS and Python dependencies
@@ -22,43 +34,19 @@ footer: true
 *  Build and Install Python-openzwave in the Home-Assistant virtualenv
 *  Add both Home-Assistant and Mosquitto to systemd services to start at boot
 
-<hr>
+
 
 **What is [Fabric](http://www.fabfile.org)?**
  The official README says:
->  "Fabric is a Python (2.5-2.7) library and command-line tool for streamlining the use of SSH for application deployment or systems administration tasks."
- 
-<hr> 
- 
-###  Usage:
- **Setup:**
- 
- Simply install fabric locally:
- ```pip3 install fabric3```
- 
- Ensure you're able to SSH into the target server.
- 
- 
- Clone the repo : ``` git clone https://github.com/jbags81/fabric-home-assistant.git ``` on  your local host.
- The repo contains a pre-configured default mosquitto.conf file. The only addition is an added listener for websockets listening on 9001. It also contains preconfigured systemd service profiles. For the fabric script to run successfully, it has to be ran from the root of the cloned repo. 
- 
- Edit ```fabfile.py``` and add the host info for the target host.
- 
+*"Fabric is a Python (2.5-2.7) library and command-line tool for streamlining the use of SSH for application deployment or systems administration tasks."*
 
- **Deploy:** 
 
- 
- Run the "deploy" job to build a new home-assistant server: ``` fab deploy ``` , then reboot. 
- Everything will start at boot, and Home-Assistant is accessible now from **http://your_server_ip:8123**
- 
- The Home-Assistant configs are located in: ```/home/hass``` The virtualenv path, along with where all python packages will install is located at: ```/srv/hass/hass_venv```
-   
-<hr>
- Fabric allows any of the underlying functions to be ran individually as well. Run ``` fab -l ``` to see a list of all callable jobs. 
 
- 
- 
- 
- 
-**Tested with Raspbian Jessie, Jessie-Lite, and Debian 8 (username and path modifications needed)**
 
+ Fabric allows any of the underlying functions to be ran individually as well. Run ``` fab -l ``` to see a list of all callable jobs.
+
+
+**Tested with:**
+  * Raspbian Jessie
+  * Raspbian Jessie-Lite
+  * Debian 8 (Replace username "pi" in fabfile.py with debian user)

From a71806942490fadc605aa269cd45550dbc7fc628 Mon Sep 17 00:00:00 2001
From: Jonathan Baginski <jon@baginski.org>
Date: Thu, 12 May 2016 19:04:53 -0400
Subject: [PATCH 4/6] Provided PR feedback updates

---
 ...tallation-raspberry-pi-all-in-one.markdown | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
index 1d8e1c398f5..b6b9617954f 100644
--- a/source/getting-started/installation-raspberry-pi-all-in-one.markdown
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -6,39 +6,33 @@ comments: true
 sharing: true
 footer: true
 ---
-Easily deploy a complete Home-Assistant server, complete with Websocket MQTT and Z-Wave support out of the box using Fabric!
+Easily deploy a complete Home Assistant server, with Websocket MQTT and Z-Wave support out of the box using Fabric!
 
-**Usage:**
+**Steps to run:**
 *Start with a fresh Raspbian Jessie/Jessie-Lite or Debian 8 install*
  1. install fabric locally: ```pip3 install fabric3```
  2. Ensure you can SSH into Target Host
- 3. Clone the repo : ``` git clone https://github.com/jbags81/fabric-home-assistant.git ``` on  your local host. (The repo contains a pre-configured default mosquitto.conf file. The only addition is an added listener for websockets listening on 9001. It also contains preconfigured systemd service profiles. For the fabric script to run successfully, it has to be ran from the root of the cloned repo.)
+ 3. Clone the repo : ``` git clone https://github.com/jbags81/fabric-home-assistant.git ``` (or simply download the zip) to your local host. The repo contains a pre-configured default mosquitto.conf file. The only addition is an added listener for websockets listening on 9001. It also contains preconfigured systemd service profiles. For the fabric script to run successfully, it has to be ran from the root of the cloned repo or zip archive.
  4. Edit ```fabfile.py``` and add the host info for the target host.
- 5. Run the "deploy" job to build home-assistant server: ``` fab deploy ```
+ 5. Run the "deploy" job to build your new Home Assistant server: ``` fab deploy ```
  6. Reboot
 
 
- Everything will start at boot, and Home-Assistant is accessible now from **http://your_server_ip:8123**
+ Everything will start at boot, and Home Assistant is accessible now from **http://your_server_ip:8123**
+
+ The Home Assistant configs are located in: ```/home/hass``` The virtualenv path, along with where all python packages will install is located at: ```/srv/hass/hass_venv```
 
- The Home-Assistant configs are located in: ```/home/hass``` The virtualenv path, along with where all python packages will install is located at: ```/srv/hass/hass_venv```
 
- <hr>
 **The All-In-One Fabric script will do the following automatically:**
 *  Create all needed directories
 *  Create needed service accounts
 *  Install OS and Python dependencies
-*  Setup a virtualenv to run Home-Assistant and components inside.
+*  Setup a virtualenv to run Home Assistant and components inside.
 *  Run as a service account
-*  Install Home-Assistant in a virtualenv
+*  Install Home Assistant in a virtualenv
 *  Build and install Mosquitto from source with websocket support
-*  Build and Install Python-openzwave in the Home-Assistant virtualenv
-*  Add both Home-Assistant and Mosquitto to systemd services to start at boot
-
-
-
-**What is [Fabric](http://www.fabfile.org)?**
- The official README says:
-*"Fabric is a Python (2.5-2.7) library and command-line tool for streamlining the use of SSH for application deployment or systems administration tasks."*
+*  Build and Install Python-openzwave in the Home Assistant virtualenv
+*  Add both Home Assistant and Mosquitto to systemd services to start at boot
 
 
 

From ad2fc66f922284ab2217b87e927f13a3d4aa4ef3 Mon Sep 17 00:00:00 2001
From: Jonathan Baginski <jon@baginski.org>
Date: Thu, 12 May 2016 19:10:31 -0400
Subject: [PATCH 5/6] Markdown edit

---
 .../installation-raspberry-pi-all-in-one.markdown               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
index b6b9617954f..e4ac138cd3d 100644
--- a/source/getting-started/installation-raspberry-pi-all-in-one.markdown
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -8,7 +8,7 @@ footer: true
 ---
 Easily deploy a complete Home Assistant server, with Websocket MQTT and Z-Wave support out of the box using Fabric!
 
-**Steps to run:**
+{% linkable_title Steps to run: %}
 *Start with a fresh Raspbian Jessie/Jessie-Lite or Debian 8 install*
  1. install fabric locally: ```pip3 install fabric3```
  2. Ensure you can SSH into Target Host

From 6581eefa64f88db39c8c70d0b195bc8789d592b3 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Thu, 12 May 2016 21:57:57 -0700
Subject: [PATCH 6/6] Tweak RPi all-in-one instructions

---
 ...tallation-raspberry-pi-all-in-one.markdown | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/source/getting-started/installation-raspberry-pi-all-in-one.markdown b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
index e4ac138cd3d..5aebae50ca1 100644
--- a/source/getting-started/installation-raspberry-pi-all-in-one.markdown
+++ b/source/getting-started/installation-raspberry-pi-all-in-one.markdown
@@ -6,24 +6,30 @@ comments: true
 sharing: true
 footer: true
 ---
-Easily deploy a complete Home Assistant server, with Websocket MQTT and Z-Wave support out of the box using Fabric!
 
-{% linkable_title Steps to run: %}
-*Start with a fresh Raspbian Jessie/Jessie-Lite or Debian 8 install*
- 1. install fabric locally: ```pip3 install fabric3```
- 2. Ensure you can SSH into Target Host
- 3. Clone the repo : ``` git clone https://github.com/jbags81/fabric-home-assistant.git ``` (or simply download the zip) to your local host. The repo contains a pre-configured default mosquitto.conf file. The only addition is an added listener for websockets listening on 9001. It also contains preconfigured systemd service profiles. For the fabric script to run successfully, it has to be ran from the root of the cloned repo or zip archive.
- 4. Edit ```fabfile.py``` and add the host info for the target host.
- 5. Run the "deploy" job to build your new Home Assistant server: ``` fab deploy ```
- 6. Reboot
+Easily deploy a complete Home Assistant server, with Websocket MQTT and Z-Wave driver support using Fabric!
 
+Requirements before installation:
 
- Everything will start at boot, and Home Assistant is accessible now from **http://your_server_ip:8123**
+* You have a Raspberry Pi with a fresh install of [Raspbian Jessie/Jessie-Lite](https://www.raspberrypi.org/downloads/raspbian/).
+* You are able to SSH into your Raspberry Pi
+* You have a computer running Python 3
 
- The Home Assistant configs are located in: ```/home/hass``` The virtualenv path, along with where all python packages will install is located at: ```/srv/hass/hass_venv```
+Installation instructions (all from your PC):
 
+ 1. Install fabric: `pip3 install fabric3`
+ 2. Clone the script: `git clone https://github.com/jbags81/fabric-home-assistant.git`
+ 3. Change directory: `cd fabric-home-assistant`
+ 4. Edit `fabfile.py` and add the host info of your Raspberry Pi.
+ 5. Build your new Home Assistant server: `fab deploy`
+ 6. Reboot your Raspberry Pi
+
+Once rebooted, your Raspberry Pi will be up and running with Home Assistant. You can access it from **http://your_raspberry_pi_ip:8123**.
+
+The Home Assistant config is located at `/home/hass`. The virtualenv with the Home Assistant installation is located at `/srv/hass/hass_venv`.
+
+The All-In-One Fabric script will do the following automatically:
 
-**The All-In-One Fabric script will do the following automatically:**
 *  Create all needed directories
 *  Create needed service accounts
 *  Install OS and Python dependencies
@@ -34,13 +40,10 @@ Easily deploy a complete Home Assistant server, with Websocket MQTT and Z-Wave s
 *  Build and Install Python-openzwave in the Home Assistant virtualenv
 *  Add both Home Assistant and Mosquitto to systemd services to start at boot
 
+Fabric allows any of the underlying functions to be ran individually as well. Run `fab -l` to see a list of all callable jobs.
 
+Tested with:
 
-
- Fabric allows any of the underlying functions to be ran individually as well. Run ``` fab -l ``` to see a list of all callable jobs.
-
-
-**Tested with:**
   * Raspbian Jessie
   * Raspbian Jessie-Lite
   * Debian 8 (Replace username "pi" in fabfile.py with debian user)