From dae534085c2fda809558d6656f04433661216e43 Mon Sep 17 00:00:00 2001
From: Erick Hitter <services@ethitter.com>
Date: Sun, 28 Aug 2016 11:53:13 -0700
Subject: [PATCH] Sync with upstream

399ceba
---
 automations/balcony-late-night-dim.yaml          |  0
 automations/balcony-relax-after-sunset.yaml      |  0
 automations/balcony-sunrise-off.yaml             |  0
 automations/balcony-sunset-on.yaml               |  0
 automations/dining-area-on-at-entry.yaml         |  0
 automations/dining-area-timeout.yaml             |  0
 .../dining-area-window-opened-outside.yaml       |  0
 automations/living-room-sunrise-off.yaml         |  0
 automations/living-room-sunset-on.yaml           |  0
 automations/living-room-timeout.yaml             |  0
 automations/office-lights-timeout.yaml           |  0
 automations/update-notification.yaml             |  0
 automations/wireless-charger-timeout.yaml        |  0
 .../acceleration-dining-area-window.yaml         |  0
 binary-sensors/acceleration-front-door.yaml      |  0
 .../acceleration-master-bedroom-window.yaml      |  0
 binary-sensors/acceleration-office-cabinet.yaml  |  0
 binary-sensors/acceleration-office-window.yaml   |  0
 binary-sensors/acceleration-slider.yaml          |  0
 binary-sensors/co-gas-living-room.yaml           |  0
 binary-sensors/co-gas-master-bedroom.yaml        |  0
 binary-sensors/contact-dining-area-window.yaml   |  0
 binary-sensors/contact-front-door.yaml           |  0
 .../contact-master-bedroom-window.yaml           |  0
 binary-sensors/contact-office-cabinet.yaml       |  0
 binary-sensors/contact-office-window.yaml        |  0
 binary-sensors/contact-slider.yaml               |  0
 binary-sensors/motion-kitchen.yaml               |  0
 binary-sensors/motion-office-far-wall.yaml       |  0
 binary-sensors/motion-office-over-closet.yaml    |  0
 binary-sensors/motion-over-slider.yaml           |  0
 binary-sensors/motion-over-utility-closet.yaml   |  0
 binary-sensors/smoke-living-room.yaml            |  0
 binary-sensors/smoke-master-bedroom.yaml         |  0
 configuration.yaml                               | 12 +++++++-----
 customizations/scenes.yaml                       |  0
 customizations/scripts.yaml                      |  3 +++
 customizations/sensors.yaml                      |  0
 customizations/switches.yaml                     |  8 ++++----
 device-tracker.yaml                              |  4 ++--
 groups.yaml                                      |  9 +++++++--
 hue-scenes/bright.yaml                           |  0
 hue-scenes/concentrate.yaml                      |  0
 hue-scenes/dimmed.yaml                           |  0
 hue-scenes/nightlight.yaml                       |  0
 hue-scenes/read.yaml                             |  0
 hue-scenes/relax.yaml                            |  0
 hue.yaml                                         |  0
 input-sliders.yaml                               |  0
 media-player.yaml                                |  0
 notifications.yaml                               |  6 +++---
 scenes/balcony-bright.yaml                       |  0
 scenes/balcony-concentrate.yaml                  |  0
 scenes/balcony-dimmed.yaml                       |  0
 scenes/balcony-nightlight.yaml                   |  0
 scenes/balcony-read.yaml                         |  0
 scenes/balcony-relax.yaml                        |  0
 scenes/dining-area-bright.yaml                   |  0
 scenes/dining-area-concentrate.yaml              |  0
 scenes/dining-area-dimmed.yaml                   |  0
 scenes/dining-area-nightlight.yaml               |  0
 scenes/dining-area-read.yaml                     |  0
 scenes/dining-area-relax.yaml                    |  0
 scenes/ericks-desk-lamp-blink-long.yaml          |  0
 scenes/ericks-desk-lamp-blink-short.yaml         |  0
 scenes/ericks-desk-lamp-nightlight.yaml          |  0
 scenes/ericks-desk-lamp-relax.yaml               |  0
 scenes/living-room-bright.yaml                   |  0
 scenes/living-room-concentrate.yaml              |  0
 scenes/living-room-dimmed.yaml                   |  0
 scenes/living-room-nightlight.yaml               |  0
 scenes/living-room-read.yaml                     |  0
 scenes/living-room-relax.yaml                    |  0
 scenes/master-bath-bright.yaml                   |  0
 scenes/master-bath-concentrate.yaml              |  0
 scenes/master-bath-dimmed.yaml                   |  0
 scenes/master-bath-nightlight.yaml               |  0
 scenes/master-bath-read.yaml                     |  0
 scenes/master-bath-relax.yaml                    |  0
 scenes/master-bedroom-bright.yaml                |  0
 scenes/master-bedroom-concentrate.yaml           |  0
 scenes/master-bedroom-dimmed.yaml                |  0
 scenes/master-bedroom-nightlight.yaml            |  0
 scenes/master-bedroom-read.yaml                  |  0
 scenes/master-bedroom-relax.yaml                 |  0
 scenes/office-bright.yaml                        |  0
 scenes/office-concentrate.yaml                   |  0
 scenes/office-desk-nightlight.yaml               |  0
 scenes/office-dimmed.yaml                        |  0
 scenes/office-nightlight.yaml                    |  0
 scenes/office-read.yaml                          |  0
 scenes/office-relax.yaml                         |  0
 scripts.yaml                                     |  4 ++++
 secrets.yaml                                     |  8 ++++++++
 sensors/battery-above-slider.yaml                |  0
 sensors/battery-above-utility-closet.yaml        |  0
 sensors/battery-dining-area-window.yaml          |  0
 sensors/battery-front-door.yaml                  |  0
 sensors/battery-green-keys.yaml                  |  0
 sensors/battery-kitchen.yaml                     |  0
 sensors/battery-living-room-alarm.yaml           |  0
 sensors/battery-master-bedroom-alarm.yaml        |  0
 sensors/battery-master-bedroom-window.yaml       |  0
 sensors/battery-office-cabinet.yaml              |  0
 sensors/battery-office-far-wall.yaml             |  0
 sensors/battery-office-near-closet.yaml          |  0
 sensors/battery-office-window.yaml               |  0
 sensors/battery-slider.yaml                      |  0
 sensors/cpuspeed.yaml                            |  2 ++
 sensors/fastcom.yaml                             |  0
 sensors/power-lava-lamp.yaml                     |  0
 sensors/speedtest.yaml                           |  0
 sensors/systemmonitor.yaml                       |  0
 sensors/temperature-above-slider.yaml            |  0
 sensors/temperature-above-utility-closet.yaml    |  0
 sensors/temperature-dining-area-window.yaml      |  0
 sensors/temperature-front-door.yaml              |  0
 sensors/temperature-kitchen.yaml                 |  0
 sensors/temperature-master-bedroom-window.yaml   |  0
 sensors/temperature-office-cabinet.yaml          |  0
 sensors/temperature-office-far-wall.yaml         |  0
 sensors/temperature-office-near-closet.yaml      |  0
 sensors/temperature-office-window.yaml           |  0
 sensors/temperature-slider.yaml                  |  0
 sensors/weather.yaml                             |  0
 shell_commands.yaml                              |  1 +
 switches.yaml                                    | 16 ++++++++++------
 127 files changed, 51 insertions(+), 22 deletions(-)
 mode change 100755 => 100644 automations/balcony-late-night-dim.yaml
 mode change 100755 => 100644 automations/balcony-relax-after-sunset.yaml
 mode change 100755 => 100644 automations/balcony-sunrise-off.yaml
 mode change 100755 => 100644 automations/balcony-sunset-on.yaml
 mode change 100755 => 100644 automations/dining-area-on-at-entry.yaml
 mode change 100755 => 100644 automations/dining-area-timeout.yaml
 mode change 100755 => 100644 automations/dining-area-window-opened-outside.yaml
 mode change 100755 => 100644 automations/living-room-sunrise-off.yaml
 mode change 100755 => 100644 automations/living-room-sunset-on.yaml
 mode change 100755 => 100644 automations/living-room-timeout.yaml
 mode change 100755 => 100644 automations/office-lights-timeout.yaml
 mode change 100755 => 100644 automations/update-notification.yaml
 mode change 100755 => 100644 automations/wireless-charger-timeout.yaml
 mode change 100755 => 100644 binary-sensors/acceleration-dining-area-window.yaml
 mode change 100755 => 100644 binary-sensors/acceleration-front-door.yaml
 mode change 100755 => 100644 binary-sensors/acceleration-master-bedroom-window.yaml
 mode change 100755 => 100644 binary-sensors/acceleration-office-cabinet.yaml
 mode change 100755 => 100644 binary-sensors/acceleration-office-window.yaml
 mode change 100755 => 100644 binary-sensors/acceleration-slider.yaml
 mode change 100755 => 100644 binary-sensors/co-gas-living-room.yaml
 mode change 100755 => 100644 binary-sensors/co-gas-master-bedroom.yaml
 mode change 100755 => 100644 binary-sensors/contact-dining-area-window.yaml
 mode change 100755 => 100644 binary-sensors/contact-front-door.yaml
 mode change 100755 => 100644 binary-sensors/contact-master-bedroom-window.yaml
 mode change 100755 => 100644 binary-sensors/contact-office-cabinet.yaml
 mode change 100755 => 100644 binary-sensors/contact-office-window.yaml
 mode change 100755 => 100644 binary-sensors/contact-slider.yaml
 mode change 100755 => 100644 binary-sensors/motion-kitchen.yaml
 mode change 100755 => 100644 binary-sensors/motion-office-far-wall.yaml
 mode change 100755 => 100644 binary-sensors/motion-office-over-closet.yaml
 mode change 100755 => 100644 binary-sensors/motion-over-slider.yaml
 mode change 100755 => 100644 binary-sensors/motion-over-utility-closet.yaml
 mode change 100755 => 100644 binary-sensors/smoke-living-room.yaml
 mode change 100755 => 100644 binary-sensors/smoke-master-bedroom.yaml
 mode change 100755 => 100644 configuration.yaml
 mode change 100755 => 100644 customizations/scenes.yaml
 create mode 100644 customizations/scripts.yaml
 mode change 100755 => 100644 customizations/sensors.yaml
 mode change 100755 => 100644 device-tracker.yaml
 mode change 100755 => 100644 groups.yaml
 mode change 100755 => 100644 hue-scenes/bright.yaml
 mode change 100755 => 100644 hue-scenes/concentrate.yaml
 mode change 100755 => 100644 hue-scenes/dimmed.yaml
 mode change 100755 => 100644 hue-scenes/nightlight.yaml
 mode change 100755 => 100644 hue-scenes/read.yaml
 mode change 100755 => 100644 hue-scenes/relax.yaml
 mode change 100755 => 100644 hue.yaml
 mode change 100755 => 100644 input-sliders.yaml
 mode change 100755 => 100644 media-player.yaml
 mode change 100755 => 100644 notifications.yaml
 mode change 100755 => 100644 scenes/balcony-bright.yaml
 mode change 100755 => 100644 scenes/balcony-concentrate.yaml
 mode change 100755 => 100644 scenes/balcony-dimmed.yaml
 mode change 100755 => 100644 scenes/balcony-nightlight.yaml
 mode change 100755 => 100644 scenes/balcony-read.yaml
 mode change 100755 => 100644 scenes/balcony-relax.yaml
 mode change 100755 => 100644 scenes/dining-area-bright.yaml
 mode change 100755 => 100644 scenes/dining-area-concentrate.yaml
 mode change 100755 => 100644 scenes/dining-area-dimmed.yaml
 mode change 100755 => 100644 scenes/dining-area-nightlight.yaml
 mode change 100755 => 100644 scenes/dining-area-read.yaml
 mode change 100755 => 100644 scenes/dining-area-relax.yaml
 mode change 100755 => 100644 scenes/ericks-desk-lamp-blink-long.yaml
 mode change 100755 => 100644 scenes/ericks-desk-lamp-blink-short.yaml
 mode change 100755 => 100644 scenes/ericks-desk-lamp-nightlight.yaml
 mode change 100755 => 100644 scenes/ericks-desk-lamp-relax.yaml
 mode change 100755 => 100644 scenes/living-room-bright.yaml
 mode change 100755 => 100644 scenes/living-room-concentrate.yaml
 mode change 100755 => 100644 scenes/living-room-dimmed.yaml
 mode change 100755 => 100644 scenes/living-room-nightlight.yaml
 mode change 100755 => 100644 scenes/living-room-read.yaml
 mode change 100755 => 100644 scenes/living-room-relax.yaml
 mode change 100755 => 100644 scenes/master-bath-bright.yaml
 mode change 100755 => 100644 scenes/master-bath-concentrate.yaml
 mode change 100755 => 100644 scenes/master-bath-dimmed.yaml
 mode change 100755 => 100644 scenes/master-bath-nightlight.yaml
 mode change 100755 => 100644 scenes/master-bath-read.yaml
 mode change 100755 => 100644 scenes/master-bath-relax.yaml
 mode change 100755 => 100644 scenes/master-bedroom-bright.yaml
 mode change 100755 => 100644 scenes/master-bedroom-concentrate.yaml
 mode change 100755 => 100644 scenes/master-bedroom-dimmed.yaml
 mode change 100755 => 100644 scenes/master-bedroom-nightlight.yaml
 mode change 100755 => 100644 scenes/master-bedroom-read.yaml
 mode change 100755 => 100644 scenes/master-bedroom-relax.yaml
 mode change 100755 => 100644 scenes/office-bright.yaml
 mode change 100755 => 100644 scenes/office-concentrate.yaml
 mode change 100755 => 100644 scenes/office-desk-nightlight.yaml
 mode change 100755 => 100644 scenes/office-dimmed.yaml
 mode change 100755 => 100644 scenes/office-nightlight.yaml
 mode change 100755 => 100644 scenes/office-read.yaml
 mode change 100755 => 100644 scenes/office-relax.yaml
 mode change 100755 => 100644 scripts.yaml
 create mode 100644 secrets.yaml
 mode change 100755 => 100644 sensors/battery-above-slider.yaml
 mode change 100755 => 100644 sensors/battery-above-utility-closet.yaml
 mode change 100755 => 100644 sensors/battery-dining-area-window.yaml
 mode change 100755 => 100644 sensors/battery-front-door.yaml
 mode change 100755 => 100644 sensors/battery-green-keys.yaml
 mode change 100755 => 100644 sensors/battery-kitchen.yaml
 mode change 100755 => 100644 sensors/battery-living-room-alarm.yaml
 mode change 100755 => 100644 sensors/battery-master-bedroom-alarm.yaml
 mode change 100755 => 100644 sensors/battery-master-bedroom-window.yaml
 mode change 100755 => 100644 sensors/battery-office-cabinet.yaml
 mode change 100755 => 100644 sensors/battery-office-far-wall.yaml
 mode change 100755 => 100644 sensors/battery-office-near-closet.yaml
 mode change 100755 => 100644 sensors/battery-office-window.yaml
 mode change 100755 => 100644 sensors/battery-slider.yaml
 create mode 100644 sensors/cpuspeed.yaml
 mode change 100755 => 100644 sensors/fastcom.yaml
 mode change 100755 => 100644 sensors/power-lava-lamp.yaml
 mode change 100755 => 100644 sensors/speedtest.yaml
 mode change 100755 => 100644 sensors/systemmonitor.yaml
 mode change 100755 => 100644 sensors/temperature-above-slider.yaml
 mode change 100755 => 100644 sensors/temperature-above-utility-closet.yaml
 mode change 100755 => 100644 sensors/temperature-dining-area-window.yaml
 mode change 100755 => 100644 sensors/temperature-front-door.yaml
 mode change 100755 => 100644 sensors/temperature-kitchen.yaml
 mode change 100755 => 100644 sensors/temperature-master-bedroom-window.yaml
 mode change 100755 => 100644 sensors/temperature-office-cabinet.yaml
 mode change 100755 => 100644 sensors/temperature-office-far-wall.yaml
 mode change 100755 => 100644 sensors/temperature-office-near-closet.yaml
 mode change 100755 => 100644 sensors/temperature-office-window.yaml
 mode change 100755 => 100644 sensors/temperature-slider.yaml
 mode change 100755 => 100644 sensors/weather.yaml
 create mode 100644 shell_commands.yaml
 mode change 100755 => 100644 switches.yaml

