6138: Added --domain to set ARVADOS_DOMAIN. Removed useless comments in apache2_vhos...

diff --git a/docker/api/apache2_vhost.in b/docker/api/apache2_vhost.in
index fdbb2f929332089b3d36c6b817a8572b4d98f2bb..344e36d1759275c9558a93009dcacaf9e61817b4 100644 (file)
--- 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 2fca7fb553981b4c28d5664266d3da02a0778aab..43a384ea497e2cbde1a85b29b1c887edeeb814d5 100755 (executable)
--- 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 554a86db073440460002f7876db44e3373100b9d..465a1e6e3a0da5f84dd8d39bf5b5963577684460 100644 (file)
--- 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 f929781708995814cd264ee8a2eb92233d60bf36..ba9e7f859572549d255b81a053caaf05195ebeb7 100644 (file)
--- 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 dc44e41dea6733fedd3291ec43c08f1bc72f9a91..f19ba473a1c214c1913901b92129b41c9713be89 100644 (file)
--- 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');