Revert "Automatically symlink /var/run/*.sock sockets to /var/run/weave/*.sock"

test/650_proxy_env_test.sh

@@ -28,10 +28,4 @@ weave_on $HOST1 stop
 weave_on $HOST1 launch-proxy -H tcp://0.0.0.0:12375 -H unix:///var/run/weave/weave.sock
 check
 
-# Check we can use weave env/config with unix -Hs specified
-weave_on $HOST1 stop
-weave_on $HOST1 launch-proxy -H unix:///var/run/weave/weave.sock
-assert_raises "run_on $HOST1 'eval \$(weave env) ; docker $CMD'"
-assert_raises "run_on $HOST1 'docker \$(weave config) $CMD'"
-
 end_suite

test/690_proxy_autoconfig_test.sh

@@ -2,7 +2,7 @@
 
 . ./config.sh
 
-start_suite "Various launch-proxy configurations"
+start_suite "Boot the proxy should only listen on client's interface"
 
 # Booting it over unix socket listens on unix socket
 run_on $HOST1 COVERAGE=$COVERAGE sudo -E weave launch-proxy
@@ -22,11 +22,6 @@ assert_raises "run_on $HOST1 sudo docker -H unix:///var/run/weave/weave.sock ps"
 assert_raises "proxy docker_on $HOST1 ps"
 weave_on $HOST1 stop-proxy
 
-# Booting it with -H outside /var/run/weave, still works
-socket="$(mktemp -d)/weave.sock"
-weave_on $HOST1 launch-proxy -H unix://$socket
-assert_raises "run_on $HOST1 sudo docker -H unix:///$socket ps" 0
-weave_on $HOST1 stop-proxy
 
 # Booting it over tls errors
 assert_raises "DOCKER_CLIENT_ARGS='--tls' weave_on $HOST1 launch-proxy" 1

test/gce.sh

@@ -140,7 +140,7 @@ function hosts {
 		hosts="$hostname $hosts"
 		args="--add-host=$hostname:$(internal_ip $json $name) $args"
 	done
-	echo export SSH=\"ssh -l vagrant\"
+	echo export SSH=ssh
 	echo export HOSTS=\"$hosts\"
 	echo export ADD_HOST_ARGS=\"$args\"
 	rm $json