diff --git a/automations/balcony-late-night-dim.yaml b/automations/balcony-late-night-dim.yaml
old mode 100755
new mode 100644
diff --git a/automations/balcony-relax-after-sunset.yaml b/automations/balcony-relax-after-sunset.yaml
old mode 100755
new mode 100644
diff --git a/automations/balcony-sunrise-off.yaml b/automations/balcony-sunrise-off.yaml
old mode 100755
new mode 100644
diff --git a/automations/balcony-sunset-on.yaml b/automations/balcony-sunset-on.yaml
old mode 100755
new mode 100644
diff --git a/automations/dining-area-on-at-entry.yaml b/automations/dining-area-on-at-entry.yaml
old mode 100755
new mode 100644
diff --git a/automations/dining-area-timeout.yaml b/automations/dining-area-timeout.yaml
old mode 100755
new mode 100644
diff --git a/automations/dining-area-window-opened-outside.yaml b/automations/dining-area-window-opened-outside.yaml
old mode 100755
new mode 100644
diff --git a/automations/living-room-sunrise-off.yaml b/automations/living-room-sunrise-off.yaml
old mode 100755
new mode 100644
diff --git a/automations/living-room-sunset-on.yaml b/automations/living-room-sunset-on.yaml
old mode 100755
new mode 100644
diff --git a/automations/living-room-timeout.yaml b/automations/living-room-timeout.yaml
old mode 100755
new mode 100644
diff --git a/automations/office-lights-timeout.yaml b/automations/office-lights-timeout.yaml
old mode 100755
new mode 100644
diff --git a/automations/update-notification.yaml b/automations/update-notification.yaml
old mode 100755
new mode 100644
diff --git a/automations/wireless-charger-timeout.yaml b/automations/wireless-charger-timeout.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/acceleration-dining-area-window.yaml b/binary-sensors/acceleration-dining-area-window.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/acceleration-front-door.yaml b/binary-sensors/acceleration-front-door.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/acceleration-master-bedroom-window.yaml b/binary-sensors/acceleration-master-bedroom-window.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/acceleration-office-cabinet.yaml b/binary-sensors/acceleration-office-cabinet.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/acceleration-office-window.yaml b/binary-sensors/acceleration-office-window.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/acceleration-slider.yaml b/binary-sensors/acceleration-slider.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/co-gas-living-room.yaml b/binary-sensors/co-gas-living-room.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/co-gas-master-bedroom.yaml b/binary-sensors/co-gas-master-bedroom.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/contact-dining-area-window.yaml b/binary-sensors/contact-dining-area-window.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/contact-front-door.yaml b/binary-sensors/contact-front-door.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/contact-master-bedroom-window.yaml b/binary-sensors/contact-master-bedroom-window.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/contact-office-cabinet.yaml b/binary-sensors/contact-office-cabinet.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/contact-office-window.yaml b/binary-sensors/contact-office-window.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/contact-slider.yaml b/binary-sensors/contact-slider.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/motion-kitchen.yaml b/binary-sensors/motion-kitchen.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/motion-office-far-wall.yaml b/binary-sensors/motion-office-far-wall.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/motion-office-over-closet.yaml b/binary-sensors/motion-office-over-closet.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/motion-over-slider.yaml b/binary-sensors/motion-over-slider.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/motion-over-utility-closet.yaml b/binary-sensors/motion-over-utility-closet.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/smoke-living-room.yaml b/binary-sensors/smoke-living-room.yaml
old mode 100755
new mode 100644
diff --git a/binary-sensors/smoke-master-bedroom.yaml b/binary-sensors/smoke-master-bedroom.yaml
old mode 100755
new mode 100644
diff --git a/configuration.yaml b/configuration.yaml
old mode 100755
new mode 100644
index 0895fd6..06da3a7
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -2,8 +2,8 @@ homeassistant:
   # Name of the location where Home Assistant is running
   name: Home
   # Location required to calculate the time the sun rises and sets
-  latitude: 0
-  longitude: 0
+  latitude: !secret latitude
+  longitude: !secret longitude
   # Impacts weather/sunrise data
   elevation: 250
   # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
@@ -14,15 +14,15 @@ homeassistant:
   customize: !include_dir_merge_named customizations
 
 http:
-  api_password: 
+  api_password: !secret api_password
   server_port: 8123
   ssl_certificate: /home/pi/ssl/cert
   ssl_key: /home/pi/ssl/key
 
 zone:
   name: Home
-  latitude: 0
-  longitude: 0
+  latitude: !secret latitude
+  longitude: !secret longitude
   radius: 30
   icon: mdi:home
 
@@ -81,6 +81,8 @@ scene: !include_dir_list scenes
 
 script: !include scripts.yaml
 
+shell_command: !include shell_commands.yaml
+
 automation: !include_dir_list automations
 
 # Controls
diff --git a/customizations/scenes.yaml b/customizations/scenes.yaml
old mode 100755
new mode 100644
diff --git a/customizations/scripts.yaml b/customizations/scripts.yaml
new file mode 100644
index 0000000..434137a
--- /dev/null
+++ b/customizations/scripts.yaml
@@ -0,0 +1,3 @@
+script.restart_august_daemon:
+  friendly_name: Restart August daemon
+  icon: mdi:autorenew
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
old mode 100755
new mode 100644
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index 669d6c0..fa98d18 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -2,9 +2,9 @@ switch.lava_lamp:
   icon: mdi:led-on
 switch.wireless_charger:
   icon: mdi:battery-charging
