[ARVADOS-DEV] updated: 487aeb0d3e2263edc777f3f5451fa05f5f071285
git at public.curoverse.com
git at public.curoverse.com
Fri Jan 22 16:40:04 EST 2016
Summary of changes:
arvbox/README.md | 112 ++++++
arvbox/bin/arvbox | 377 +++++++++++++++++++++
arvbox/lib/arvbox/docker/Dockerfile.base | 33 ++
arvbox/lib/arvbox/docker/Dockerfile.demo | 14 +
arvbox/lib/arvbox/docker/Dockerfile.dev | 13 +
arvbox/lib/arvbox/docker/common.sh | 62 ++++
arvbox/lib/arvbox/docker/createusers.sh | 42 +++
arvbox/lib/arvbox/docker/crunch-setup.sh | 28 ++
arvbox/lib/arvbox/docker/fuse.conf | 1 +
arvbox/lib/arvbox/docker/gitolite.rc | 213 ++++++++++++
arvbox/lib/arvbox/docker/keep-setup.sh | 51 +++
arvbox/lib/arvbox/docker/logger | 2 +
arvbox/lib/arvbox/docker/runit-docker/.gitignore | 32 ++
arvbox/lib/arvbox/docker/runit-docker/LICENSE | 28 ++
arvbox/lib/arvbox/docker/runit-docker/Makefile | 18 +
arvbox/lib/arvbox/docker/runit-docker/README.md | 24 ++
.../arvbox/docker/runit-docker/debian/changelog | 12 +
.../lib/arvbox/docker/runit-docker/debian/compat | 1 +
.../lib/arvbox/docker/runit-docker/debian/control | 14 +
.../arvbox/docker/runit-docker/debian/copyright | 31 ++
arvbox/lib/arvbox/docker/runit-docker/debian/docs | 1 +
arvbox/lib/arvbox/docker/runit-docker/debian/rules | 32 ++
.../docker/runit-docker/debian/source/format | 1 +
arvbox/lib/arvbox/docker/runit-docker/runit-docker | 4 +
.../lib/arvbox/docker/runit-docker/runit-docker.c | 32 ++
arvbox/lib/arvbox/docker/runsu.sh | 14 +
.../arvbox/docker/service/api/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/api/log/run | 1 +
arvbox/lib/arvbox/docker/service/api/run | 1 +
arvbox/lib/arvbox/docker/service/api/run-service | 100 ++++++
.../docker/service/arv-git-httpd/log/main/.gitstub | 0
.../arvbox/docker/service/arv-git-httpd/log/run | 1 +
arvbox/lib/arvbox/docker/service/arv-git-httpd/run | 1 +
.../docker/service/arv-git-httpd/run-service | 27 ++
.../service/crunch-dispatch0/log/main/.gitstub | 0
.../arvbox/docker/service/crunch-dispatch0/log/run | 1 +
.../lib/arvbox/docker/service/crunch-dispatch0/run | 1 +
.../docker/service/crunch-dispatch0/run-service | 2 +
.../service/crunch-dispatch1/log/main/.gitstub | 0
.../arvbox/docker/service/crunch-dispatch1/log/run | 1 +
.../lib/arvbox/docker/service/crunch-dispatch1/run | 1 +
.../docker/service/crunch-dispatch1/run-service | 3 +
.../arvbox/docker/service/doc/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/doc/log/run | 1 +
arvbox/lib/arvbox/docker/service/doc/run | 1 +
arvbox/lib/arvbox/docker/service/doc/run-service | 41 +++
.../arvbox/docker/service/docker/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/docker/log/run | 1 +
arvbox/lib/arvbox/docker/service/docker/run | 102 ++++++
.../docker/service/gitolite/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/gitolite/log/run | 1 +
arvbox/lib/arvbox/docker/service/gitolite/run | 1 +
.../lib/arvbox/docker/service/gitolite/run-service | 116 +++++++
.../docker/service/keep-web/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/keep-web/log/run | 1 +
arvbox/lib/arvbox/docker/service/keep-web/run | 1 +
.../lib/arvbox/docker/service/keep-web/run-service | 21 ++
.../docker/service/keepproxy/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/keepproxy/log/run | 1 +
arvbox/lib/arvbox/docker/service/keepproxy/run | 1 +
.../arvbox/docker/service/keepproxy/run-service | 41 +++
.../docker/service/keepstore0/log/main/.gitstub | 0
.../lib/arvbox/docker/service/keepstore0/log/run | 1 +
arvbox/lib/arvbox/docker/service/keepstore0/run | 1 +
.../arvbox/docker/service/keepstore0/run-service | 3 +
.../docker/service/keepstore1/log/main/.gitstub | 0
.../lib/arvbox/docker/service/keepstore1/log/run | 1 +
arvbox/lib/arvbox/docker/service/keepstore1/run | 1 +
.../arvbox/docker/service/keepstore1/run-service | 3 +
.../docker/service/postgres/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/postgres/log/run | 1 +
arvbox/lib/arvbox/docker/service/postgres/run | 12 +
.../lib/arvbox/docker/service/postgres/run-service | 14 +
arvbox/lib/arvbox/docker/service/ready/run | 1 +
arvbox/lib/arvbox/docker/service/ready/run-service | 96 ++++++
.../arvbox/docker/service/sdk/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/sdk/log/run | 1 +
arvbox/lib/arvbox/docker/service/sdk/run | 5 +
arvbox/lib/arvbox/docker/service/sdk/run-service | 24 ++
.../arvbox/docker/service/ssh/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/ssh/log/run | 1 +
arvbox/lib/arvbox/docker/service/ssh/run | 10 +
.../arvbox/docker/service/sso/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/sso/log/run | 1 +
arvbox/lib/arvbox/docker/service/sso/run | 1 +
arvbox/lib/arvbox/docker/service/sso/run-service | 85 +++++
.../lib/arvbox/docker/service/vm/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/vm/log/run | 1 +
arvbox/lib/arvbox/docker/service/vm/run | 9 +
arvbox/lib/arvbox/docker/service/vm/run-service | 41 +++
.../docker/service/workbench/log/main/.gitstub | 0
arvbox/lib/arvbox/docker/service/workbench/log/run | 1 +
arvbox/lib/arvbox/docker/service/workbench/run | 15 +
.../arvbox/docker/service/workbench/run-service | 38 +++
arvbox/lib/arvbox/docker/tests-service/docker | 1 +
arvbox/lib/arvbox/docker/tests-service/logger | 1 +
arvbox/lib/arvbox/docker/tests-service/postgres | 1 +
arvbox/lib/arvbox/docker/tests-service/runsu.sh | 1 +
arvbox/lib/arvbox/docker/waitforpostgres.sh | 4 +
jenkins/common-test-packages.sh | 28 --
jenkins/deb-common-test-packages.sh | 27 --
jenkins/libcloud-pin | 2 +-
.../.gitignore | 0
.../Makefile | 0
.../README | 0
.../build-all-build-containers.sh | 0
.../centos6/Dockerfile | 7 +
.../debian7/Dockerfile | 0
.../debian8/Dockerfile | 0
.../ubuntu1204/Dockerfile | 0
.../ubuntu1404/Dockerfile | 0
.../package-test-dockerfiles/centos6/Dockerfile | 16 +-
.../package-test-dockerfiles/debian7/Dockerfile | 7 +
.../package-test-dockerfiles/debian8/Dockerfile | 9 +-
.../package-test-dockerfiles/ubuntu1204/Dockerfile | 7 +
.../package-test-dockerfiles/ubuntu1404/Dockerfile | 7 +
jenkins/package-testing/common-test-packages.sh | 28 ++
.../package-testing/deb-common-test-packages.sh | 37 ++
.../test-package-arvados-api-server.sh | 20 ++
.../test-package-arvados-node-manager.sh | 7 +
.../test-package-arvados-sso-server.sh | 172 ++++++++++
.../test-package-arvados-workbench.sh | 20 ++
.../test-package-python27-python-arvados-fuse.sh | 6 +
...ackage-python27-python-arvados-python-client.sh | 6 +
jenkins/package-testing/test-packages-centos6.sh | 44 +++
.../{ => package-testing}/test-packages-debian7.sh | 0
.../{ => package-testing}/test-packages-debian8.sh | 0
.../test-packages-ubuntu1204.sh | 0
.../test-packages-ubuntu1404.sh | 0
jenkins/rails-package-scripts/README.md | 1 +
.../rails-package-scripts/arvados-api-server.sh | 20 ++
jenkins/rails-package-scripts/postinst.sh | 21 +-
jenkins/rails-package-scripts/step2.sh | 3 +
jenkins/run-build-packages-all-targets.sh | 20 +-
jenkins/run-build-packages-one-target.sh | 74 +++-
jenkins/run-build-packages-sso.sh | 48 +--
jenkins/run-build-packages.sh | 4 -
jenkins/run-library.sh | 29 +-
jenkins/run-test-packages-sso.sh | 293 ----------------
jenkins/run-tests.sh | 3 +
jenkins/test-packages-centos6.sh | 25 --
141 files changed, 2573 insertions(+), 455 deletions(-)
create mode 100644 arvbox/README.md
create mode 100755 arvbox/bin/arvbox
create mode 100644 arvbox/lib/arvbox/docker/Dockerfile.base
create mode 100644 arvbox/lib/arvbox/docker/Dockerfile.demo
create mode 100644 arvbox/lib/arvbox/docker/Dockerfile.dev
create mode 100644 arvbox/lib/arvbox/docker/common.sh
create mode 100755 arvbox/lib/arvbox/docker/createusers.sh
create mode 100755 arvbox/lib/arvbox/docker/crunch-setup.sh
create mode 100644 arvbox/lib/arvbox/docker/fuse.conf
create mode 100644 arvbox/lib/arvbox/docker/gitolite.rc
create mode 100755 arvbox/lib/arvbox/docker/keep-setup.sh
create mode 100755 arvbox/lib/arvbox/docker/logger
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/.gitignore
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/LICENSE
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/Makefile
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/README.md
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/debian/changelog
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/debian/compat
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/debian/control
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/debian/copyright
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/debian/docs
create mode 100755 arvbox/lib/arvbox/docker/runit-docker/debian/rules
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/debian/source/format
create mode 100755 arvbox/lib/arvbox/docker/runit-docker/runit-docker
create mode 100644 arvbox/lib/arvbox/docker/runit-docker/runit-docker.c
create mode 100755 arvbox/lib/arvbox/docker/runsu.sh
create mode 100644 arvbox/lib/arvbox/docker/service/api/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/api/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/api/run
create mode 100755 arvbox/lib/arvbox/docker/service/api/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/arv-git-httpd/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/arv-git-httpd/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/arv-git-httpd/run
create mode 100755 arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/crunch-dispatch0/run
create mode 100755 arvbox/lib/arvbox/docker/service/crunch-dispatch0/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/crunch-dispatch1/run
create mode 100755 arvbox/lib/arvbox/docker/service/crunch-dispatch1/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/doc/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/doc/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/doc/run
create mode 100755 arvbox/lib/arvbox/docker/service/doc/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/docker/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/docker/log/run
create mode 100755 arvbox/lib/arvbox/docker/service/docker/run
create mode 100644 arvbox/lib/arvbox/docker/service/gitolite/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/gitolite/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/gitolite/run
create mode 100755 arvbox/lib/arvbox/docker/service/gitolite/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/keep-web/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/keep-web/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/keep-web/run
create mode 100755 arvbox/lib/arvbox/docker/service/keep-web/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/keepproxy/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/keepproxy/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/keepproxy/run
create mode 100755 arvbox/lib/arvbox/docker/service/keepproxy/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/keepstore0/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/keepstore0/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/keepstore0/run
create mode 100755 arvbox/lib/arvbox/docker/service/keepstore0/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/keepstore1/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/keepstore1/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/keepstore1/run
create mode 100755 arvbox/lib/arvbox/docker/service/keepstore1/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/postgres/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/postgres/log/run
create mode 100755 arvbox/lib/arvbox/docker/service/postgres/run
create mode 100755 arvbox/lib/arvbox/docker/service/postgres/run-service
create mode 120000 arvbox/lib/arvbox/docker/service/ready/run
create mode 100755 arvbox/lib/arvbox/docker/service/ready/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/sdk/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/sdk/log/run
create mode 100755 arvbox/lib/arvbox/docker/service/sdk/run
create mode 100755 arvbox/lib/arvbox/docker/service/sdk/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/ssh/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/ssh/log/run
create mode 100755 arvbox/lib/arvbox/docker/service/ssh/run
create mode 100644 arvbox/lib/arvbox/docker/service/sso/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/sso/log/run
create mode 120000 arvbox/lib/arvbox/docker/service/sso/run
create mode 100755 arvbox/lib/arvbox/docker/service/sso/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/vm/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/vm/log/run
create mode 100755 arvbox/lib/arvbox/docker/service/vm/run
create mode 100755 arvbox/lib/arvbox/docker/service/vm/run-service
create mode 100644 arvbox/lib/arvbox/docker/service/workbench/log/main/.gitstub
create mode 120000 arvbox/lib/arvbox/docker/service/workbench/log/run
create mode 100755 arvbox/lib/arvbox/docker/service/workbench/run
create mode 100755 arvbox/lib/arvbox/docker/service/workbench/run-service
create mode 120000 arvbox/lib/arvbox/docker/tests-service/docker
create mode 120000 arvbox/lib/arvbox/docker/tests-service/logger
create mode 120000 arvbox/lib/arvbox/docker/tests-service/postgres
create mode 120000 arvbox/lib/arvbox/docker/tests-service/runsu.sh
create mode 100755 arvbox/lib/arvbox/docker/waitforpostgres.sh
delete mode 100755 jenkins/common-test-packages.sh
delete mode 100755 jenkins/deb-common-test-packages.sh
rename jenkins/{dockerfiles => package-build-dockerfiles}/.gitignore (100%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/Makefile (100%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/README (100%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/build-all-build-containers.sh (100%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/centos6/Dockerfile (80%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/debian7/Dockerfile (100%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/debian8/Dockerfile (100%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/ubuntu1204/Dockerfile (100%)
rename jenkins/{dockerfiles => package-build-dockerfiles}/ubuntu1404/Dockerfile (100%)
create mode 100755 jenkins/package-testing/common-test-packages.sh
create mode 100755 jenkins/package-testing/deb-common-test-packages.sh
create mode 100755 jenkins/package-testing/test-package-arvados-api-server.sh
create mode 100755 jenkins/package-testing/test-package-arvados-node-manager.sh
create mode 100755 jenkins/package-testing/test-package-arvados-sso-server.sh
create mode 100755 jenkins/package-testing/test-package-arvados-workbench.sh
create mode 100755 jenkins/package-testing/test-package-python27-python-arvados-fuse.sh
create mode 100755 jenkins/package-testing/test-package-python27-python-arvados-python-client.sh
create mode 100755 jenkins/package-testing/test-packages-centos6.sh
rename jenkins/{ => package-testing}/test-packages-debian7.sh (100%)
rename jenkins/{ => package-testing}/test-packages-debian8.sh (100%)
rename jenkins/{ => package-testing}/test-packages-ubuntu1204.sh (100%)
rename jenkins/{ => package-testing}/test-packages-ubuntu1404.sh (100%)
delete mode 100755 jenkins/run-test-packages-sso.sh
delete mode 100755 jenkins/test-packages-centos6.sh
via 487aeb0d3e2263edc777f3f5451fa05f5f071285 (commit)
via 18fb92535f505e30b86c50e1c58eaf93c0179412 (commit)
via 43b16e43f7f2558bc619f3611ee4b96fb74b5e05 (commit)
via e9043f6d8de8ca8c928b0097e39b1695a26ffb2b (commit)
via 575d7f1fd77f66448df49c341a59baef6b3b5ef9 (commit)
via a8c09e00f06c51887497b94b98178b2815e149e2 (commit)
via 7512b31d3c7e3ae890a37b2222f113c9b351d86a (commit)
via 7f05c28c4ac0ddffdf9e13bfc104bc60f7195174 (commit)
via 06b0b75584e41e90aa635b6d833936343075c132 (commit)
via 7b2fd8f0c85a013df886e881d5d97aebf4890169 (commit)
via 026d70487631662d1b0ccf8f66fbef71b9be40d6 (commit)
via 22e538ac7ece05cbfc32b2dfb463f3fb955d7f61 (commit)
via fe5164555b117d5c9c538905c495192adad0b815 (commit)
via b408ce71a9caddea144fd7d90aa166c9cb16e715 (commit)
via 846a9311a328b9cbadc8b70d34134b72b0b6b332 (commit)
via f44f65a25c1d505e7faa9e26351525c10bb2cbbd (commit)
via a956a49875fc484c2c237aec228a92f8ce5b0f06 (commit)
via f84fd5c8f2292a41bbb4cd762dbedab09adbf784 (commit)
via 2fe4a6a068e720e72b1695de133b4363e9a69a40 (commit)
via ebdbb0bb23ceb1d1373472e6405fa2293f51616b (commit)
via 60d3fdf6dedff3cb9eca478caacfeee19a752812 (commit)
via ffd741be7af1eca4c11884a3e8aa6630be25de2d (commit)
via c9e5a801bb72c20b6c56e0b88e78ea5626fb6497 (commit)
from 5cc977da78b718596faa9ad0352b7c14402f90fa (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 487aeb0d3e2263edc777f3f5451fa05f5f071285
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri Jan 22 16:39:23 2016 -0500
Some review fixes.
closes #8066
diff --git a/jenkins/rails-package-scripts/README.md b/jenkins/rails-package-scripts/README.md
index 6779fb4..3a93c31 100644
--- a/jenkins/rails-package-scripts/README.md
+++ b/jenkins/rails-package-scripts/README.md
@@ -9,5 +9,6 @@ Since our build process is a tower of shell scripts, concatenating files seemed
postinst.sh lets the early parts define a few hooks to control behavior:
* After it installs the core configuration files (database.yml, application.yml, and production.rb) to /etc/arvados/server, it calls setup_extra_conffiles. By default this is a noop function (in step2.sh). API server defines this to set up the old omniauth.rb conffile.
+* Before it restarts nginx, it calls setup_before_nginx_restart. By default this is a noop function (in step2.sh). API server defines this to set up the internal git repository, if necessary.
* $RAILSPKG_DATABASE_LOAD_TASK defines the Rake task to load the database. API server uses db:structure:load. SSO server uses db:schema:load. Workbench doesn't set this, which causes the postinst to skip all database work.
* If $RAILSPKG_SUPPORTS_CONFIG_CHECK != 1, it won't run the config:check rake task. SSO clears this flag (it doesn't have that task code).
diff --git a/jenkins/rails-package-scripts/arvados-api-server.sh b/jenkins/rails-package-scripts/arvados-api-server.sh
index 4df87eb..c2b99f0 100644
--- a/jenkins/rails-package-scripts/arvados-api-server.sh
+++ b/jenkins/rails-package-scripts/arvados-api-server.sh
@@ -10,3 +10,23 @@ RAILSPKG_DATABASE_LOAD_TASK=db:structure:load
setup_extra_conffiles() {
setup_conffile initializers/omniauth.rb
}
+
+setup_before_nginx_restart() {
+ # initialize git_internal_dir
+ # usually /var/lib/arvados/internal.git (set in application.default.yml )
+ if [ "$APPLICATION_READY" = "1" ]; then
+ GIT_INTERNAL_DIR=$($COMMAND_PREFIX bundle exec rake config:check 2>&1 | grep git_internal_dir | awk '{ print $2 }')
+ if [ ! -e "$GIT_INTERNAL_DIR" ]; then
+ run_and_report "Creating git_internal_dir '$GIT_INTERNAL_DIR'" \
+ mkdir -p "$GIT_INTERNAL_DIR"
+ run_and_report "Initializing git_internal_dir '$GIT_INTERNAL_DIR'" \
+ git init --quiet --bare $GIT_INTERNAL_DIR
+ else
+ echo "Initializing git_internal_dir $GIT_INTERNAL_DIR: directory exists, skipped."
+ fi
+ run_and_report "Making sure '$GIT_INTERNAL_DIR' has the right permission" \
+ chown -R "$WWW_OWNER:" "$GIT_INTERNAL_DIR"
+ else
+ echo "Initializing git_internal_dir... skipped."
+ fi
+}
diff --git a/jenkins/rails-package-scripts/postinst.sh b/jenkins/rails-package-scripts/postinst.sh
index 69d6316..5ff2a9b 100644
--- a/jenkins/rails-package-scripts/postinst.sh
+++ b/jenkins/rails-package-scripts/postinst.sh
@@ -220,23 +220,6 @@ configure_version() {
$COMMAND_PREFIX bundle exec rake config:check || APPLICATION_READY=0
fi
- # initialize git_internal_dir
- # usually /var/lib/arvados/internal.git (set in application.default.yml )
- if [ "$APPLICATION_READY" = "1" ]; then
- GIT_INTERNAL_DIR=$($COMMAND_PREFIX bundle exec rake config:check 2>&1 | grep git_internal_dir | awk '{ print $2 }')
- if [ -e "$GIT_INTERNAL_DIR" ]
- then
- run_and_report "Creating and initializing git_internal_dir '$GIT_INTERNAL_DIR'" \
- mkdir -p "$GIT_INTERNAL_DIR" && \
- chown "$WWW_OWNER:" "$GIT_INTERNAL_DIR" && \
- su -c "git init --bare $GIT_INTERNAL_DIR" "$WWW_OWNER:"
- fi
- run_and_report "Making sure '$GIT_INTERNAL_DIR' has the right permission" \
- chown -R "$WWW_OWNER:" "$GIT_INTERNAL_DIR"
- else
- echo "Initializing git_internal_dir... skipped."
- fi
-
# precompile assets; thankfully this does not take long
if [ "$APPLICATION_READY" = "1" ]; then
run_and_report "Precompiling assets" \
@@ -247,6 +230,8 @@ configure_version() {
fi
chown -R "$WWW_OWNER:" $RELEASE_PATH/tmp
+ setup_before_nginx_restart
+
if [ ! -z "$WEB_SERVICE" ]; then
service "$WEB_SERVICE" restart
fi
diff --git a/jenkins/rails-package-scripts/step2.sh b/jenkins/rails-package-scripts/step2.sh
index 6678d49..816b906 100644
--- a/jenkins/rails-package-scripts/step2.sh
+++ b/jenkins/rails-package-scripts/step2.sh
@@ -23,3 +23,6 @@ RAILSPKG_SUPPORTS_CONFIG_CHECK=${RAILSPKG_SUPPORTS_CONFIG_CHECK:-1}
if ! type setup_extra_conffiles >/dev/null 2>&1; then
setup_extra_conffiles() { return; }
fi
+if ! type setup_before_nginx_restart >/dev/null 2>&1; then
+ setup_before_nginx_restart() { return; }
+fi
commit 18fb92535f505e30b86c50e1c58eaf93c0179412
Merge: 5cc977d 43b16e4
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri Jan 22 16:21:23 2016 -0500
Merge branch 'master' into 8066-git-init-from-postinst
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list