From a2c7b3c1004c5d39456574c60aa656cc29b8fd4a Mon Sep 17 00:00:00 2001
From: Ev Kontsevoy <ev@kontsevoy.com>
Date: Thu, 15 Sep 2016 16:57:00 -0700
Subject: [PATCH] Version bump

Also improved the error message for self-signed certificates
Fixes #511
---
 Makefile                    |  2 +-
 lib/utils/cli.go            | 11 ++++++++---
 vagrant/base.rb             |  9 ++-------
 vagrant/libvirt/Vagrantfile |  2 +-
 version.go                  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 2d2bab78e0c0a..da455123aef17 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Naming convention:
 #	for stable releases we use "1.0.0" format
 #   for pre-releases, we use   "1.0.0-beta.2" format
-VERSION=1.0.6-alpha
+VERSION=1.1.0
 
 # These are standard autotools variables, don't change them please
 BUILDDIR ?= build
diff --git a/lib/utils/cli.go b/lib/utils/cli.go
index 443c919e0b0cd..8a1c09de8c9a3 100644
--- a/lib/utils/cli.go
+++ b/lib/utils/cli.go
@@ -17,6 +17,7 @@ limitations under the License.
 package utils
 
 import (
+	"crypto/x509"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -90,9 +91,13 @@ func FatalError(err error) {
 
 // UserMessageFromError returns user friendly error message from error
 func UserMessageFromError(err error) string {
-	te, ok := err.(trace.Error)
-	if ok {
-		return te.OrigError().Error()
+	err = trace.Unwrap(err)
+
+	// untrusted cert?
+	switch err.(interface{}).(type) {
+	case x509.UnknownAuthorityError, x509.CertificateInvalidError:
+		return "WARNING:\n The proxy you are connecting to uses the self-signed HTTPS certificate.\n" +
+			" Try --insecure flag if you know what you're doing.\n"
 	}
 	return err.Error()
 }
diff --git a/vagrant/base.rb b/vagrant/base.rb
index 85013de2f8cfa..30a4f33f12461 100644
--- a/vagrant/base.rb
+++ b/vagrant/base.rb
@@ -4,11 +4,6 @@
 NODES ||= {
   "a-auth" => ["a-auth", "10.0.10.10", "auth-a", "cluster-a"],
   "b-auth" => ["b-auth", "10.0.10.20", "auth-b", "cluster-b"], 
-  "web-1"  => ["a-node", "10.0.10.12"],
-  "web-2"  => ["a-node", "10.0.10.13"],
-  "redis"  => ["a-node", "10.0.10.14"],
-  "postgres-1" => ["a-node", "10.0.10.15"],
-  "postgres-2" => ["a-node", "10.0.10.16"],
 }
 
 
@@ -54,8 +49,8 @@ def apt_update(vm)
         apt-get -y update
         apt-get -y purge exim4-* libcairo*
         apt-get -y autoremove
-        apt-get -y upgrade
-        apt-get -y dist-upgrade
+        #apt-get -y upgrade
+        #apt-get -y dist-upgrade
         apt-get -y install htop tree vim aufs-tools screen curl
         touch /root/apt.updated
     fi
diff --git a/vagrant/libvirt/Vagrantfile b/vagrant/libvirt/Vagrantfile
index ddd95a9e82705..2eb5715be9d33 100644
--- a/vagrant/libvirt/Vagrantfile
+++ b/vagrant/libvirt/Vagrantfile
@@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
 
   basic_config(config.vm)
   configure_ssh(config.vm)
-  #apt_update(config.vm)
+  apt_update(config.vm)
   install_docker(config.vm, DOCKER_VER)
   install_teleport(config.vm)
   configure_teleport(config.vm)
diff --git a/version.go b/version.go
index cbcb29fa37f96..c1ed4fe3e159e 100644
--- a/version.go
+++ b/version.go
@@ -2,7 +2,7 @@
 package teleport
 
 const (
-	Version = "1.0.6-alpha"
+	Version = "1.1.0"
 )
 
 var Gitref string