-switch.august_front:
-  friendly_name: Front Door
+switch.august_interior:
+  friendly_name: Interior Bolt
   icon: mdi:key
-switch.august_rear:
-  friendly_name: Back Door
+switch.august_keyed:
+  friendly_name: Keyed Bolt
   icon: mdi:key
diff --git a/device-tracker.yaml b/device-tracker.yaml
old mode 100755
new mode 100644
index 5c0abeb..4de6363
--- a/device-tracker.yaml
+++ b/device-tracker.yaml
@@ -6,6 +6,6 @@
   host: 192.168.1.1
   protocol: ssh
   mode: router
-  username: -
-  ssh_key: -
+  username: !secret asus_user
+  ssh_key: !secret asus_key
   consider_home: 90
diff --git a/groups.yaml b/groups.yaml
old mode 100755
new mode 100644
index 5b58a20..c3e749d
--- a/groups.yaml
+++ b/groups.yaml
@@ -37,12 +37,13 @@ misc_view:
   name: Misc
   view: yes
   entities:
+    - group.scripts_misc
     - media_player.nexus_player
 locks:
   name: Locks
   entities:
-    - switch.august_front
-    - switch.august_rear
+    - switch.august_interior
+    - switch.august_keyed
 master_bedroom:
   name: Master Bedroom
   entities:
