Merge "veyron: Rename proxy.envyor.com to (ns|auth).dev.v.io"
diff --git a/lib/flags/flags.go b/lib/flags/flags.go
index 76e1baf..bbd71ce 100644
--- a/lib/flags/flags.go
+++ b/lib/flags/flags.go
@@ -30,7 +30,7 @@
ACL
)
-const defaultNamespaceRoot = "/proxy.envyor.com:8101"
+const defaultNamespaceRoot = "/ns.dev.v.io:8101"
// Flags represents the set of flag groups created by a call to
// CreateAndRegister.
diff --git a/lib/flags/flags_test.go b/lib/flags/flags_test.go
index 3514776..a3da088 100644
--- a/lib/flags/flags_test.go
+++ b/lib/flags/flags_test.go
@@ -172,7 +172,7 @@
t.Fatalf("unexpected error: %s", err)
}
rtf := fl.RuntimeFlags()
- if got, want := rtf.NamespaceRoots, []string{"/proxy.envyor.com:8101"}; !reflect.DeepEqual(got, want) {
+ if got, want := rtf.NamespaceRoots, []string{"/ns.dev.v.io:8101"}; !reflect.DeepEqual(got, want) {
t.Errorf("got %q, want %q", got, want)
}
aclf := fl.ACLFlags()
diff --git a/tools/application/doc.go b/tools/application/doc.go
index ba58393..50f9e94 100644
--- a/tools/application/doc.go
+++ b/tools/application/doc.go
@@ -34,7 +34,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/binary/doc.go b/tools/binary/doc.go
index daae844..1e8ad0e 100644
--- a/tools/binary/doc.go
+++ b/tools/binary/doc.go
@@ -31,7 +31,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/build/doc.go b/tools/build/doc.go
index 347c55a..f3b7ae9 100644
--- a/tools/build/doc.go
+++ b/tools/build/doc.go
@@ -29,7 +29,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/debug/doc.go b/tools/debug/doc.go
index ded0837..d611d34 100644
--- a/tools/debug/doc.go
+++ b/tools/debug/doc.go
@@ -33,7 +33,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/mgmt/device/doc.go b/tools/mgmt/device/doc.go
index 8368d98..13f6066 100644
--- a/tools/mgmt/device/doc.go
+++ b/tools/mgmt/device/doc.go
@@ -37,7 +37,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/mounttable/doc.go b/tools/mounttable/doc.go
index 6e8eb92..cc9f700 100644
--- a/tools/mounttable/doc.go
+++ b/tools/mounttable/doc.go
@@ -32,7 +32,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/namespace/doc.go b/tools/namespace/doc.go
index a6e8159..2cf91fa 100644
--- a/tools/namespace/doc.go
+++ b/tools/namespace/doc.go
@@ -39,7 +39,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/principal/main.go b/tools/principal/main.go
index 643d70b..d70d12c 100644
--- a/tools/principal/main.go
+++ b/tools/principal/main.go
@@ -593,7 +593,7 @@
Typically, this command should require no arguments.
However, if the sender and receiver are on different network domains, it may
make sense to use the --veyron.proxy flag:
- principal --veyron.proxy=/proxy.envyor.com:8101 recvblessings
+ principal --veyron.proxy=proxy recvblessings
The command to be run at the sender is of the form:
principal bless --remote_key=KEY --remote_token=TOKEN ADDRESS
@@ -661,7 +661,7 @@
cmdBless.Flags.StringVar(&flagBlessRemoteKey, "remote_key", "", "Public key of the remote principal to bless (obtained from the 'recvblessings' command run by the remote principal")
cmdBless.Flags.StringVar(&flagBlessRemoteToken, "remote_token", "", "Token provided by principal running the 'recvblessings' command")
- cmdSeekBlessings.Flags.StringVar(&flagSeekBlessingsFrom, "from", "https://proxy.envyor.com:8125/google", "URL to use to begin the seek blessings process")
+ cmdSeekBlessings.Flags.StringVar(&flagSeekBlessingsFrom, "from", "https://auth.dev.v.io:8125/google", "URL to use to begin the seek blessings process")
cmdSeekBlessings.Flags.BoolVar(&flagSeekBlessingsSetDefault, "set_default", true, "If true, the blessings obtained will be set as the default blessing in the store")
cmdSeekBlessings.Flags.StringVar(&flagSeekBlessingsForPeer, "for_peer", string(security.AllPrincipals), "If non-empty, the blessings obtained will be marked for peers matching this pattern in the store")
cmdSeekBlessings.Flags.BoolVar(&flagAddToRoots, "add_to_roots", true, "If true, the root certificate of the blessing will be added to the principal's set of recognized root certificates")
diff --git a/tools/profile/doc.go b/tools/profile/doc.go
index 1054a09..794ca1c 100644
--- a/tools/profile/doc.go
+++ b/tools/profile/doc.go
@@ -33,7 +33,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
diff --git a/tools/vrpc/doc.go b/tools/vrpc/doc.go
index 69f90d6..897c72f 100644
--- a/tools/vrpc/doc.go
+++ b/tools/vrpc/doc.go
@@ -42,7 +42,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.proxy=
object name of proxy service to use to export services across network
diff --git a/tools/vrun/doc.go b/tools/vrun/doc.go
index 7b24f38..edb137a 100644
--- a/tools/vrun/doc.go
+++ b/tools/vrun/doc.go
@@ -27,7 +27,7 @@
log level for V logs
-veyron.credentials=
directory to use for storing security credentials
- -veyron.namespace.root=[/proxy.envyor.com:8101]
+ -veyron.namespace.root=[/ns.dev.v.io:8101]
local namespace root; can be repeated to provided multiple roots
-veyron.vtrace.cache_size=1024
The number of vtrace traces to store in memory.
