Merge remote-tracking branch 'origin/current' into next

This commit is contained in:
Paulus Schoutsen 2017-07-23 21:33:35 -07:00
commit 8660f52610
64 changed files with 476 additions and 264 deletions

View file

@ -58,6 +58,7 @@ homeassistant:
| Attribute | Description |
| --------- | ----------- |
| `friendly_name` | Name of the entity.
| `homebridge_name` | Name of the entity in `HomeBridge`.
| `hidden` | Set to `true` to hide the entity.
| `homebridge_hidden` | Set to `true` to hide the entity from `HomeBridge`.
| `emulated_hue` | Set to `false` to hide the entity from emulated_hue.

View file

@ -46,20 +46,22 @@ When you start splitting your configuration into multiple files, you might end u
To see where secrets are being loaded from you can either add an option to your `secrets.yaml` file or use the `check_config` script.
*Option 1*: Print where secrets are retrieved from to the Home Assistant log by adding the following to `secrets.yaml`:
```yaml
logger: debug
```
This will not print the actual secret's value to the log.
*Option 2*: View where secrets are retrieved from and the contents of all `secrets.yaml` files used, you can use the `check_config` script from the command line:
```bash
hass --script check_config --secrets
```
This will print all your secrets
This will print all your secrets.
### {% linkable_title Storing passwords in a keyring managed by your OS %}
Using [Keyring](https://github.com/jaraco/keyring) is an alternative way to `secrets.yaml`. They can be managed from the command line via the keyring script.
Using [Keyring](https://github.com/jaraco/keyring) is an alternative way to `secrets.yaml`. They can be managed from the command line via the `keyring` script.
```bash
$ hass --script keyring --help

View file

@ -107,7 +107,7 @@ Of course if I wanted to make this App or its predecessor reusable I would have
In addition, Apps can write to `AppDaemon`'s logfiles, and there is a system of constraints that allows yout to control when and under what circumstances Apps and callbacks are active to keep the logic clean and simple.
For full installation instructions, see [README.md](https://github.com/home-assistant/appdaemon/blob/dev/README.md) in the `AppDaemon` repository.
For full installation instructions, see [README.md](https://github.com/home-assistant/appdaemon/blob/dev/README.rst) in the `AppDaemon` repository.
There is also full documentation for the API and associated configuration in [API.md](https://github.com/home-assistant/appdaemon/blob/dev/API.md).

View file

@ -12,34 +12,4 @@ redirect_from: /ecosystem/appdaemon/installation/
Installation is either by `pip3` or Docker.
## {% linkable_title Clone the Repository %}
For either method you will need to clone the **AppDaemon** repository to the current local directory on your machine.
``` bash
$ git clone https://github.com/acockburn/appdaemon.git
```
Change your working directory to the repository root. Moving forward, we will be working from this directory.
``` bash
$ cd appdaemon
```
## {% linkable_title Install using Docker %}
To build the Docker image run the following:
``` bash
$ docker build -t appdaemon .
```
(Note the period at the end of the above command)
## {% linkable_title Install using `pip3` %}
Before running `AppDaemon` you will need to install the package:
```bash
$ sudo pip3 install .
```
Follow [these instructions](https://github.com/home-assistant/appdaemon/blob/dev/README.rst) for full details.

View file

@ -36,6 +36,10 @@ server {
location / {
proxy_pass http://localhost:8123/;
proxy_set_header Host $host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location /api/websocket {

View file

@ -19,7 +19,10 @@ The easiest way to install Home Assistant on your Raspberry Pi is by using HASSb
These instructions are also available as a [video](https://www.youtube.com/watch?v=iIz6XqDwHEk). Additional information is available in this [video](https://www.youtube.com/watch?v=tCGlQSsQ-Mc).
After initial boot, you can reach Home Assistant in your browser at [http://hassbian.local:8123]. If you want to login via SSH, the default username is `pi` and password is `raspberry` (please change this by running `passwd`). The Home Assistant configuration is located at `/home/homeassistant/.homeassistant/`.
After initial boot an installer will run in the background and takes around 15 minutes to complete, after it has finished you can reach Home Assistant in your browser at [http://hassbian.local:8123]. If you want to login via SSH, the default username is `pi` and password is `raspberry` (please change this by running `passwd`). The Home Assistant configuration is located at `/home/homeassistant/.homeassistant/`.
If you find that the web page is not reachable after 30 minutes or so, check that you have files in `/home/homeassistant/.homeassistant/`, if there are no files in this location then run the installer manually using this command: `sudo systemctl start install_homeassistant.service`.
The following extras are included on the image: