Merge pull request #349 from mf-social/patch-1

Reinstate Travis CI verified merges - @mf-social

.travis.yml

@@ -1,10 +1,11 @@
 language: python
-python:
+
-  - "3.6"
+python: "3.6.4"
-install:
+
-  - cd config
-  - pip3 install homeassistant
-script:
-  - hass -c . --script check_config
 before_install:
+  - touch fake_key.pem
   - mv config/travis_secrets.yaml config/secrets.yaml
+
+install: pip3 install homeassistant
+
+script: hass -c config/ --script check_config --info all

config/configuration.yaml

@@ -6,18 +6,18 @@ homeassistant:
   unit_system: imperial
   time_zone: America/New_York
   whitelist_external_dirs:
-    - /config/www/custom_ui/floorplan/images
+    - config/www/custom_ui/floorplan/images
 
   customize: !include_dir_merge_named customize
   customize_domain:
     automation:
       initial_state: 'on'
   customize_glob:
-    "automation.*watchdog*":
+    automation.*watchdog*:
       icon: mdi:timer
-    "sensor.dark_sky_*":
+    sensor.dark_sky_*:
       homebridge_hidden: true
-    "scene.month_*_colors":
+    scene.month_*_colors:
       hidden: true
       homebridge_hidden: true
 
@@ -99,7 +99,7 @@ panel_custom:
 
 discovery:
   ignore:
-   - samsung_tv
+    - samsung_tv
 #   - roku
 #   - google_cast
 

config/travis_secrets.yaml

@@ -6,8 +6,8 @@ http_port: 80
 external_ip: 10.10.10.10
 MQTT_username: MQTT_username
 MQTT_password: password
-ssl_certificate: 'www_traviswebsite_dot_com.fake_crt'
+ssl_certificate: fake_key.pem
-ssl_key: 'www_traviswebsite.fake_key'
+ssl_key: fake_key.pem
 http_base_url: your.website.com
 ifttt_key: iftttKEYPassphrase
 camera1_url: http://192.168.10.21:88/cgi-bin/CGIProxy.fcgi?cmd=getDevState&usr=admin&pwd=password

config/www_traviswebsite.fake_key

@@ -1 +0,0 @@
-This is a DUMMY file for the Travis Builder.

config/www_traviswebsite_dot_com.fake_crt

@@ -1 +0,0 @@
-This is a DUMMY file for the Travis Builder.