Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2018-02-27 21:54:17 -08:00
commit 73fc2cebd2
12 changed files with 143 additions and 23 deletions

View file

@ -65,6 +65,16 @@ automation old:
platform: ...
```
You can use the `automation:` and `automation old:` sections in the same time:
- `automation old:` to keep your manual designed automations
- `automation:` to save the automation created by the online editor
```yaml
automation: !include automations.yaml
automation old: !include_dir_merge_list automations
```
## {% linkable_title Migrating your automations to `automations.yaml` %}
If you want to migrate your old automations to use the editor, you'll have to copy them to `automations.yaml`. Make sure that `automations.yaml` remains a list! For each automation that you copy over you'll have to add an `id`. This can be any string as long as it's unique.

View file

@ -18,7 +18,7 @@ The entity registry makes sure that entities get unique identifiers and allow
customizing the identifiers and names of these entities.
As this is still a very new part of Home Assistant, changes will require a
restart of Home Assistant to take affect. A config user interface will be added
restart of Home Assistant to take effect. A config user interface will be added
in a future version.
<p class='note'>

View file

@ -17,6 +17,10 @@ Home Assistant contains a few built-in events that are used to coordinate betwee
### {% linkable_title Event `homeassistant_start` %}
Event `homeassistant_start` is fired when all components from the configuration have been intitialized. This is the event that will start the timer firing off `time_changed` events.
<p class='note warning'>
Starting 0.42, it is no longer possible to listen for event `homeassistant_start`. Use the 'homeassistant' [platform](docs/automation/trigger) instead.
</p>
### {% linkable_title Event `homeassistant_stop` %}
Event `homeassistant_stop` is fired when Home Assistant is shutting down. It should be used to close any open connection or release any resources.

View file

@ -109,6 +109,15 @@ There is an issue with the Mosquitto package included in Ubuntu 14.04 LTS. Speci
If you get this error `AttributeError: module 'ssl' has no attribute 'PROTOCOL_TLS'` then you need to set `tls_version: '1.2'`.
</p>
<p class='note'>
If you are running a Mosquitto instance on the same server as Home Assistant then you must ensure that the Mosquitto service starts before Home Assistant. For a Linux instance running Systemd (Raspberry Pi, Debian, Ubuntu and others) then you should edit the file /etc/systemd/system/home-assistant@homeassistant.service as root (e.g. sudo nano /etc/systemd/system/home-assistant@homeassistant.service) and add the mosquitto service:
```
[Unit]
Description=Home Assistant
After=network.target mosquitto.service
```
</p>
<p class='note'>
If you are running a Mosquitto instance on a different server with proper SSL encryption using a service like Let's Encrypt you may have to set the certificate to the operating systems own `.crt` certificates file. In the instance of Ubuntu this would be `certificate: /etc/ssl/certs/ca-certificates.crt`
</p>