Merge branch 'master' of github.com:davidnewhall/unifi-poller

integrations/inputunifi/.gitignore

@@ -25,4 +25,4 @@ README.html
 /.metadata.make
 bitly_token
 github_deploy_key
-.secret_files.tar
+.secret-files.tar

integrations/inputunifi/.travis.yml

@@ -27,8 +27,8 @@ install:
   - rvm 2.0.0 do gem install --no-document fpm
 before_script:
   # Create your own deploy key, tar it, and encrypt the file to make this work. Optionally add a bitly_token file to the archive.
-  - openssl aes-256-cbc -K $encrypted_9f3147001275_key -iv $encrypted_9f3147001275_iv -in .secret_files.tar.enc -out .secret_files.tar -d
-  - tar -xf .secret_files.tar
+  - openssl aes-256-cbc -K $encrypted_e3d3b4b2abab_key -iv $encrypted_e3d3b4b2abab_iv -in .secret-files.tar.enc -out .secret-files.tar -d
+  - tar -xf .secret-files.tar
   - source .metadata.sh
   - make vendor
 script:

integrations/inputunifi/init/docker/docker-compose.yml

@@ -41,9 +41,9 @@ services:
     restart: always
     image: golift/unifi-poller:${UP_BRANCH}
     environment:
-      - UP_INFLUX_DB=${INFLUXDB_USERNAME}
-      - UP_INFLUX_USER=${INFLUXDB_PASSWORD}
-      - UP_INFLUX_PASS=${INFLUXDB_DATABASE}
+      - UP_INFLUX_DB=${INFLUXDB_DATABASE}
+      - UP_INFLUX_USER=${INFLUXDB_USERNAME}
+      - UP_INFLUX_PASS=${INFLUXDB_PASSWORD}
       - UP_INFLUX_URL=http://influxdb:8086
       - UP_UNIFI_USER=${UP_UNIFI_USER}
       - UP_UNIFI_PASS=${UP_UNIFI_PASS}