[ARVADOS] created: f53c7cd9cb889916f4e7433af3b0a193c7b71554

[git at public.curoverse.com]

        at  f53c7cd9cb889916f4e7433af3b0a193c7b71554 (commit)


commit f53c7cd9cb889916f4e7433af3b0a193c7b71554
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Feb 11 14:37:16 2014 -0500

    Added missing workbench configuration directives to Docker (fixes #2072)

diff --git a/docker/workbench/production.rb.in b/docker/workbench/production.rb.in
index 0e5005d..bc3bd33 100644
--- a/docker/workbench/production.rb.in
+++ b/docker/workbench/production.rb.in
@@ -65,9 +65,11 @@ ArvadosWorkbench::Application.configure do
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
+  # Log timing data for API transactions
+  config.profiling_enabled = false
+
   config.arvados_login_base = 'https://' + ENV['API_PORT_443_TCP_ADDR'].to_s + '/login'
   config.arvados_v1_base = 'https://' + ENV['API_PORT_443_TCP_ADDR'].to_s + '/arvados/v1'
-
   config.arvados_insecure_https = @@WORKBENCH_INSECURE_HTTPS@@ # true = do not check server certificate
 
   config.data_import_dir = '@@WORKBENCH_DATA_IMPORT_DIR@@'
@@ -81,4 +83,9 @@ ArvadosWorkbench::Application.configure do
 
   config.site_name = '@@WORKBENCH_SITE_NAME@@'
   config.activation_contact_link = '@@WORKBENCH_ACTIVATION_CONTACT_LINK@@'
+  config.arvados_docsite = 'http://doc.arvados.org'
+
+  config.arvados_theme = 'default'
+
+  config.show_user_agreement_inline = false
 end

commit 3301424f804263b2bab807932f5293993e231b96
Author: Tim Pierce <twp at curoverse.com>
Date:   Mon Feb 10 17:28:39 2014 -0500

    Update api/production.rb.in with changes from services/api.

diff --git a/docker/Makefile b/docker/Makefile
index 6248e0a..c6f3dd7 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -139,6 +139,6 @@ base-image: debian-image $(BASE_DEPS)
 	echo -n "Built at $(date)" > base-image
 
 debian-image:
-	./mkimage-debootstrap.sh arvados/debian wheezy http://debian.lcs.mit.edu/debian/
+	./mkimage-debootstrap.sh arvados/debian wheezy ftp://ftp.us.debian.org/debian/
 	echo -n "Built at $(date)" > debian-image
 
diff --git a/docker/api/production.rb.in b/docker/api/production.rb.in
index 417b915..8d52bab 100644
--- a/docker/api/production.rb.in
+++ b/docker/api/production.rb.in
@@ -65,6 +65,10 @@ Server::Application.configure do
   config.crunch_job_wrapper = :slurm_immediate
   config.crunch_job_user = 'crunch' # if false, do not set uid when running jobs
 
+  # The web service must be able to create/write this file, and
+  # crunch-job must be able to stat() it.
+  config.crunch_refresh_trigger = '/tmp/crunch_refresh_trigger'
+
   # config.dnsmasq_conf_dir = '/etc/dnsmasq.d'
 
   # config.compute_node_ami = 'ami-cbca41a2'

-----------------------------------------------------------------------


hooks/post-receive
--