Merge branch 'master' into dn2_branch

This commit is contained in:
David Newhall II 2020-02-01 00:41:20 -08:00 committed by GitHub
commit 0f4926f1a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View File

@ -1,5 +1,13 @@
# UniFi Poller primary configuration file. TOML FORMAT #
########################################################
# UniFi Poller v2 primary configuration file. TOML FORMAT #
###########################################################
### NOTICE ### 1-26-2020 ###
# This config file, and all the config files in this same folder are for VERSION 2.
# V2 is still alpha and not released. If you use Docker, specifically `latest` you
# will get version 1.6.3. This is *not* the correct config file and will not work.
# It will also not generate errors, and you will spend hours pulling your hair out.
# Use this file for v1: https://github.com/unifi-poller/unifi-poller/blob/v1.6.3/examples/up.conf.example
[poller]
# Turns on line numbers, microsecond logging, and a per-device log.

View File

@ -20,7 +20,7 @@ if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "amd64" ]; then
ARCH="x86_64|amd64"
elif [[ $ARCH == *386* ]] || [[ $ARCH == *686* ]]; then
ARCH="i386"
elif [[ $ARCH == *arm64* ]] || [[ $ARCH == *armv8* ]]; then
elif [[ $ARCH == *arm64* ]] || [[ $ARCH == *armv8* ]] || [[ $ARCH == *aarch64* ]]; then
ARCH="arm64"
elif [[ $ARCH == *armv6* ]] || [[ $ARCH == *armv7* ]]; then
ARCH="armhf"