diff --git a/atom.xml b/atom.xml index 7bdcdd844d..66ac319759 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml index 0f47c63b57..dbfc7a32a3 100644 --- a/blog/categories/announcements/atom.xml +++ b/blog/categories/announcements/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Announcements | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 006bb79da5..6256c6a6b3 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 645d95e25e..3916409cd5 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 5328f0db06..a9dfe52181 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index b4b28a54c0..ddfccfa6c1 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 0bda102236..ad050eec5f 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index a461da9675..2910874137 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index e752c33b46..971b6d773c 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml index 079679dc74..fc17d1251a 100644 --- a/blog/categories/media/atom.xml +++ b/blog/categories/media/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Media | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml index 819f2e45fa..74406dcc42 100644 --- a/blog/categories/merchandise/atom.xml +++ b/blog/categories/merchandise/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Merchandise | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index 9f10ecdbb3..e1481ece79 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 17363e1ac4..3edcb19578 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index 351ed8afc9..88b56a56fc 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 1d338b1c0d..b82a444400 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 16d8f843b9..6e5710a20c 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index 4d228d1274..f728d27d3e 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index f06c12d6d6..87258e0e9f 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index c4ac169d09..a57d83a786 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 8e894741f5..0b33b533d7 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 581c60ab01..2f08218b54 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 5d8876c227..ab34f87b55 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index 3163cb14df..de5aa2929c 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 47c58be77d..8d3b454f30 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2017-08-23T07:41:51+00:00 + 2017-08-23T09:14:17+00:00 https://home-assistant.io/ diff --git a/components/apiai/index.html b/components/apiai/index.html index 997764d6c8..e9c2da6c92 100644 --- a/components/apiai/index.html +++ b/components/apiai/index.html @@ -117,29 +117,33 @@ intent_script: Temperature: - speech: The temperature at home is {{ states('sensor.home_temp') }} degrees + speech: + text: The temperature at home is {{ states('sensor.home_temp') }} degrees LocateIntent: - speech: > - {%- for state in states.device_tracker -%} - {%- if state.name.lower() == User.lower() -%} - {{ state.name }} is at {{ state.state }} - {%- elif loop.last -%} - I am sorry, I do not know where {{ User }} is. - {%- endif -%} - {%- else -%} - Sorry, I don't have any trackers registered. - {%- endfor -%} + speech: + text: > + {%- for state in states.device_tracker -%} + {%- if state.name.lower() == User.lower() -%} + {{ state.name }} is at {{ state.state }} + {%- elif loop.last -%} + I am sorry, I do not know where {{ User }} is. + {%- endif -%} + {%- else -%} + Sorry, I don't have any trackers registered. + {%- endfor -%} WhereAreWeIntent: - speech: > - {%- if is_state('device_tracker.adri', 'home') and - is_state('device_tracker.bea', 'home') -%} - You are both home, you silly - {%- else -%} - Bea is at {{ states("device_tracker.bea") }} - and Adri is at {{ states("device_tracker.adri") }} - {% endif %} + speech: + text: > + {%- if is_state('device_tracker.adri', 'home') and + is_state('device_tracker.bea', 'home') -%} + You are both home, you silly + {%- else -%} + Bea is at {{ states("device_tracker.bea") }} + and Adri is at {{ states("device_tracker.adri") }} + {% endif %} TurnLights: - speech: Turning {{ Room }} lights {{ OnOff }} + speech: + text: Turning {{ Room }} lights {{ OnOff }} action: - service: notify.pushbullet data_template: diff --git a/components/weather.openweathermap/index.html b/components/weather.openweathermap/index.html index 6a600201ca..6a60d811a3 100644 --- a/components/weather.openweathermap/index.html +++ b/components/weather.openweathermap/index.html @@ -87,7 +87,7 @@
  • api_key (Required): Your API key for http://openweathermap.org/.
  • name (Optional): Name to use in the frontend.
    • -
  • latitude (Optional): Latitude of the location to display the weather. Defaults to the latitude in your your configuration.yaml file.
    • +
  • latitude (Optional): Latitude of the location to display the weather. Defaults to the latitude in your configuration.yaml file.
  • longitude (Optional): Longitude of the location to display the weather. Defaults to the longitude in your configuration.yaml file.

diff --git a/docs/configuration/secrets/index.html b/docs/configuration/secrets/index.html index 65caa70014..f8968d1acd 100644 --- a/docs/configuration/secrets/index.html +++ b/docs/configuration/secrets/index.html @@ -75,9 +75,9 @@

-

The configuration.yaml file is a plain-text file, thus it is readable by anyone who has access to the file. The file contains passwords and API tokens which need to be redacted if you want to share your configuration. By using !secrets you can remove any private information from you configuration files. This separation can also help you to keep easier track of your passwords and API keys. As they are all stored at one place and no longer spread across the configuration.yaml file or even multiple yaml files if you split up your configuration.

+

The configuration.yaml file is a plain-text file, thus it is readable by anyone who has access to the file. The file contains passwords and API tokens which need to be redacted if you want to share your configuration. By using !secrets you can remove any private information from you configuration files. This separation can also help you to keep easier track of your passwords and API keys. As they are all stored at one place and no longer spread across the configuration.yaml file or even multiple yaml files if you split up your configuration.

Using secrets.yaml

-

The workflow for moving private information to secrets.yaml is very similar to the splitting of the configuration. Create a secrets.yaml file in your Home assistant configuration directory (The location of the folder differs between operating systems: on OS X and Linux it’s ~/.homeassistant and on Windows it’s %APPDATA%/.homeassistant).

+

The workflow for moving private information to secrets.yaml is very similar to the splitting of the configuration. Create a secrets.yaml file in your Home Assistant configuration directory.

The entries for password and API keys in the configuration.yaml file usually looks like the example below.

http:
   api_password: YOUR_PASSWORD
@@ -95,7 +95,7 @@
 
 Debugging secrets

 
When you start splitting your configuration into multiple files, you might end up with configuration in sub folders. Secrets will be resolved in this order:

 
    
-  
  • A secrets.yaml located in the same folder as the yaml file referencing the secret,
    • 
+  
  • A secrets.yaml located in the same folder as the YAML file referencing the secret,
    • 
   
  • next, parent folders will be searched for a secrets.yaml file with the secret, stopping at the folder with the main configuration.yaml,
    • 
   
  • lastly, keyring will be queried for the secret (more info below)
    • 
 

@@ -106,7 +106,7 @@

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:

-
hass --script check_config --secrets
+
$ hass --script check_config --secrets
 

 

 
This will print all your secrets.

diff --git a/sitemap.xml b/sitemap.xml
index 49867f3ed7..6e8ac8a500 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3887,62 +3887,62 @@
 
 
 https://home-assistant.io/demo/frontend.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/index.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-event.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-info.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-service.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-state.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-template.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-history.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-iframe.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-logbook.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-map.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/googlef4f3693c209fe788.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:48+00:00
 
 
 https://home-assistant.io/static/mdi-demo.html
-2017-08-23T07:40:20+00:00
+2017-08-23T09:12:49+00:00