[ARVADOS] updated: ae346e842a13be74e4b4d44afb0ec61b7a2749cb
git at public.curoverse.com
git at public.curoverse.com
Tue Sep 23 11:29:16 EDT 2014
Summary of changes:
apps/workbench/config/application.default.yml | 16 +++++++++++++---
apps/workbench/config/application.yml.example | 4 ++--
apps/workbench/test/test_helper.rb | 2 +-
sdk/go/arvadosclient/arvadosclient_test.go | 8 ++++----
sdk/go/keepclient/keepclient_test.go | 4 ++--
sdk/python/tests/run_test_server.py | 8 ++++----
services/api/config/application.default.yml | 12 +++++++++---
services/api/config/application.yml.example | 9 +++++++++
services/keepproxy/keepproxy_test.go | 2 +-
9 files changed, 45 insertions(+), 20 deletions(-)
via ae346e842a13be74e4b4d44afb0ec61b7a2749cb (commit)
from b96a5d949f88fa4f11570ffdf3b951602a3ea4aa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit ae346e842a13be74e4b4d44afb0ec61b7a2749cb
Author: radhika <radhika at curoverse.com>
Date: Tue Sep 23 11:10:44 2014 -0400
3038: Recommended default port number related update. Now the defaults are as follows:
API server (dev mode): 3030
API server (test mode): 3000
Workbench (dev mode): 3031
Workbench (test mode): 3001
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index e43d94b..9a58b1e 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -15,7 +15,7 @@
# max_wait_seconds: max time in seconds to wait for the pipeline run to complete.
# Default value of 30 seconds is used when this value is not provided.
diagnostics:
- arvados_workbench_url: https://localhost:3000
+ arvados_workbench_url: https://localhost:3031
user_tokens:
active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
pipelines_to_test:
@@ -40,6 +40,11 @@ development:
site_name: Arvados Workbench (dev)
local_modified: <%= '-modified' if `git status -s` %>
+ # API server configuration
+ arvados_login_base: https://localhost:3030/login
+ arvados_v1_base: https://localhost:3030/arvados/v1
+ arvados_insecure_https: true
+
production:
force_ssl: true
cache_classes: true
@@ -58,6 +63,11 @@ production:
data_import_dir: /data/arvados-workbench-upload/data
data_export_dir: /data/arvados-workbench-download/data
+ # API server configuration
+ arvados_login_base: ~
+ arvados_v1_base: ~
+ arvados_insecure_https: ~
+
site_name: Arvados Workbench
test:
@@ -79,8 +89,8 @@ test:
# server as a dependency. These settings should match the API
# server's Rails defaults. If you adjust those, change these
# settings in application.yml to match.
- arvados_login_base: https://localhost:3001/login
- arvados_v1_base: https://localhost:3001/arvados/v1
+ arvados_login_base: https://localhost:3000/login
+ arvados_v1_base: https://localhost:3000/arvados/v1
arvados_insecure_https: true
site_name: Workbench:test
diff --git a/apps/workbench/config/application.yml.example b/apps/workbench/config/application.yml.example
index f617af3..0825012 100644
--- a/apps/workbench/config/application.yml.example
+++ b/apps/workbench/config/application.yml.example
@@ -15,6 +15,6 @@ development:
secret_token: ~
# You probably also want to point to your API server.
- arvados_login_base: https://arvados.local:3000/login
- arvados_v1_base: https://arvados.local:3000/arvados/v1
+ arvados_login_base: https://arvados.local:3030/login
+ arvados_v1_base: https://arvados.local:3030/arvados/v1
arvados_insecure_https: true
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index f7cf87f..3b6dc03 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -131,7 +131,7 @@ class ApiServerForTests
make_ssl_cert
_system('bundle', 'exec', 'rake', 'db:test:load')
_system('bundle', 'exec', 'rake', 'db:fixtures:load')
- _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3001',
+ _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
'--pid-file', SERVER_PID_PATH,
'--ssl',
'--ssl-certificate', 'self-signed.pem',
diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index 678c533..ca1d933 100644
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -35,19 +35,19 @@ func (s *ServerRequiredSuite) SetUpSuite(c *C) {
}
func (s *ServerRequiredSuite) TestMakeArvadosClient(c *C) {
- os.Setenv("ARVADOS_API_HOST", "localhost:3001")
+ os.Setenv("ARVADOS_API_HOST", "localhost:3000")
os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
os.Setenv("ARVADOS_API_HOST_INSECURE", "")
kc, err := MakeArvadosClient()
- c.Check(kc.ApiServer, Equals, "localhost:3001")
+ c.Check(kc.ApiServer, Equals, "localhost:3000")
c.Check(kc.ApiToken, Equals, "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
c.Check(kc.ApiInsecure, Equals, false)
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
kc, err = MakeArvadosClient()
- c.Check(kc.ApiServer, Equals, "localhost:3001")
+ c.Check(kc.ApiServer, Equals, "localhost:3000")
c.Check(kc.ApiToken, Equals, "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
c.Check(kc.ApiInsecure, Equals, true)
c.Check(kc.Client.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify, Equals, true)
@@ -56,7 +56,7 @@ func (s *ServerRequiredSuite) TestMakeArvadosClient(c *C) {
}
func (s *ServerRequiredSuite) TestCreatePipelineTemplate(c *C) {
- os.Setenv("ARVADOS_API_HOST", "localhost:3001")
+ os.Setenv("ARVADOS_API_HOST", "localhost:3000")
os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 015b248..04be03b 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -76,7 +76,7 @@ func (s *ServerRequiredSuite) TearDownSuite(c *C) {
}
func (s *ServerRequiredSuite) TestMakeKeepClient(c *C) {
- os.Setenv("ARVADOS_API_HOST", "localhost:3001")
+ os.Setenv("ARVADOS_API_HOST", "localhost:3000")
os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
@@ -600,7 +600,7 @@ func (s *StandaloneSuite) TestGetWithFailures(c *C) {
}
func (s *ServerRequiredSuite) TestPutGetHead(c *C) {
- os.Setenv("ARVADOS_API_HOST", "localhost:3001")
+ os.Setenv("ARVADOS_API_HOST", "localhost:3000")
os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index ca05844..0ad6725 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -114,8 +114,8 @@ def run(websockets=False, reuse_server=False):
subprocess.call(['bundle', 'exec', 'rails', 'server', '-d',
'--pid',
os.path.join(os.getcwd(), SERVER_PID_PATH),
- '-p3001'])
- os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3001"
+ '-p3000'])
+ os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
pid = find_server_pid(SERVER_PID_PATH)
@@ -176,7 +176,7 @@ def run_keep(blob_signing_key=None, enforce_permissions=False):
_start_keep(0, keep_args)
_start_keep(1, keep_args)
- os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3001"
+ os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
os.environ["ARVADOS_API_HOST_INSECURE"] = "true"
authorize_with("admin")
@@ -210,7 +210,7 @@ def run_keep_proxy(auth):
if not os.path.exists(TEST_TMPDIR):
os.mkdir(TEST_TMPDIR)
- os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3001"
+ os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
os.environ["ARVADOS_API_HOST_INSECURE"] = "true"
os.environ["ARVADOS_API_TOKEN"] = fixture("api_client_authorizations")[auth]["api_token"]
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 78d1d51..947a5a2 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -17,6 +17,9 @@ development:
assets.debug: true
local_modified: <%= '-modified' if `git status -s` %>
+ # Visitors to the API server will be redirected to the workbench
+ workbench_address: https://localhost:3031/
+
production:
force_ssl: true
cache_classes: true
@@ -27,6 +30,9 @@ production:
assets.compile: false
assets.digest: true
+ # Visitors to the API server will be redirected to the workbench
+ workbench_address: ~
+
test:
force_ssl: false
cache_classes: true
@@ -47,6 +53,9 @@ test:
# email address to which mail should be sent when the user creates profile for the first time
user_profile_notification_address: arvados at example.com
+ # Visitors to the API server will be redirected to the workbench
+ workbench_address: https://localhost:3001/
+
common:
uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %>
@@ -118,9 +127,6 @@ common:
new_user_notification_recipients: [ ]
new_inactive_user_notification_recipients: [ ]
- # Visitors to the API server will be redirected to the workbench
- workbench_address: https://workbench.local:3001/
-
# The e-mail address of the user you would like to become marked as an admin
# user on their first login.
# In the default configuration, authentication happens through the Arvados SSO
diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index d6de1ff..40366d3 100644
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -15,16 +15,25 @@ development:
secret_token: ~
blob_signing_key: ~
+ # Visitors to the API server will be redirected to the workbench.
+ workbench_address: https://workbench.local:3031/
+
production:
# Mandatory site secrets. See application.default.yml for more info.
secret_token: ~
blob_signing_key: ~
uuid_prefix: bogus
+ # Visitors to the API server will be redirected to the workbench.
+ workbench_address: ~
+
test:
# Tests should be able to run without further configuration, but if you do
# want to change your local test configuration, this is where to do it.
+ # Visitors to the API server will be redirected to the workbench.
+ workbench_address: https://workbench.local:3001/
+
common:
# Settings in this section will be used in all environments
# (development, production, test) except when overridden in the
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index c4e5ae7..5944b2c 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -62,7 +62,7 @@ func (s *ServerRequiredSuite) SetUpSuite(c *C) {
}
}
- os.Setenv("ARVADOS_API_HOST", "localhost:3001")
+ os.Setenv("ARVADOS_API_HOST", "localhost:3000")
os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list