[ARVADOS] updated: 1.3.0-2504-g16bb9837e
Git user
git at public.arvados.org
Sat Apr 18 03:58:27 UTC 2020
Summary of changes:
tools/arvbox/bin/arvbox | 28 ++++----
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 2 +-
tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 8 +--
tools/arvbox/lib/arvbox/docker/Dockerfile.dev | 8 +--
tools/arvbox/lib/arvbox/docker/api-setup.sh | 28 ++++----
tools/arvbox/lib/arvbox/docker/cluster-config.sh | 78 +++++++++++-----------
tools/arvbox/lib/arvbox/docker/common.sh | 8 +--
tools/arvbox/lib/arvbox/docker/createusers.sh | 8 +--
tools/arvbox/lib/arvbox/docker/devenv.sh | 2 +-
tools/arvbox/lib/arvbox/docker/keep-setup.sh | 20 +++---
tools/arvbox/lib/arvbox/docker/runsu.sh | 4 +-
.../lib/arvbox/docker/service/api/run-service | 6 +-
.../docker/service/arv-git-httpd/run-service | 2 +-
.../lib/arvbox/docker/service/certificate/run | 8 +--
.../lib/arvbox/docker/service/controller/run | 2 +-
.../service/crunch-dispatch-local/run-service | 2 +-
.../lib/arvbox/docker/service/gitolite/run-service | 34 +++++-----
.../arvbox/docker/service/keepproxy/run-service | 8 +--
tools/arvbox/lib/arvbox/docker/service/nginx/run | 6 +-
.../arvbox/lib/arvbox/docker/service/postgres/run | 2 +-
.../lib/arvbox/docker/service/ready/run-service | 6 +-
.../lib/arvbox/docker/service/sso/run-service | 28 ++++----
tools/arvbox/lib/arvbox/docker/service/vm/run | 4 +-
.../lib/arvbox/docker/service/vm/run-service | 4 +-
.../arvbox/docker/service/websockets/run-service | 2 +-
.../arvbox/lib/arvbox/docker/service/workbench/run | 8 +--
.../arvbox/docker/service/workbench/run-service | 6 +-
.../arvbox/docker/service/workbench2/run-service | 2 +-
tools/arvbox/lib/arvbox/docker/waitforpostgres.sh | 2 +-
29 files changed, 163 insertions(+), 163 deletions(-)
via 16bb9837e5960652299c5310c2a2e28b75ac127d (commit)
from bc8854efac3c9b75288b810fa1fcd1b7dcb15d31 (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 16bb9837e5960652299c5310c2a2e28b75ac127d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Apr 17 23:57:27 2020 -0400
16267: Change /var/lib/arvados to /var/lib/arvbox
Because of collision with arvados-boot
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index af9824c3a..b3f1ec5b8 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -82,7 +82,7 @@ gethost() {
}
getclusterid() {
- docker exec $ARVBOX_CONTAINER cat /var/lib/arvados/api_uuid_prefix
+ docker exec $ARVBOX_CONTAINER cat /var/lib/arvbox/api_uuid_prefix
}
updateconf() {
@@ -130,7 +130,7 @@ docker_run_dev() {
"--volume=$COMPOSER_ROOT:/usr/src/composer:rw" \
"--volume=$WORKBENCH2_ROOT:/usr/src/workbench2:rw" \
"--volume=$PG_DATA:/var/lib/postgresql:rw" \
- "--volume=$VAR_DATA:/var/lib/arvados:rw" \
+ "--volume=$VAR_DATA:/var/lib/arvbox:rw" \
"--volume=$PASSENGER:/var/lib/passenger:rw" \
"--volume=$GEMS:/var/lib/gems:rw" \
"--volume=$PIPCACHE:/var/lib/pip:rw" \
@@ -219,7 +219,7 @@ run() {
fi
if ! (docker ps -a | grep -E "$ARVBOX_CONTAINER-data$" -q) ; then
- docker create -v /var/lib/postgresql -v /var/lib/arvados --name $ARVBOX_CONTAINER-data arvados/arvbox-demo /bin/true
+ docker create -v /var/lib/postgresql -v /var/lib/arvbox --name $ARVBOX_CONTAINER-data arvados/arvbox-demo /bin/true
fi
docker run \
@@ -289,11 +289,11 @@ run() {
-e TERM=$TERM \
-e WORKSPACE=/usr/src/arvados \
-e GEM_HOME=/var/lib/gems \
- -e CONFIGSRC=/var/lib/arvados/run_tests \
+ -e CONFIGSRC=/var/lib/arvbox/run_tests \
$ARVBOX_CONTAINER \
/usr/local/lib/arvbox/runsu.sh \
/usr/src/arvados/build/run-tests.sh \
- --temp /var/lib/arvados/test \
+ --temp /var/lib/arvbox/test \
$interactive \
"$@"
elif [[ "$CONFIG" = devenv ]] ; then
@@ -589,20 +589,20 @@ case "$subcmd" in
if test -n "$1" ; then
CERT="$1"
fi
- docker exec $ARVBOX_CONTAINER cat /var/lib/arvados/root-cert.pem > "$CERT"
+ docker exec $ARVBOX_CONTAINER cat /var/lib/arvbox/root-cert.pem > "$CERT"
echo "Certificate copied to $CERT"
;;
psql)
- exec docker exec -ti $ARVBOX_CONTAINER bash -c 'PGPASSWORD=$(cat /var/lib/arvados/api_database_pw) exec psql --dbname=arvados_development --host=localhost --username=arvados'
+ exec docker exec -ti $ARVBOX_CONTAINER bash -c 'PGPASSWORD=$(cat /var/lib/arvbox/api_database_pw) exec psql --dbname=arvados_development --host=localhost --username=arvados'
;;
checkpoint)
- exec docker exec -ti $ARVBOX_CONTAINER bash -c 'PGPASSWORD=$(cat /var/lib/arvados/api_database_pw) exec pg_dump --host=localhost --username=arvados --clean arvados_development > /var/lib/arvados/checkpoint.sql'
+ exec docker exec -ti $ARVBOX_CONTAINER bash -c 'PGPASSWORD=$(cat /var/lib/arvbox/api_database_pw) exec pg_dump --host=localhost --username=arvados --clean arvados_development > /var/lib/arvbox/checkpoint.sql'
;;
restore)
- exec docker exec -ti $ARVBOX_CONTAINER bash -c 'PGPASSWORD=$(cat /var/lib/arvados/api_database_pw) exec psql --dbname=arvados_development --host=localhost --username=arvados --quiet --file=/var/lib/arvados/checkpoint.sql'
+ exec docker exec -ti $ARVBOX_CONTAINER bash -c 'PGPASSWORD=$(cat /var/lib/arvbox/api_database_pw) exec psql --dbname=arvados_development --host=localhost --username=arvados --quiet --file=/var/lib/arvbox/checkpoint.sql'
;;
hotreset)
@@ -616,11 +616,11 @@ sv stop keepproxy
cd /usr/src/arvados/services/api
export RAILS_ENV=development
bundle exec rake db:drop
-rm /var/lib/arvados/api_database_setup
-rm /var/lib/arvados/superuser_token
-rm /var/lib/arvados/keep0-uuid
-rm /var/lib/arvados/keep1-uuid
-rm /var/lib/arvados/keepproxy-uuid
+rm /var/lib/arvbox/api_database_setup
+rm /var/lib/arvbox/superuser_token
+rm /var/lib/arvbox/keep0-uuid
+rm /var/lib/arvbox/keep1-uuid
+rm /var/lib/arvbox/keepproxy-uuid
sv start api
sv start controller
sv start websockets
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 6969b0053..0d6b2252d 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
libsecret-1-0 libsecret-1-dev build-essential netcat-traditional \
- golang libpam0g-dev locales git ca-certificates gnupg less && \
+ golang libpam0g-dev locales git ca-certificates gnupg less python-yaml && \
apt-get clean
# Set UTF-8 locale
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index c459260ac..a3e779c13 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -25,10 +25,10 @@ RUN cd /usr/src && \
ADD service/ /var/lib/arvbox/service
RUN ln -sf /var/lib/arvbox/service /etc
-RUN mkdir -p /var/lib/arvados
-RUN echo "production" > /var/lib/arvados/api_rails_env
-RUN echo "production" > /var/lib/arvados/sso_rails_env
-RUN echo "production" > /var/lib/arvados/workbench_rails_env
+RUN mkdir -p /var/lib/arvbox
+RUN echo "production" > /var/lib/arvbox/api_rails_env
+RUN echo "production" > /var/lib/arvbox/sso_rails_env
+RUN echo "production" > /var/lib/arvbox/workbench_rails_env
RUN /usr/local/lib/arvbox/createusers.sh
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
index 43558b697..62027f75e 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
@@ -6,10 +6,10 @@ FROM arvados/arvbox-base
ARG arvados_version
RUN ln -sf /usr/src/arvados/tools/arvbox/lib/arvbox/docker/service /etc
-RUN mkdir -p /var/lib/arvados
-RUN echo "development" > /var/lib/arvados/api_rails_env
-RUN echo "development" > /var/lib/arvados/sso_rails_env
-RUN echo "development" > /var/lib/arvados/workbench_rails_env
+RUN mkdir -p /var/lib/arvbox
+RUN echo "development" > /var/lib/arvbox/api_rails_env
+RUN echo "development" > /var/lib/arvbox/sso_rails_env
+RUN echo "development" > /var/lib/arvbox/workbench_rails_env
RUN mkdir /etc/test-service && \
ln -sf /var/lib/arvbox/service/postgres /etc/test-service && \
diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index 4ed25e03c..6bf036c62 100755
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -11,26 +11,26 @@ set -ex -o pipefail
cd /usr/src/arvados/services/api
-if test -s /var/lib/arvados/api_rails_env ; then
- export RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+if test -s /var/lib/arvbox/api_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvbox/api_rails_env)
else
export RAILS_ENV=development
fi
set -u
-flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
+flock /var/lib/arvbox/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
if test -a /usr/src/arvados/services/api/config/arvados_config.rb ; then
rm -f config/application.yml config/database.yml
else
- uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
- secret_token=$(cat /var/lib/arvados/api_secret_token)
- blob_signing_key=$(cat /var/lib/arvados/blob_signing_key)
- management_token=$(cat /var/lib/arvados/management_token)
- sso_app_secret=$(cat /var/lib/arvados/sso_app_secret)
- database_pw=$(cat /var/lib/arvados/api_database_pw)
- vm_uuid=$(cat /var/lib/arvados/vm-uuid)
+ uuid_prefix=$(cat /var/lib/arvbox/api_uuid_prefix)
+ secret_token=$(cat /var/lib/arvbox/api_secret_token)
+ blob_signing_key=$(cat /var/lib/arvbox/blob_signing_key)
+ management_token=$(cat /var/lib/arvbox/management_token)
+ sso_app_secret=$(cat /var/lib/arvbox/sso_app_secret)
+ database_pw=$(cat /var/lib/arvbox/api_database_pw)
+ vm_uuid=$(cat /var/lib/arvbox/vm-uuid)
cat >config/application.yml <<EOF
$RAILS_ENV:
@@ -60,14 +60,14 @@ EOF
sed "s/password:.*/password: $database_pw/" <config/database.yml.example >config/database.yml
fi
-if ! test -f /var/lib/arvados/api_database_setup ; then
+if ! test -f /var/lib/arvbox/api_database_setup ; then
bundle exec rake db:setup
- touch /var/lib/arvados/api_database_setup
+ touch /var/lib/arvbox/api_database_setup
fi
-if ! test -s /var/lib/arvados/superuser_token ; then
+if ! test -s /var/lib/arvbox/superuser_token ; then
superuser_tok=$(bundle exec ./script/create_superuser_token.rb)
- echo "$superuser_tok" > /var/lib/arvados/superuser_token
+ echo "$superuser_tok" > /var/lib/arvbox/superuser_token
fi
rm -rf tmp
diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index ed4795d1c..bd48d9098 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -6,7 +6,7 @@
exec 2>&1
set -ex -o pipefail
-if [[ -s /etc/arvados/config.yml ]] && [[ /var/lib/arvados/cluster_config.yml.override -ot /etc/arvados/config.yml ]] ; then
+if [[ -s /etc/arvados/config.yml ]] && [[ /var/lib/arvbox/cluster_config.yml.override -ot /etc/arvados/config.yml ]] ; then
exit
fi
@@ -14,63 +14,63 @@ fi
set -u
-if ! test -s /var/lib/arvados/api_uuid_prefix ; then
- ruby -e 'puts "x#{rand(2**64).to_s(36)[0,4]}"' > /var/lib/arvados/api_uuid_prefix
+if ! test -s /var/lib/arvbox/api_uuid_prefix ; then
+ ruby -e 'puts "x#{rand(2**64).to_s(36)[0,4]}"' > /var/lib/arvbox/api_uuid_prefix
fi
-uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
+uuid_prefix=$(cat /var/lib/arvbox/api_uuid_prefix)
-if ! test -s /var/lib/arvados/api_secret_token ; then
- ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/api_secret_token
+if ! test -s /var/lib/arvbox/api_secret_token ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvbox/api_secret_token
fi
-secret_token=$(cat /var/lib/arvados/api_secret_token)
+secret_token=$(cat /var/lib/arvbox/api_secret_token)
-if ! test -s /var/lib/arvados/blob_signing_key ; then
- ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/blob_signing_key
+if ! test -s /var/lib/arvbox/blob_signing_key ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvbox/blob_signing_key
fi
-blob_signing_key=$(cat /var/lib/arvados/blob_signing_key)
+blob_signing_key=$(cat /var/lib/arvbox/blob_signing_key)
-if ! test -s /var/lib/arvados/management_token ; then
- ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/management_token
+if ! test -s /var/lib/arvbox/management_token ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvbox/management_token
fi
-management_token=$(cat /var/lib/arvados/management_token)
+management_token=$(cat /var/lib/arvbox/management_token)
-if ! test -s /var/lib/arvados/system_root_token ; then
- ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/system_root_token
+if ! test -s /var/lib/arvbox/system_root_token ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvbox/system_root_token
fi
-system_root_token=$(cat /var/lib/arvados/system_root_token)
+system_root_token=$(cat /var/lib/arvbox/system_root_token)
-if ! test -s /var/lib/arvados/sso_app_secret ; then
- ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/sso_app_secret
+if ! test -s /var/lib/arvbox/sso_app_secret ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvbox/sso_app_secret
fi
-sso_app_secret=$(cat /var/lib/arvados/sso_app_secret)
+sso_app_secret=$(cat /var/lib/arvbox/sso_app_secret)
-if ! test -s /var/lib/arvados/vm-uuid ; then
- echo $uuid_prefix-2x53u-$(ruby -e 'puts rand(2**400).to_s(36)[0,15]') > /var/lib/arvados/vm-uuid
+if ! test -s /var/lib/arvbox/vm-uuid ; then
+ echo $uuid_prefix-2x53u-$(ruby -e 'puts rand(2**400).to_s(36)[0,15]') > /var/lib/arvbox/vm-uuid
fi
-vm_uuid=$(cat /var/lib/arvados/vm-uuid)
+vm_uuid=$(cat /var/lib/arvbox/vm-uuid)
-if ! test -f /var/lib/arvados/api_database_pw ; then
- ruby -e 'puts rand(2**128).to_s(36)' > /var/lib/arvados/api_database_pw
+if ! test -f /var/lib/arvbox/api_database_pw ; then
+ ruby -e 'puts rand(2**128).to_s(36)' > /var/lib/arvbox/api_database_pw
fi
-database_pw=$(cat /var/lib/arvados/api_database_pw)
+database_pw=$(cat /var/lib/arvbox/api_database_pw)
if ! (psql postgres -c "\du" | grep "^ arvados ") >/dev/null ; then
psql postgres -c "create user arvados with password '$database_pw'"
fi
psql postgres -c "ALTER USER arvados WITH SUPERUSER;"
-if ! test -s /var/lib/arvados/workbench_secret_token ; then
- ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/workbench_secret_token
+if ! test -s /var/lib/arvbox/workbench_secret_token ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvbox/workbench_secret_token
fi
-workbench_secret_key_base=$(cat /var/lib/arvados/workbench_secret_token)
+workbench_secret_key_base=$(cat /var/lib/arvbox/workbench_secret_token)
-if test -s /var/lib/arvados/api_rails_env ; then
- database_env=$(cat /var/lib/arvados/api_rails_env)
+if test -s /var/lib/arvbox/api_rails_env ; then
+ database_env=$(cat /var/lib/arvbox/api_rails_env)
else
database_env=development
fi
-cat >/var/lib/arvados/cluster_config.yml <<EOF
+cat >/var/lib/arvbox/cluster_config.yml <<EOF
Clusters:
${uuid_prefix}:
SystemRootToken: $system_root_token
@@ -152,29 +152,29 @@ Clusters:
ArvadosDocsite: http://$localip:${services[doc]}/
Git:
GitCommand: /usr/share/gitolite3/gitolite-shell
- GitoliteHome: /var/lib/arvados/git
- Repositories: /var/lib/arvados/git/repositories
+ GitoliteHome: /var/lib/arvbox/git
+ Repositories: /var/lib/arvbox/git/repositories
Volumes:
${uuid_prefix}-nyw5e-000000000000000:
Driver: Directory
DriverParameters:
- Root: /var/lib/arvados/keep0
+ Root: /var/lib/arvbox/keep0
AccessViaHosts:
"http://localhost:${services[keepstore0]}": {}
${uuid_prefix}-nyw5e-111111111111111:
Driver: Directory
DriverParameters:
- Root: /var/lib/arvados/keep1
+ Root: /var/lib/arvbox/keep1
AccessViaHosts:
"http://localhost:${services[keepstore1]}": {}
EOF
-/usr/local/lib/arvbox/yml_override.py /var/lib/arvados/cluster_config.yml
+/usr/local/lib/arvbox/yml_override.py /var/lib/arvbox/cluster_config.yml
-cp /var/lib/arvados/cluster_config.yml /etc/arvados/config.yml
+cp /var/lib/arvbox/cluster_config.yml /etc/arvados/config.yml
-mkdir -p /var/lib/arvados/run_tests
-cat >/var/lib/arvados/run_tests/config.yml <<EOF
+mkdir -p /var/lib/arvbox/run_tests
+cat >/var/lib/arvbox/run_tests/config.yml <<EOF
Clusters:
zzzzz:
PostgreSQL:
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index bd681254a..7ab0e7caa 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -20,10 +20,10 @@ else
localip=$containerip
fi
-root_cert=/var/lib/arvados/root-cert.pem
-root_cert_key=/var/lib/arvados/root-cert.key
-server_cert=/var/lib/arvados/server-cert-${localip}.pem
-server_cert_key=/var/lib/arvados/server-cert-${localip}.key
+root_cert=/var/lib/arvbox/root-cert.pem
+root_cert_key=/var/lib/arvbox/root-cert.key
+server_cert=/var/lib/arvbox/server-cert-${localip}.pem
+server_cert_key=/var/lib/arvbox/server-cert-${localip}.key
declare -A services
services=(
diff --git a/tools/arvbox/lib/arvbox/docker/createusers.sh b/tools/arvbox/lib/arvbox/docker/createusers.sh
index 68f5ea776..fd6861149 100755
--- a/tools/arvbox/lib/arvbox/docker/createusers.sh
+++ b/tools/arvbox/lib/arvbox/docker/createusers.sh
@@ -9,12 +9,12 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
HOSTUID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f4)
HOSTGID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f5)
- mkdir -p /var/lib/arvados/git /var/lib/gems \
+ mkdir -p /var/lib/arvbox/git /var/lib/gems \
/var/lib/passenger /var/lib/gopath \
/var/lib/pip /var/lib/npm
if test -z "$ARVBOX_HOME" ; then
- ARVBOX_HOME=/var/lib/arvados
+ ARVBOX_HOME=/var/lib/arvbox
fi
groupadd --gid $HOSTGID --non-unique arvbox
@@ -25,11 +25,11 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
--groups docker \
--shell /bin/bash \
arvbox
- useradd --home-dir /var/lib/arvados/git --uid $HOSTUID --gid $HOSTGID --non-unique git
+ useradd --home-dir /var/lib/arvbox/git --uid $HOSTUID --gid $HOSTGID --non-unique git
useradd --groups docker crunch
if [[ "$1" != --no-chown ]] ; then
- chown arvbox:arvbox -R /usr/local /var/lib/arvados /var/lib/gems \
+ chown arvbox:arvbox -R /usr/local /var/lib/arvbox /var/lib/gems \
/var/lib/passenger /var/lib/postgresql \
/var/lib/nginx /var/log/nginx /etc/ssl/private \
/var/lib/gopath /var/lib/pip /var/lib/npm
diff --git a/tools/arvbox/lib/arvbox/docker/devenv.sh b/tools/arvbox/lib/arvbox/docker/devenv.sh
index 4df5463f1..b77911078 100755
--- a/tools/arvbox/lib/arvbox/docker/devenv.sh
+++ b/tools/arvbox/lib/arvbox/docker/devenv.sh
@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: AGPL-3.0
-flock /var/lib/arvados/createusers.lock /usr/local/lib/arvbox/createusers.sh --no-chown
+flock /var/lib/arvbox/createusers.lock /usr/local/lib/arvbox/createusers.sh --no-chown
if [[ -n "$*" ]] ; then
exec su --preserve-environment arvbox -c "$*"
diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
index 3bc3899b0..00a34c8be 100755
--- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh
@@ -17,11 +17,11 @@ if test "$1" = "--only-deps" ; then
exit
fi
-mkdir -p /var/lib/arvados/$1
+mkdir -p /var/lib/arvbox/$1
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
set +e
read -rd $'\000' keepservice <<EOF
@@ -34,25 +34,25 @@ read -rd $'\000' keepservice <<EOF
EOF
set -e
-if test -s /var/lib/arvados/$1-uuid ; then
- keep_uuid=$(cat /var/lib/arvados/$1-uuid)
+if test -s /var/lib/arvbox/$1-uuid ; then
+ keep_uuid=$(cat /var/lib/arvbox/$1-uuid)
arv keep_service update --uuid $keep_uuid --keep-service "$keepservice"
else
UUID=$(arv --format=uuid keep_service create --keep-service "$keepservice")
- echo $UUID > /var/lib/arvados/$1-uuid
+ echo $UUID > /var/lib/arvbox/$1-uuid
fi
-management_token=$(cat /var/lib/arvados/management_token)
+management_token=$(cat /var/lib/arvbox/management_token)
set +e
sv hup /var/lib/arvbox/service/keepproxy
-cat >/var/lib/arvados/$1.yml <<EOF
+cat >/var/lib/arvbox/$1.yml <<EOF
Listen: "localhost:$2"
-BlobSigningKeyFile: /var/lib/arvados/blob_signing_key
-SystemAuthTokenFile: /var/lib/arvados/superuser_token
+BlobSigningKeyFile: /var/lib/arvbox/blob_signing_key
+SystemAuthTokenFile: /var/lib/arvbox/superuser_token
ManagementToken: $management_token
MaxBuffers: 20
EOF
-exec /usr/local/bin/keepstore -config=/var/lib/arvados/$1.yml
+exec /usr/local/bin/keepstore -config=/var/lib/arvbox/$1.yml
diff --git a/tools/arvbox/lib/arvbox/docker/runsu.sh b/tools/arvbox/lib/arvbox/docker/runsu.sh
index 88d832f0e..10fb354a6 100755
--- a/tools/arvbox/lib/arvbox/docker/runsu.sh
+++ b/tools/arvbox/lib/arvbox/docker/runsu.sh
@@ -6,9 +6,9 @@
HOSTUID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f4)
HOSTGID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f5)
-flock /var/lib/arvados/createusers.lock /usr/local/lib/arvbox/createusers.sh
+flock /var/lib/arvbox/createusers.lock /usr/local/lib/arvbox/createusers.sh
-export HOME=/var/lib/arvados
+export HOME=/var/lib/arvbox
chown arvbox /dev/stderr
diff --git a/tools/arvbox/lib/arvbox/docker/service/api/run-service b/tools/arvbox/lib/arvbox/docker/service/api/run-service
index f052b5d63..4345f5a4a 100755
--- a/tools/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/api/run-service
@@ -10,8 +10,8 @@ set -ex -o pipefail
cd /usr/src/arvados/services/api
-if test -s /var/lib/arvados/api_rails_env ; then
- export RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+if test -s /var/lib/arvbox/api_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvbox/api_rails_env)
else
export RAILS_ENV=development
fi
@@ -24,7 +24,7 @@ if test "$1" = "--only-deps" ; then
exit
fi
-flock /var/lib/arvados/api.lock /usr/local/lib/arvbox/api-setup.sh
+flock /var/lib/arvbox/api.lock /usr/local/lib/arvbox/api-setup.sh
set +u
if test "$1" = "--only-setup" ; then
diff --git a/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service b/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
index 5f71e5ab2..32ae154d5 100755
--- a/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
@@ -18,7 +18,7 @@ fi
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
-export PATH="$PATH:/var/lib/arvados/git/bin"
+export PATH="$PATH:/var/lib/arvbox/git/bin"
cd ~git
exec /usr/local/bin/arv-git-httpd
diff --git a/tools/arvbox/lib/arvbox/docker/service/certificate/run b/tools/arvbox/lib/arvbox/docker/service/certificate/run
index 6443b0179..b54511105 100755
--- a/tools/arvbox/lib/arvbox/docker/service/certificate/run
+++ b/tools/arvbox/lib/arvbox/docker/service/certificate/run
@@ -8,9 +8,9 @@ set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
-/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
+/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvbox/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
-uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
+uuid_prefix=$(cat /var/lib/arvbox/api_uuid_prefix)
if ! openssl verify -CAfile $root_cert $root_cert ; then
# req signing request sub-command
@@ -74,13 +74,13 @@ if ! openssl verify -CAfile $root_cert $server_cert ; then
-extensions x509_ext \
-config <(cat /etc/ssl/openssl.cnf \
<(printf "\n[x509_ext]\nkeyUsage=critical,digitalSignature,keyEncipherment\nsubjectAltName=DNS:localhost,$san")) \
- -out /var/lib/arvados/server-cert-${localip}.csr \
+ -out /var/lib/arvbox/server-cert-${localip}.csr \
-keyout $server_cert_key \
-days 365
openssl x509 \
-req \
- -in /var/lib/arvados/server-cert-${localip}.csr \
+ -in /var/lib/arvbox/server-cert-${localip}.csr \
-CA $root_cert \
-CAkey $root_cert_key \
-out $server_cert \
diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index 7c16e08e2..3b518da49 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -15,6 +15,6 @@ if test "$1" = "--only-deps" ; then
exit
fi
-/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
+/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvbox/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
exec /usr/local/lib/arvbox/runsu.sh /usr/local/bin/arvados-controller
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
index 6e80d30ab..a0e95f750 100755
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service
@@ -25,6 +25,6 @@ chmod +x /usr/local/bin/crunch-run.sh
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
exec /usr/local/bin/crunch-dispatch-local -crunch-run-command=/usr/local/bin/crunch-run.sh -poll-interval=1
diff --git a/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service b/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service
index 6055efc47..e4d112c5a 100755
--- a/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service
@@ -8,16 +8,16 @@ set -eux -o pipefail
. /usr/local/lib/arvbox/common.sh
-mkdir -p /var/lib/arvados/git
+mkdir -p /var/lib/arvbox/git
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
export USER=git
export USERNAME=git
export LOGNAME=git
-export HOME=/var/lib/arvados/git
+export HOME=/var/lib/arvbox/git
cd ~arvbox
@@ -33,7 +33,7 @@ if test -s ~arvbox/.ssh/known_hosts ; then
ssh-keygen -f ".ssh/known_hosts" -R localhost
fi
-if ! test -f /var/lib/arvados/gitolite-setup ; then
+if ! test -f /var/lib/arvbox/gitolite-setup ; then
cd ~git
# Do a no-op login to populate known_hosts
@@ -57,7 +57,7 @@ if ! test -f /var/lib/arvados/gitolite-setup ; then
git config push.default simple
git push
- touch /var/lib/arvados/gitolite-setup
+ touch /var/lib/arvbox/gitolite-setup
else
# Do a no-op login to populate known_hosts
# with the hostkey, so it won't try to ask
@@ -68,14 +68,14 @@ fi
prefix=$(arv --format=uuid user current | cut -d- -f1)
-if ! test -s /var/lib/arvados/arvados-git-uuid ; then
+if ! test -s /var/lib/arvbox/arvados-git-uuid ; then
repo_uuid=$(arv --format=uuid repository create --repository "{\"owner_uuid\":\"$prefix-tpzed-000000000000000\", \"name\":\"arvados\"}")
- echo $repo_uuid > /var/lib/arvados/arvados-git-uuid
+ echo $repo_uuid > /var/lib/arvbox/arvados-git-uuid
fi
-repo_uuid=$(cat /var/lib/arvados/arvados-git-uuid)
+repo_uuid=$(cat /var/lib/arvbox/arvados-git-uuid)
-if ! test -s /var/lib/arvados/arvados-git-link-uuid ; then
+if ! test -s /var/lib/arvbox/arvados-git-link-uuid ; then
all_users_group_uuid="$prefix-j7d0g-fffffffffffffff"
set +e
@@ -89,19 +89,19 @@ if ! test -s /var/lib/arvados/arvados-git-link-uuid ; then
EOF
set -e
link_uuid=$(arv --format=uuid link create --link "$newlink")
- echo $link_uuid > /var/lib/arvados/arvados-git-link-uuid
+ echo $link_uuid > /var/lib/arvbox/arvados-git-link-uuid
fi
-if ! test -d /var/lib/arvados/git/repositories/$repo_uuid.git ; then
- git clone --bare /usr/src/arvados /var/lib/arvados/git/repositories/$repo_uuid.git
+if ! test -d /var/lib/arvbox/git/repositories/$repo_uuid.git ; then
+ git clone --bare /usr/src/arvados /var/lib/arvbox/git/repositories/$repo_uuid.git
else
- git --git-dir=/var/lib/arvados/git/repositories/$repo_uuid.git fetch -f /usr/src/arvados master:master
+ git --git-dir=/var/lib/arvbox/git/repositories/$repo_uuid.git fetch -f /usr/src/arvados master:master
fi
cd /usr/src/arvados/services/api
-if test -s /var/lib/arvados/api_rails_env ; then
- RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+if test -s /var/lib/arvbox/api_rails_env ; then
+ RAILS_ENV=$(cat /var/lib/arvbox/api_rails_env)
else
RAILS_ENV=development
fi
@@ -110,8 +110,8 @@ git_user_key=$(cat ~git/.ssh/id_rsa.pub)
cat > config/arvados-clients.yml <<EOF
$RAILS_ENV:
- gitolite_url: /var/lib/arvados/git/repositories/gitolite-admin.git
- gitolite_tmp: /var/lib/arvados/git
+ gitolite_url: /var/lib/arvbox/git/repositories/gitolite-admin.git
+ gitolite_tmp: /var/lib/arvbox/git
arvados_api_host: $localip:${services[controller-ssl]}
arvados_api_token: "$ARVADOS_API_TOKEN"
arvados_api_host_insecure: false
diff --git a/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service b/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
index d093fbc88..b14edef0c 100755
--- a/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service
@@ -19,7 +19,7 @@ fi
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
set +e
read -rd $'\000' keepservice <<EOF
@@ -32,12 +32,12 @@ read -rd $'\000' keepservice <<EOF
EOF
set -e
-if test -s /var/lib/arvados/keepproxy-uuid ; then
- keep_uuid=$(cat /var/lib/arvados/keepproxy-uuid)
+if test -s /var/lib/arvbox/keepproxy-uuid ; then
+ keep_uuid=$(cat /var/lib/arvbox/keepproxy-uuid)
arv keep_service update --uuid $keep_uuid --keep-service "$keepservice"
else
UUID=$(arv --format=uuid keep_service create --keep-service "$keepservice")
- echo $UUID > /var/lib/arvados/keepproxy-uuid
+ echo $UUID > /var/lib/arvbox/keepproxy-uuid
fi
exec /usr/local/bin/keepproxy
diff --git a/tools/arvbox/lib/arvbox/docker/service/nginx/run b/tools/arvbox/lib/arvbox/docker/service/nginx/run
index d6fecb443..3a2f0c76f 100755
--- a/tools/arvbox/lib/arvbox/docker/service/nginx/run
+++ b/tools/arvbox/lib/arvbox/docker/service/nginx/run
@@ -21,9 +21,9 @@ fi
openssl verify -CAfile $root_cert $server_cert
-cat <<EOF >/var/lib/arvados/nginx.conf
+cat <<EOF >/var/lib/arvbox/nginx.conf
worker_processes auto;
-pid /var/lib/arvados/nginx.pid;
+pid /var/lib/arvbox/nginx.pid;
error_log stderr;
daemon off;
@@ -190,4 +190,4 @@ http {
EOF
-exec nginx -c /var/lib/arvados/nginx.conf
+exec nginx -c /var/lib/arvbox/nginx.conf
diff --git a/tools/arvbox/lib/arvbox/docker/service/postgres/run b/tools/arvbox/lib/arvbox/docker/service/postgres/run
index 3ef78ee45..d1ecaa8d3 100755
--- a/tools/arvbox/lib/arvbox/docker/service/postgres/run
+++ b/tools/arvbox/lib/arvbox/docker/service/postgres/run
@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: AGPL-3.0
-flock /var/lib/arvados/createusers.lock /usr/local/lib/arvbox/createusers.sh
+flock /var/lib/arvbox/createusers.lock /usr/local/lib/arvbox/createusers.sh
make-ssl-cert generate-default-snakeoil --force-overwrite
diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run-service b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
index 470d10537..565bbacd1 100755
--- a/tools/arvbox/lib/arvbox/docker/service/ready/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
@@ -49,9 +49,9 @@ export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
vm_ok=0
-if test -s /var/lib/arvados/vm-uuid -a -s /var/lib/arvados/superuser_token; then
- vm_uuid=$(cat /var/lib/arvados/vm-uuid)
- export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
+if test -s /var/lib/arvbox/vm-uuid -a -s /var/lib/arvados/superuser_token; then
+ vm_uuid=$(cat /var/lib/arvbox/vm-uuid)
+ export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
if (which arv && arv virtual_machine get --uuid $vm_uuid) >/dev/null 2>/dev/null ; then
vm_ok=1
fi
diff --git a/tools/arvbox/lib/arvbox/docker/service/sso/run-service b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
index e30e34f7c..70a192109 100755
--- a/tools/arvbox/lib/arvbox/docker/service/sso/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
@@ -9,8 +9,8 @@ set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
cd /usr/src/sso
-if test -s /var/lib/arvados/sso_rails_env ; then
- export RAILS_ENV=$(cat /var/lib/arvados/sso_rails_env)
+if test -s /var/lib/arvbox/sso_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvbox/sso_rails_env)
else
export RAILS_ENV=development
fi
@@ -25,12 +25,12 @@ fi
set -u
-uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
+uuid_prefix=$(cat /var/lib/arvbox/api_uuid_prefix)
-if ! test -s /var/lib/arvados/sso_secret_token ; then
- ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/sso_secret_token
+if ! test -s /var/lib/arvbox/sso_secret_token ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvbox/sso_secret_token
fi
-secret_token=$(cat /var/lib/arvados/sso_secret_token)
+secret_token=$(cat /var/lib/arvbox/sso_secret_token)
openssl verify -CAfile $root_cert $server_cert
@@ -44,10 +44,10 @@ EOF
(cd config && /usr/local/lib/arvbox/yml_override.py application.yml)
-if ! test -f /var/lib/arvados/sso_database_pw ; then
- ruby -e 'puts rand(2**128).to_s(36)' > /var/lib/arvados/sso_database_pw
+if ! test -f /var/lib/arvbox/sso_database_pw ; then
+ ruby -e 'puts rand(2**128).to_s(36)' > /var/lib/arvbox/sso_database_pw
fi
-database_pw=$(cat /var/lib/arvados/sso_database_pw)
+database_pw=$(cat /var/lib/arvbox/sso_database_pw)
if ! (psql postgres -c "\du" | grep "^ arvados_sso ") >/dev/null ; then
psql postgres -c "create user arvados_sso with password '$database_pw'"
@@ -56,10 +56,10 @@ fi
sed "s/password:.*/password: $database_pw/" <config/database.yml.example >config/database.yml
-if ! test -f /var/lib/arvados/sso_database_setup ; then
+if ! test -f /var/lib/arvbox/sso_database_setup ; then
bundle exec rake db:setup
- app_secret=$(cat /var/lib/arvados/sso_app_secret)
+ app_secret=$(cat /var/lib/arvbox/sso_app_secret)
bundle exec rails console <<EOF
c = Client.new
@@ -69,7 +69,7 @@ c.app_secret = "$app_secret"
c.save!
EOF
- touch /var/lib/arvados/sso_database_setup
+ touch /var/lib/arvbox/sso_database_setup
fi
rm -rf tmp
@@ -84,5 +84,5 @@ if test "$1" = "--only-setup" ; then
fi
exec bundle exec passenger start --port=${services[sso]} \
- --ssl --ssl-certificate=/var/lib/arvados/server-cert-${localip}.pem \
- --ssl-certificate-key=/var/lib/arvados/server-cert-${localip}.key
+ --ssl --ssl-certificate=/var/lib/arvbox/server-cert-${localip}.pem \
+ --ssl-certificate-key=/var/lib/arvbox/server-cert-${localip}.key
diff --git a/tools/arvbox/lib/arvbox/docker/service/vm/run b/tools/arvbox/lib/arvbox/docker/service/vm/run
index ee210e35d..7f1be3999 100755
--- a/tools/arvbox/lib/arvbox/docker/service/vm/run
+++ b/tools/arvbox/lib/arvbox/docker/service/vm/run
@@ -16,8 +16,8 @@ cd /usr/src/arvados/services/login-sync
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
-export ARVADOS_VIRTUAL_MACHINE_UUID=$(cat /var/lib/arvados/vm-uuid)
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
+export ARVADOS_VIRTUAL_MACHINE_UUID=$(cat /var/lib/arvbox/vm-uuid)
while true ; do
arvados-login-sync
diff --git a/tools/arvbox/lib/arvbox/docker/service/vm/run-service b/tools/arvbox/lib/arvbox/docker/service/vm/run-service
index 932ba5981..a64a7b5b5 100755
--- a/tools/arvbox/lib/arvbox/docker/service/vm/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/vm/run-service
@@ -21,8 +21,8 @@ set -u
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
-export ARVADOS_VIRTUAL_MACHINE_UUID=$(cat /var/lib/arvados/vm-uuid)
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
+export ARVADOS_VIRTUAL_MACHINE_UUID=$(cat /var/lib/arvbox/vm-uuid)
set +e
read -rd $'\000' vm <<EOF
diff --git a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service b/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
index efa2e08a7..a5112be42 100755
--- a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
@@ -15,6 +15,6 @@ if test "$1" = "--only-deps" ; then
exit
fi
-/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
+/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvbox/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
exec /usr/local/lib/arvbox/runsu.sh /usr/local/bin/arvados-ws
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run b/tools/arvbox/lib/arvbox/docker/service/workbench/run
index e16349378..49cc7d742 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run
@@ -15,8 +15,8 @@ rm -rf tmp
mkdir tmp
chown arvbox:arvbox tmp
-if test -s /var/lib/arvados/workbench_rails_env ; then
- export RAILS_ENV=$(cat /var/lib/arvados/workbench_rails_env)
+if test -s /var/lib/arvbox/workbench_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvbox/workbench_rails_env)
else
export RAILS_ENV=development
fi
@@ -24,7 +24,7 @@ fi
if test "$1" != "--only-deps" ; then
openssl verify -CAfile $root_cert $server_cert
exec bundle exec passenger start --port=${services[workbench]} \
- --ssl --ssl-certificate=/var/lib/arvados/server-cert-${localip}.pem \
- --ssl-certificate-key=/var/lib/arvados/server-cert-${localip}.key \
+ --ssl --ssl-certificate=/var/lib/arvbox/server-cert-${localip}.pem \
+ --ssl-certificate-key=/var/lib/arvbox/server-cert-${localip}.key \
--user arvbox
fi
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 06742cf82..85962e770 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -10,8 +10,8 @@ set -ex -o pipefail
cd /usr/src/arvados/apps/workbench
-if test -s /var/lib/arvados/workbench_rails_env ; then
- export RAILS_ENV=$(cat /var/lib/arvados/workbench_rails_env)
+if test -s /var/lib/arvbox/workbench_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvbox/workbench_rails_env)
else
export RAILS_ENV=development
fi
@@ -35,7 +35,7 @@ fi
set -u
-secret_token=$(cat /var/lib/arvados/workbench_secret_token)
+secret_token=$(cat /var/lib/arvbox/workbench_secret_token)
if test -a /usr/src/arvados/apps/workbench/config/arvados_config.rb ; then
rm -f config/application.yml
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
index e3fbd22c4..a246fa74c 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench2/run-service
@@ -27,7 +27,7 @@ cat <<EOF > /usr/src/workbench2/public/config.json
EOF
export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
-export ARVADOS_API_TOKEN=$(cat /var/lib/arvados/superuser_token)
+export ARVADOS_API_TOKEN=$(cat /var/lib/arvbox/superuser_token)
url_prefix="https://$localip:${services[workbench2-ssl]}/"
diff --git a/tools/arvbox/lib/arvbox/docker/waitforpostgres.sh b/tools/arvbox/lib/arvbox/docker/waitforpostgres.sh
index 6bda618ab..f38a433d8 100755
--- a/tools/arvbox/lib/arvbox/docker/waitforpostgres.sh
+++ b/tools/arvbox/lib/arvbox/docker/waitforpostgres.sh
@@ -9,6 +9,6 @@ while ! psql postgres -c\\du >/dev/null 2>/dev/null ; do
sleep 1
done
-while ! test -s /var/lib/arvados/server-cert-${localip}.pem ; do
+while ! test -s /var/lib/arvbox/server-cert-${localip}.pem ; do
sleep 1
done
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list