@@ -203,3 +204,7 @@ sensor_battery_levels:
     - sensor.office_motion_sensor_far_wall_battery_level
     - sensor.office_cabinet_battery_level
     - sensor.green_keys_battery_level
+scripts_misc:
+  name: Actions
+  entities:
+    - script.restart_august_daemon
diff --git a/hue-scenes/bright.yaml b/hue-scenes/bright.yaml
old mode 100755
new mode 100644
diff --git a/hue-scenes/concentrate.yaml b/hue-scenes/concentrate.yaml
old mode 100755
new mode 100644
diff --git a/hue-scenes/dimmed.yaml b/hue-scenes/dimmed.yaml
old mode 100755
new mode 100644
diff --git a/hue-scenes/nightlight.yaml b/hue-scenes/nightlight.yaml
old mode 100755
new mode 100644
diff --git a/hue-scenes/read.yaml b/hue-scenes/read.yaml
old mode 100755
new mode 100644
diff --git a/hue-scenes/relax.yaml b/hue-scenes/relax.yaml
old mode 100755
new mode 100644
diff --git a/hue.yaml b/hue.yaml
old mode 100755
new mode 100644
diff --git a/input-sliders.yaml b/input-sliders.yaml
old mode 100755
new mode 100644
diff --git a/media-player.yaml b/media-player.yaml
old mode 100755
new mode 100644
diff --git a/notifications.yaml b/notifications.yaml
old mode 100755
new mode 100644
index aed953a..fa47a75
--- a/notifications.yaml
+++ b/notifications.yaml
@@ -1,6 +1,6 @@
 - name: jabber
   platform: xmpp
