From 8da1fb1d74f98d42fccf7e0ba89be46f0dc87122 Mon Sep 17 00:00:00 2001 From: theolind Date: Sat, 28 Feb 2015 18:59:45 +0100 Subject: [PATCH] Added example yaml config file, removed old example config, fixed style violation in bootstrap.py --- config/configuration.yaml.example | 98 +++++++++++++++++++++++++++++ config/home-assistant.conf.example | 99 ------------------------------ homeassistant/bootstrap.py | 2 +- 3 files changed, 99 insertions(+), 100 deletions(-) create mode 100644 config/configuration.yaml.example delete mode 100644 config/home-assistant.conf.example diff --git a/config/configuration.yaml.example b/config/configuration.yaml.example new file mode 100644 index 00000000000..b6a1c04bcbb --- /dev/null +++ b/config/configuration.yaml.example @@ -0,0 +1,98 @@ +homeassistant: +# Location required to calculate the time the sun rises and sets + latitude: '32.87336' + longitude: '-117.22743' + +http: + api_password: mypass + # Set to 1 to load each Polymer component separately + # development: 1 + +#light: +# platform: hue + +#wink: + # Get your token at https://winkbearertoken.appspot.com +# access_token: 'YOUR_TOKEN' + +#device_tracker: + # The following types are available: netgear, tomato, luci, nmap_tracker + platform: netgear + host: 192.168.1.1 + username: admin + password: PASSWORD + # http_id is needed for Tomato routers only + # http_id: ABCDEFGHH + # For nmap_tracker, only the IP addresses to scan are needed: + # hosts: 192.168.1.1/24 # netmask prefix notation or + # hosts: 192.168.1.1-255 # address range + +#chromecast: +switch: + platform: wemo + +#thermostat: + platform: nest + # Required: username and password that are used to login to the Nest thermostat. + username: myemail@mydomain.com + password: mypassword + +downloader: + download_dir: downloads + +notify: + platform: pushbullet + api_key: ABCDEFGHJKLMNOPQRSTUVXYZ + +device_sun_light_trigger: + # Optional: specify a specific light/group of lights that has to be turned on + light_group: group.living_room + # Optional: specify which light profile to use when turning lights on + light_profile: relax + # Optional: disable lights being turned off when everybody leaves the house + # disable_turn_off: 1 + +# A comma seperated list of states that have to be tracked as a single group +# Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME) +group: + living_room: light.Bowl,light.Ceiling,light.TV_back_light + children: device_tracker.child_1,device_tracker.child_2 + +process: + # items are which processes to look for: : + xbmc: XBMC.App + +example: + +simple_alarm: + # Which light/light group has to flash when a known device comes home + known_light: light.Bowl + # Which light/light group has to flash red when light turns on while no one home + unknown_light: group.living_room + +browser: + +keyboard: + +automation: + platform: state + alias: Sun starts shining + + state_entity_id: sun.sun + # Next two are optional, omit to match all + state_from: below_horizon + state_to: above_horizon + + execute_service: light.turn_off + service_entity_id: group.living_room + +automation 2: + platform: time + alias: Beer o Clock + + time_hours: 16 + time_minutes: 0 + time_seconds: 0 + + execute_service: notify.notify + service_data: {"message":"It's 4, time for beer!"} diff --git a/config/home-assistant.conf.example b/config/home-assistant.conf.example deleted file mode 100644 index d71c3c0cc14..00000000000 --- a/config/home-assistant.conf.example +++ /dev/null @@ -1,99 +0,0 @@ -[homeassistant] -# Location required to calculate the time the sun rises and sets -latitude=32.87336 -longitude=-117.22743 - -[http] -api_password=mypass -# Set to 1 to load each Polymer component separately -# development=1 - -[light] -platform=hue - -[wink] -# Get your token at https://winkbearertoken.appspot.com -access_token=YOUR_TOKEN - -[device_tracker] -# The following types are available: netgear, tomato, luci, nmap_tracker -platform=netgear -host=192.168.1.1 -username=admin -password=PASSWORD -# http_id is needed for Tomato routers only -# http_id=ABCDEFGHH -# For nmap_tracker, only the IP addresses to scan are needed: -# hosts=192.168.1.1/24 # netmask prefix notation or -# hosts=192.168.1.1-255 # address range - -[chromecast] - -[switch] -platform=wemo - -[thermostat] -platform=nest -# Required: username and password that are used to login to the Nest thermostat. -username=myemail@mydomain.com -password=mypassword - -[downloader] -download_dir=downloads - -[notify] -platform=pushbullet -api_key=ABCDEFGHJKLMNOPQRSTUVXYZ - -[device_sun_light_trigger] -# Optional: specify a specific light/group of lights that has to be turned on -light_group=group.living_room -# Optional: specify which light profile to use when turning lights on -light_profile=relax -# Optional: disable lights being turned off when everybody leaves the house -# disable_turn_off=1 - -# A comma seperated list of states that have to be tracked as a single group -# Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME) -[group] -living_room=light.Bowl,light.Ceiling,light.TV_back_light -children=device_tracker.child_1,device_tracker.child_2 - -[process] -# items are which processes to look for: = -xbmc=XBMC.App - -[example] - -[simple_alarm] -# Which light/light group has to flash when a known device comes home -known_light=light.Bowl -# Which light/light group has to flash red when light turns on while no one home -unknown_light=group.living_room - -[browser] - -[keyboard] - -[automation] -platform=state -alias=Sun starts shining - -state_entity_id=sun.sun -# Next two are optional, omit to match all -state_from=below_horizon -state_to=above_horizon - -execute_service=light.turn_off -service_entity_id=group.living_room - -[automation 2] -platform=time -alias=Beer o Clock - -time_hours=16 -time_minutes=0 -time_seconds=0 - -execute_service=notify.notify -service_data={"message":"It's 4, time for beer!"} diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py index b7de8a6cd33..ee127976fae 100644 --- a/homeassistant/bootstrap.py +++ b/homeassistant/bootstrap.py @@ -114,7 +114,7 @@ def from_config_file(config_path, hass=None): config_dict = {} # check config file type - if(os.path.splitext(config_path)[1] == '.yaml'): + if os.path.splitext(config_path)[1] == '.yaml': # Read yaml config_dict = yaml.load(io.open(config_path, 'r')) else: