[ARVADOS] updated: a7d558d6c2db242a6555c7f397cb4d91618aa13c
git at public.curoverse.com
git at public.curoverse.com
Fri May 22 15:32:51 EDT 2015
Summary of changes:
docker/api/apache2_vhost.in | 2 --
docker/arvdock | 15 +++++++++++++--
docker/sso/apache2_vhost.in | 2 --
docker/workbench/apache2_vhost.in | 2 --
services/api/db/structure.sql | 6 ++++--
5 files changed, 17 insertions(+), 10 deletions(-)
via a7d558d6c2db242a6555c7f397cb4d91618aa13c (commit)
from ae3bb0033a24a38489c49ffc26e5a5e8fd93c160 (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 a7d558d6c2db242a6555c7f397cb4d91618aa13c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri May 22 15:32:47 2015 -0400
6138: Added --domain to set ARVADOS_DOMAIN. Removed useless comments in apache2_vhost that mentioned qr1hi.
diff --git a/docker/api/apache2_vhost.in b/docker/api/apache2_vhost.in
index fdbb2f9..344e36d 100644
--- a/docker/api/apache2_vhost.in
+++ b/docker/api/apache2_vhost.in
@@ -42,8 +42,6 @@
SSLEngine on
# SSLCertificateChainFile /etc/ssl/certs/startcom.sub.class1.server.ca.pem
# SSLCACertificateFile /etc/ssl/certs/startcom.ca.pem
- # SSLCertificateFile /etc/ssl/certs/qr1hi.arvadosapi.com.crt.pem
- # SSLCertificateKeyFile /etc/ssl/private/qr1hi.arvadosapi.com.key.pem
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
diff --git a/docker/arvdock b/docker/arvdock
index 2fca7fb..43a384e 100755
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -34,6 +34,7 @@ function usage {
echo >&2 " -k, --keep Keep servers"
echo >&2 " -p, --keepproxy Keepproxy server"
echo >&2 " -h, --help Display this help and exit"
+ echo >&2 " --domain=dns.domain DNS domain used by containers (default dev.arvados)"
echo >&2
echo >&2 " If no options are given, the action is applied to all servers."
echo >&2
@@ -133,7 +134,7 @@ function do_start {
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
local TEMP=`getopt -o d::s::b:a::cw::nkpvh \
- --long doc::,sso::,api::,bridge:,compute,workbench::,nameserver,keep,keepproxy,vm,help \
+ --long doc::,sso::,api::,bridge:,compute,workbench::,nameserver,keep,keepproxy,vm,help,domain:: \
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@ -193,6 +194,11 @@ function do_start {
start_keepproxy=true
shift
;;
+ --domain)
+ case "$2" in
+ *) ARVADOS_DOMAIN="$2"; shift 2 ;;
+ esac
+ ;;
--)
shift
break
@@ -388,7 +394,7 @@ function do_stop {
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
local TEMP=`getopt -o dsacwnkpvh \
- --long doc,sso,api,compute,workbench,nameserver,keep,keepproxy,vm,help \
+ --long doc,sso,api,compute,workbench,nameserver,keep,keepproxy,vm,help,domain:: \
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@ -417,6 +423,11 @@ function do_stop {
stop_keep="keep_server_0 keep_server_1" ; shift ;;
-p | --keepproxy )
stop_keep="keepproxy_server" ; shift ;;
+ --domain)
+ case "$2" in
+ *) ARVADOS_DOMAIN="$2"; shift 2 ;;
+ esac
+ ;;
--)
shift
break
diff --git a/docker/sso/apache2_vhost.in b/docker/sso/apache2_vhost.in
index 554a86d..465a1e6 100644
--- a/docker/sso/apache2_vhost.in
+++ b/docker/sso/apache2_vhost.in
@@ -42,8 +42,6 @@
SSLEngine on
# SSLCertificateChainFile /etc/ssl/certs/startcom.sub.class1.server.ca.pem
# SSLCACertificateFile /etc/ssl/certs/startcom.ca.pem
- # SSLCertificateFile /etc/ssl/certs/qr1hi.arvadosapi.com.crt.pem
- # SSLCertificateKeyFile /etc/ssl/private/qr1hi.arvadosapi.com.key.pem
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
diff --git a/docker/workbench/apache2_vhost.in b/docker/workbench/apache2_vhost.in
index f929781..ba9e7f8 100644
--- a/docker/workbench/apache2_vhost.in
+++ b/docker/workbench/apache2_vhost.in
@@ -27,8 +27,6 @@
SSLEngine off
# SSLCertificateChainFile /etc/ssl/certs/startcom.sub.class1.server.ca.pem
# SSLCACertificateFile /etc/ssl/certs/startcom.ca.pem
- # SSLCertificateFile /etc/ssl/certs/qr1hi.arvadosapi.com.crt.pem
- # SSLCertificateKeyFile /etc/ssl/private/qr1hi.arvadosapi.com.key.pem
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index dc44e41..f19ba47 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -432,8 +432,8 @@ CREATE TABLE jobs (
docker_image_locator character varying(255),
priority integer DEFAULT 0 NOT NULL,
description character varying(524288),
- arvados_sdk_version character varying(255),
- state character varying(255)
+ state character varying(255),
+ arvados_sdk_version character varying(255)
);
@@ -2327,6 +2327,8 @@ INSERT INTO schema_migrations (version) VALUES ('20140714184006');
INSERT INTO schema_migrations (version) VALUES ('20140811184643');
+INSERT INTO schema_migrations (version) VALUES ('20140815171049');
+
INSERT INTO schema_migrations (version) VALUES ('20140817035914');
INSERT INTO schema_migrations (version) VALUES ('20140818125735');
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list