-  sender: -
-  password: ""
-  recipient: -
+  sender: !secret jabber_sender
+  password: !secret jabber_password
+  recipient: !secret jabber_recipient
   tls: True
diff --git a/scenes/balcony-bright.yaml b/scenes/balcony-bright.yaml
old mode 100755
new mode 100644
diff --git a/scenes/balcony-concentrate.yaml b/scenes/balcony-concentrate.yaml
old mode 100755
new mode 100644
diff --git a/scenes/balcony-dimmed.yaml b/scenes/balcony-dimmed.yaml
old mode 100755
new mode 100644
diff --git a/scenes/balcony-nightlight.yaml b/scenes/balcony-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/balcony-read.yaml b/scenes/balcony-read.yaml
old mode 100755
new mode 100644
diff --git a/scenes/balcony-relax.yaml b/scenes/balcony-relax.yaml
old mode 100755
new mode 100644
diff --git a/scenes/dining-area-bright.yaml b/scenes/dining-area-bright.yaml
old mode 100755
new mode 100644
diff --git a/scenes/dining-area-concentrate.yaml b/scenes/dining-area-concentrate.yaml
old mode 100755
new mode 100644
diff --git a/scenes/dining-area-dimmed.yaml b/scenes/dining-area-dimmed.yaml
old mode 100755
new mode 100644
diff --git a/scenes/dining-area-nightlight.yaml b/scenes/dining-area-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/dining-area-read.yaml b/scenes/dining-area-read.yaml
old mode 100755
new mode 100644
diff --git a/scenes/dining-area-relax.yaml b/scenes/dining-area-relax.yaml
old mode 100755
new mode 100644
diff --git a/scenes/ericks-desk-lamp-blink-long.yaml b/scenes/ericks-desk-lamp-blink-long.yaml
old mode 100755
new mode 100644
diff --git a/scenes/ericks-desk-lamp-blink-short.yaml b/scenes/ericks-desk-lamp-blink-short.yaml
old mode 100755
new mode 100644
diff --git a/scenes/ericks-desk-lamp-nightlight.yaml b/scenes/ericks-desk-lamp-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/ericks-desk-lamp-relax.yaml b/scenes/ericks-desk-lamp-relax.yaml
old mode 100755
new mode 100644
diff --git a/scenes/living-room-bright.yaml b/scenes/living-room-bright.yaml
old mode 100755
new mode 100644
diff --git a/scenes/living-room-concentrate.yaml b/scenes/living-room-concentrate.yaml
old mode 100755
new mode 100644
diff --git a/scenes/living-room-dimmed.yaml b/scenes/living-room-dimmed.yaml
old mode 100755
new mode 100644
diff --git a/scenes/living-room-nightlight.yaml b/scenes/living-room-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/living-room-read.yaml b/scenes/living-room-read.yaml
old mode 100755
new mode 100644
diff --git a/scenes/living-room-relax.yaml b/scenes/living-room-relax.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bath-bright.yaml b/scenes/master-bath-bright.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bath-concentrate.yaml b/scenes/master-bath-concentrate.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bath-dimmed.yaml b/scenes/master-bath-dimmed.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bath-nightlight.yaml b/scenes/master-bath-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bath-read.yaml b/scenes/master-bath-read.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bath-relax.yaml b/scenes/master-bath-relax.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bedroom-bright.yaml b/scenes/master-bedroom-bright.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bedroom-concentrate.yaml b/scenes/master-bedroom-concentrate.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bedroom-dimmed.yaml b/scenes/master-bedroom-dimmed.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bedroom-nightlight.yaml b/scenes/master-bedroom-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bedroom-read.yaml b/scenes/master-bedroom-read.yaml
old mode 100755
new mode 100644
diff --git a/scenes/master-bedroom-relax.yaml b/scenes/master-bedroom-relax.yaml
old mode 100755
new mode 100644
diff --git a/scenes/office-bright.yaml b/scenes/office-bright.yaml
old mode 100755
new mode 100644
diff --git a/scenes/office-concentrate.yaml b/scenes/office-concentrate.yaml
old mode 100755
new mode 100644
diff --git a/scenes/office-desk-nightlight.yaml b/scenes/office-desk-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/office-dimmed.yaml b/scenes/office-dimmed.yaml
old mode 100755
new mode 100644
diff --git a/scenes/office-nightlight.yaml b/scenes/office-nightlight.yaml
old mode 100755
new mode 100644
diff --git a/scenes/office-read.yaml b/scenes/office-read.yaml
old mode 100755
new mode 100644
diff --git a/scenes/office-relax.yaml b/scenes/office-relax.yaml
old mode 100755
new mode 100644
diff --git a/scripts.yaml b/scripts.yaml
old mode 100755
new mode 100644
index 34d1b8a..c95f1f3
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -97,3 +97,7 @@ dining_area_lights_timeout:
         entity_id:
           - light.ceiling_fan_1
           - light.ceiling_fan_2
