Commit 2786b7bf authored by Erick Hitter's avatar Erick Hitter

Sync with upstream

96a334d
parent 74aab584
Pipeline #969 passed with stage
in 1 minute and 55 seconds
0.88.1 0.92.2
\ No newline at end of file \ No newline at end of file
deps deps
*.db *.db
.cloud/
.storage/ .storage/
.august.conf
login_method: email
username: !secret august_user
password: !secret august_pass
...@@ -10,7 +10,7 @@ condition: ...@@ -10,7 +10,7 @@ condition:
entity_id: light.office entity_id: light.office
state: 'on' state: 'on'
- condition: state - condition: state
entity_id: light.ericks_desk_lamp entity_id: light.erick_s_desk_lamp
state: 'on' state: 'on'
- condition: state - condition: state
entity_id: switch.lava_lamp entity_id: switch.lava_lamp
......
google_actions:
filter:
include_domains:
- switch
- light
include_entities:
- group.ceiling_fan
- group.master_bathroom
exclude_entities:
- lock.interior_bolt
- lock.keyed_bolt
- group.locks
- switch.alarm_status
- switch.christmas_tree
- switch.balcony_outlet
- light.ceiling_fan_1
- light.ceiling_fan_2
- light.master_bath_1
- light.master_bath_2
- light.master_bath_3
entity_config:
light.office:
name: Floor Lamp
light.erick_s_desk_lamp:
name: Desk Lamp
switch.kitchen:
name: Kitchen Light
...@@ -13,20 +13,18 @@ homeassistant: ...@@ -13,20 +13,18 @@ homeassistant:
auth_providers: auth_providers:
- type: homeassistant - type: homeassistant
- type: legacy_api_password - type: legacy_api_password
- type: trusted_networks api_password: !secret api_password
auth: auth:
config:
http: http:
api_password: !secret api_password
server_port: 8123 server_port: 8123
ssl_certificate: /home/pi/ssl/chain ssl_certificate: /home/pi/ssl/chain
ssl_key: /home/pi/ssl/key ssl_key: /home/pi/ssl/key
trusted_networks:
# - 127.0.0.1 cloud: !include cloud.yaml
# - ::1
- 192.168.1.0/24
- 2605:e000:1417:40e2::/64
zone: zone:
name: Home name: Home
...@@ -100,7 +98,9 @@ panel_iframe: !include panels-iframe.yaml ...@@ -100,7 +98,9 @@ panel_iframe: !include panels-iframe.yaml
apcupsd: apcupsd:
google_assistant: !include google-assistant.yaml august: !include august.yaml
system_health:
# Display # Display
group: !include groups.yaml group: !include groups.yaml
......
light.office: light.office:
friendly_name: Office Lamp friendly_name: Office Lamp
light.ericks_desk_lamp: light.erick_s_desk_lamp:
icon: mdi:lightbulb-outline icon: mdi:lightbulb-outline
light.ceiling_fan_1: light.ceiling_fan_1:
friendly_name: Ceiling Fan Front friendly_name: Ceiling Fan Front
......
project_id: !secret google_home_project_id
api_key: !secret google_home_api_key
exposed_domains:
- switch
- light
entity_config:
group.locks:
expose: false
switch.august_interior:
expose: false
switch.august_keyed:
expose: false
switch.alarm_status:
expose: false
switch.christmas_tree:
expose: false
switch.balcony_outlet:
expose: false
light.office:
name: Floor Lamp
light.ericks_desk_lamp:
name: Desk Lamp
switch.kitchen:
name: Kitchen Light
group.ceiling_fan:
expose: true
light.ceiling_fan_1:
expose: false
light.ceiling_fan_2:
expose: false
group.master_bathroom:
expose: true
light.master_bath_1:
expose: false
light.master_bath_2:
expose: false
light.master_bath_3:
expose: false
...@@ -3,6 +3,7 @@ default_view: ...@@ -3,6 +3,7 @@ default_view:
view: yes view: yes
icon: mdi:home icon: mdi:home
entities: entities:
- group.locks
- group.master_bedroom - group.master_bedroom
- group.master_bathroom - group.master_bathroom
- group.living_room - group.living_room
...@@ -10,7 +11,6 @@ default_view: ...@@ -10,7 +11,6 @@ default_view:
- group.office - group.office
- group.balcony - group.balcony
- group.other - group.other
- alarm_control_panel.shm
sensor_view: sensor_view:
name: Sensors name: Sensors
view: yes view: yes
...@@ -36,12 +36,21 @@ media_view: ...@@ -36,12 +36,21 @@ media_view:
view: yes view: yes
icon: mdi:play-network icon: mdi:play-network
entities: entities:
- media_player.apartment
- media_player.common_area
- media_player.everywhere
- media_player.office
- media_player.living_room - media_player.living_room
- media_player.kitchen
- media_player.nexus_player
- media_player.bedroom_speaker
- media_player.chromecastultra9699
misc_view: misc_view:
name: Misc name: Misc
view: yes view: yes
icon: mdi:power icon: mdi:power
entities: entities:
- alarm_control_panel.shm
- group.misc_misc - group.misc_misc
- group.haveibeenpwned - group.haveibeenpwned
- group.sensor_battery_levels - group.sensor_battery_levels
...@@ -82,7 +91,7 @@ office: ...@@ -82,7 +91,7 @@ office:
name: Office name: Office
entities: entities:
- light.office - light.office
- light.ericks_desk_lamp - light.erick_s_desk_lamp
- switch.lava_lamp - switch.lava_lamp
- input_select.scene_office - input_select.scene_office
- input_select.scene_ericks_desk_lamp - input_select.scene_ericks_desk_lamp
...@@ -216,3 +225,8 @@ sensor_battery_levels: ...@@ -216,3 +225,8 @@ sensor_battery_levels:
- sensor.office_motion_sensor_far_wall_battery_level - sensor.office_motion_sensor_far_wall_battery_level
- sensor.office_cabinet_battery_level - sensor.office_cabinet_battery_level
- sensor.green_keys_battery_level - sensor.green_keys_battery_level
locks:
name: Locks
entities:
- lock.keyed_bolt
- lock.interior_bolt
...@@ -2,19 +2,19 @@ green_keys: ...@@ -2,19 +2,19 @@ green_keys:
name: Green Keys name: Green Keys
mac: mac:
picture: picture:
track: yes track: true
hide_if_away: no hide_if_away: no
eh_nexus_6: eh_nexus_6:
name: EH Nexus 6 name: EH Nexus 6
mac: - mac: -
gravatar: !secret gravatar_erick gravatar: !secret gravatar_erick
track: yes track: true
hide_if_away: no hide_if_away: no
cl_samsung_s5: cl_samsung_s5:
name: CL Samsung S5 name: CL Samsung S5
mac: - mac: -
gravatar: !secret gravatar_chris gravatar: !secret gravatar_chris
track: yes track: true
hide_if_away: no hide_if_away: no
...@@ -20,7 +20,7 @@ entities: ...@@ -20,7 +20,7 @@ entities:
state: off state: off
light.office: light.office:
state: off state: off
light.ericks_desk_lamp: light.erick_s_desk_lamp:
state: off state: off
switch.lava_lamp: switch.lava_lamp:
state: off state: off
name: Erick's Desk Lamp Blink Long name: Erick's Desk Lamp Blink Long
entities: entities:
light.ericks_desk_lamp: light.erick_s_desk_lamp:
state: on state: on
brightness: 144 brightness: 144
color_temp: 443 color_temp: 443
......
name: Erick's Desk Lamp Blink Short name: Erick's Desk Lamp Blink Short
entities: entities:
light.ericks_desk_lamp: light.erick_s_desk_lamp:
state: on state: on
brightness: 144 brightness: 144
color_temp: 443 color_temp: 443
......
name: Erick's Desk Lamp Nightlight name: Erick's Desk Lamp Nightlight
entities: entities:
light.ericks_desk_lamp: light.erick_s_desk_lamp:
state: on state: on
brightness: 1 brightness: 1
color_temp: 450 color_temp: 450
name: Erick's Desk Lamp Off name: Erick's Desk Lamp Off
entities: entities:
light.ericks_desk_lamp: light.erick_s_desk_lamp:
state: off state: off
name: Erick's Desk Lamp Relax name: Erick's Desk Lamp Relax
entities: entities:
light.ericks_desk_lamp: light.erick_s_desk_lamp:
state: on state: on
brightness: 144 brightness: 144
color_temp: 443 color_temp: 443
...@@ -4,7 +4,7 @@ entities: ...@@ -4,7 +4,7 @@ entities:
state: on state: on
brightness: 1 brightness: 1
color_temp: 450 color_temp: 450
light.ericks_desk_lamp: light.erick_s_desk_lamp:
state: on state: on
brightness: 1 brightness: 1
color_temp: 450 color_temp: 450
...@@ -45,7 +45,7 @@ office_lights_timeout: ...@@ -45,7 +45,7 @@ office_lights_timeout:
data: data:
entity_id: entity_id:
- light.office - light.office
- light.ericks_desk_lamp - light.erick_s_desk_lamp
- service: switch.turn_off - service: switch.turn_off
data: data:
entity_id: switch.lava_lamp entity_id: switch.lava_lamp
...@@ -97,34 +97,6 @@ dining_area_lights_timeout: ...@@ -97,34 +97,6 @@ dining_area_lights_timeout:
entity_id: entity_id:
- light.ceiling_fan_1 - light.ceiling_fan_1
- light.ceiling_fan_2 - light.ceiling_fan_2
# Restart August Lock daemon
restart_august_daemon:
sequence:
- service: shell_command.restart_august_daemon
# Force lock keyed
force_lock_keyed:
sequence:
- service: shell_command.force_lock_keyed
# Force unlock keyed
force_unlock_keyed:
sequence:
- service: shell_command.force_unlock_keyed
# Force disconnect keyed
force_disconnect_keyed:
sequence:
- service: shell_command.force_disconnect_keyed
# Force lock interior
force_lock_interior:
sequence:
- service: shell_command.force_lock_interior
# Force unlock interior
force_unlock_interior:
sequence:
- service: shell_command.force_unlock_interior
# Force disconnect interior
force_disconnect_interior:
sequence:
- service: shell_command.force_disconnect_interior
# Kitchen light timeout # Kitchen light timeout
kitchen_light_set_timeout: kitchen_light_set_timeout:
......
...@@ -15,5 +15,5 @@ pi_hole_backup_host: 127.0.0.1 ...@@ -15,5 +15,5 @@ pi_hole_backup_host: 127.0.0.1
pi_hole_admin: 127.0.0.1 pi_hole_admin: 127.0.0.1
monit_admin: 'https://127.0.0.1:2812/' monit_admin: 'https://127.0.0.1:2812/'
mattermost_webhook: http://127.0.0.1 mattermost_webhook: http://127.0.0.1
google_home_project_id: 1 august_user: something@example.com
google_home_api_key: abcdef0123456789 august_pass: password
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment