Skip to content
This repository has been archived by the owner on Feb 12, 2021. It is now read-only.

Commit

Permalink
Revised HubDB volumes and config.env variables
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts committed Jul 29, 2015
1 parent 2e7b2c8 commit 0930dc3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ prod:
#########################

hubdb:
@ sudo mkdir -p $(PATH_MONGO)
@ sudo mkdir -p $(PATH_MONGO_DB) $(PATH_MONGO_DUMP)
@ $(call dockerize,hubdb,$(DOCKER_HUBDB_PRODUCTION))
@ sudo docker exec hubdb /app/mongodb_init.sh > /dev/null

Expand Down Expand Up @@ -442,7 +442,7 @@ define config_ep
# Add Hub to known_hosts and receive Endpoint's public key
#
sudo docker exec ep$1 ssh -p $(PORT_AUTOSSH) -o StrictHostKeyChecking=no autossh@$(URL_HUB) 2> /dev/null || true
sudo docker exec ep$1 /app/key_exchange.sh | sudo tee -a $(PATH_HUB_SSH_AUTOSSH)/authorized_keys > /dev/null
sudo docker exec ep$1 /app/key_exchange.sh | sudo tee -a $(PATH_HUB_AUTOSSH)/authorized_keys > /dev/null

# Add Endpoint to the HubDB
#
Expand Down
23 changes: 12 additions & 11 deletions config.env
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RELEASE_VERSION=0.1.1

# Hub external IP/Address (10.0.2.2 for Vagrant/VirtualBox)
#
URL_HUB=
URL_HUB=hub.pdc.io


# Notification addresses
Expand All @@ -26,9 +26,9 @@ [email protected]

# ownCloud backup details
#
OWNCLOUD_ID=
OWNCLOUD_PW=
OWNCLOUD_URL=
OWNCLOUD_ID=hub.pdc.io
OWNCLOUD_PW=<password>
OWNCLOUD_URL=<https://...>


# GitHub branch overrides
Expand Down Expand Up @@ -118,13 +118,14 @@ URL_DCLAPI=http://dclapi:3007

# Host data folders
#
PATH_HUB_AUTHKEYS=${PATH_HOST}/hub/etc/ssh
PATH_HUB_AUTOSSH=${PATH_HOST}/hub/home/autossh/DOTssh
PATH_HUB_AUTHKEYS=${PATH_HOST}/hub/etc/ssh/
PATH_HUB_AUTOSSH=${PATH_HOST}/hub/home/autossh/DOTssh/
PATH_EPX_AUTOSSH=${PATH_HOST}/epx/root/DOTssh/
PATH_CERT=${PATH_HOST}/cert
PATH_DACS=${PATH_HOST}/dacs
PATH_MONGO=${PATH_HOST}/mongo
PATH_DRUGREF=${PATH_HOST}/drugref
PATH_CERT=${PATH_HOST}/cert/
PATH_DACS=${PATH_HOST}/dacs/
PATH_MONGO_DB=${PATH_HOST}/mongo/db/
PATH_MONGO_DUMP=${PATH_HOST}/mongo/dump/
PATH_DRUGREF=${PATH_HOST}/drugref/


# DACS
Expand Down Expand Up @@ -153,7 +154,7 @@ DOCKER_HAPI_DEV_APPEND=-p ${PORT_HAPI}:${PORT_HAPI}
DOCKER_HUB_PRODUCTION=--link hubdb:hubdb -v ${PATH_HUB_AUTOSSH}:/home/autossh/.ssh/:rw -v ${PATH_HUB_AUTHKEYS}:/etc/ssh/:rw -p ${PORT_AUTOSSH}:22 -p ${PORT_HUB_WEB}:3002
DOCKER_HUB_DEV_APPEND=
#
DOCKER_HUBDB_PRODUCTION=-v ${PATH_MONGO}:/data/:rw
DOCKER_HUBDB_PRODUCTION=-v ${PATH_MONGO_DB}:/data/db/:rw -v ${PATH_MONGO_DUMP}:/data/dump/:rw
DOCKER_HUBDB_DEV_APPEND=-p ${PORT_MONGO}:27017
#
DOCKER_QI_PRODUCTION=--link hubdb:hubdb
Expand Down

0 comments on commit 0930dc3

Please sign in to comment.