+# Restart August Lock daemon
+restart_august_daemon:
+  sequence:
+    - service: shell_command.restart_august_daemon
diff --git a/secrets.yaml b/secrets.yaml
new file mode 100644
index 0000000..9163c34
--- /dev/null
+++ b/secrets.yaml
@@ -0,0 +1,8 @@
+api_password:
+latitude:
+longitude:
+jabber_sender:
+jabber_recipient:
+jabber_password: ""
+asus_user:
+asus_key:
diff --git a/sensors/battery-above-slider.yaml b/sensors/battery-above-slider.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-above-utility-closet.yaml b/sensors/battery-above-utility-closet.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-dining-area-window.yaml b/sensors/battery-dining-area-window.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-front-door.yaml b/sensors/battery-front-door.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-green-keys.yaml b/sensors/battery-green-keys.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-kitchen.yaml b/sensors/battery-kitchen.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-living-room-alarm.yaml b/sensors/battery-living-room-alarm.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-master-bedroom-alarm.yaml b/sensors/battery-master-bedroom-alarm.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-master-bedroom-window.yaml b/sensors/battery-master-bedroom-window.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-office-cabinet.yaml b/sensors/battery-office-cabinet.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-office-far-wall.yaml b/sensors/battery-office-far-wall.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-office-near-closet.yaml b/sensors/battery-office-near-closet.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-office-window.yaml b/sensors/battery-office-window.yaml
old mode 100755
new mode 100644
diff --git a/sensors/battery-slider.yaml b/sensors/battery-slider.yaml
old mode 100755
new mode 100644
diff --git a/sensors/cpuspeed.yaml b/sensors/cpuspeed.yaml
new file mode 100644
index 0000000..3469f78
--- /dev/null
+++ b/sensors/cpuspeed.yaml
@@ -0,0 +1,2 @@
+platform: cpuspeed
+name: CPU
diff --git a/sensors/fastcom.yaml b/sensors/fastcom.yaml
old mode 100755
new mode 100644
diff --git a/sensors/power-lava-lamp.yaml b/sensors/power-lava-lamp.yaml
old mode 100755
new mode 100644
diff --git a/sensors/speedtest.yaml b/sensors/speedtest.yaml
old mode 100755
new mode 100644
diff --git a/sensors/systemmonitor.yaml b/sensors/systemmonitor.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-above-slider.yaml b/sensors/temperature-above-slider.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-above-utility-closet.yaml b/sensors/temperature-above-utility-closet.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-dining-area-window.yaml b/sensors/temperature-dining-area-window.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-front-door.yaml b/sensors/temperature-front-door.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-kitchen.yaml b/sensors/temperature-kitchen.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-master-bedroom-window.yaml b/sensors/temperature-master-bedroom-window.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-office-cabinet.yaml b/sensors/temperature-office-cabinet.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-office-far-wall.yaml b/sensors/temperature-office-far-wall.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-office-near-closet.yaml b/sensors/temperature-office-near-closet.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-office-window.yaml b/sensors/temperature-office-window.yaml
old mode 100755
new mode 100644
diff --git a/sensors/temperature-slider.yaml b/sensors/temperature-slider.yaml
old mode 100755
new mode 100644
diff --git a/sensors/weather.yaml b/sensors/weather.yaml
old mode 100755
new mode 100644
diff --git a/shell_commands.yaml b/shell_commands.yaml
new file mode 100644
index 0000000..305275b
--- /dev/null
+++ b/shell_commands.yaml
@@ -0,0 +1 @@
+restart_august_daemon: /usr/bin/pm2 restart npm
diff --git a/switches.yaml b/switches.yaml
old mode 100755
new mode 100644
index 745fbb2..11986de
--- a/switches.yaml
+++ b/switches.yaml
@@ -14,11 +14,15 @@
   retain: true
 - platform: command_line
   switches:
-    august_front:
-      oncmd: 'curl "http://localhost:3000/api/lock/front"'
-      offcmd: 'curl "http://localhost:3000/api/unlock/front"'
+    august_interior:
+      oncmd: 'curl "http://localhost:3000/api/lock/interior"'
+      offcmd: 'curl "http://localhost:3000/api/unlock/interior"'
+      statecmd: 'curl --silent "http://localhost:3000/api/status/interior" | grep -oP "(\bunlocked\b)" | wc -l'
+      value_template: '{{ value == "0" }}'
 - platform: command_line
   switches:
-    august_rear:
-      oncmd: 'curl "http://localhost:3000/api/lock/rear"'
-      offcmd: 'curl "http://localhost:3000/api/unlock/rear"'
+    august_keyed:
+      oncmd: 'curl "http://localhost:3000/api/lock/keyed"'
+      offcmd: 'curl "http://localhost:3000/api/unlock/keyed"'
+      statecmd: 'curl --silent "http://localhost:3000/api/status/keyed" | grep -oP "(\bunlocked\b)" | wc -l'
+      value_template: '{{ value == "0" }}'
-- 
GitLab