Sync with upstream

399ceba

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

customizations/scripts.yaml

+script.restart_august_daemon:
+  friendly_name: Restart August daemon
+  icon: mdi:autorenew

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

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

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

notifications.yaml

 - name: jabber
   platform: xmpp
-  sender: -
-  password: ""
-  recipient: -
+  sender: !secret jabber_sender
+  password: !secret jabber_password
+  recipient: !secret jabber_recipient
   tls: True

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

secrets.yaml

+api_password:
+latitude:
+longitude:
+jabber_sender:
+jabber_recipient:
+jabber_password: ""
+asus_user:
+asus_key:

sensors/cpuspeed.yaml

+platform: cpuspeed
+name: CPU

shell_commands.yaml

+restart_august_daemon: /usr/bin/pm2 restart npm

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" }}'