diff --git a/.travis.yml b/.travis.yml index 69353d4c6..3e91bd945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,9 @@ branches: - except: - - /^v\d\.\d\.\d.*$/ env: global: - secure: btt4r13t09gQlHb6gYrvGC2yGCMMHfnp1Mz1RQedc4Mpf/FfT8aE6xmK2a2i9CCvskjrP0t/BFaS4yxIURjnFRn+ugQIEa0pLspB9UJArW/vgOSpIWM9/OQ/fg8z5XuMxN6Md4DL1/iLypMNSageA1x0TRdt89+D1N1dALpg5XRCXLFbC84TLi0gjlFuib9ibPKzEhLT+anCRJ6iZMzeupDSoaCVbAtJMoDvXw4+4AcRZ1+k4MybBLyCib5boaEOt4pTT88mz4Kk0YaMwPVJyg9Qv36VqyUcPS09Yd95LuyVQ4+tZt8Y1ccbIzULsK+sLM3hLCzxlmlpN3dQBlZJiiRtQde0mgGAKyC0P0A1XjuDTywcsa5edB+fTk1Dsewz9xZ9V0NmMz8t+UNZnaSsAPga9i86jULbXUUwMVSzVRc+Xgx02liB/8qI1xYC9FM6ilStt7rn7mF0k3KbiWhcptgeXjO6Lah9FjEKd5w4MXsdUSTi/86rQaLo+kj+XdaTrXCTulKHyRyQEUj+8V1w0oVz7pcGjePHd7y5oU9ByifVQy6sytuFBfRZvugM5bKHo+i0pcWvixrZS42DrzwxZJsspANOvqSe5ifVbvOkfUppQdCBIwptxV5N1b49XPKU3W/w34QJ8xGmKp3TFA7WwVCztriFHjPgiRpB3EG99Bg= - REPO: $TRAVIS_REPO_SLUG - - VERSION: v1.0.0-beta.$TRAVIS_BUILD_NUMBER + - VERSION: $TRAVIS_TAG matrix: - DOCKER_VERSION=1.9.1 - DOCKER_VERSION=1.10.1 diff --git a/script/deploy.sh b/script/deploy.sh index 97f0f2abd..32415679a 100755 --- a/script/deploy.sh +++ b/script/deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$DOCKER_VERSION" = "1.10.1" ]; then +if [ -z "$TRAVIS_TAG" ] && [ "$DOCKER_VERSION" = "1.10.1" ]; then echo "Deploying..." else echo "Skipping deploy" diff --git a/traefik.go b/traefik.go index 5fef4bc08..b05b558eb 100644 --- a/traefik.go +++ b/traefik.go @@ -101,9 +101,6 @@ func run(traefikConfiguration *TraefikConfiguration) { } log.SetLevel(level) - if len(traefikConfiguration.ConfigFile) != 0 { - log.Infof("Using TOML configuration file %s", traefikConfiguration.ConfigFile) - } if traefikConfiguration.File != nil && len(traefikConfiguration.File.Filename) == 0 { // no filename, setting to global config file if len(traefikConfiguration.ConfigFile) != 0 { @@ -136,6 +133,9 @@ func run(traefikConfiguration *TraefikConfiguration) { } jsonConf, _ := json.Marshal(globalConfiguration) log.Infof("Traefik version %s built on %s", Version, BuildDate) + if len(traefikConfiguration.ConfigFile) != 0 { + log.Infof("Using TOML configuration file %s", traefikConfiguration.ConfigFile) + } log.Debugf("Global configuration loaded %s", string(jsonConf)) server := NewServer(globalConfiguration) server.Start()