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

Commit 9cb8788

Browse files
DerekRobertsDerekRoberts
committed
Added notification email to .env, moved MongoDB dumps to HubDB
1 parent 5f8729b commit 9cb8788

File tree

2 files changed

+46
-58
lines changed

2 files changed

+46
-58
lines changed

‎Makefile‎

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -94,31 +94,30 @@ prod:
9494
#########################
9595

9696
hubdb:
97-
@ sudo mkdir -p $(PATH_HOST)/mongo/
98-
@ sudo mkdir -p ${PATH_HOST}/mongo_dump/
97+
@ sudo mkdir -p $(PATH_MONGO)
9998
@ $(call dockerize,hubdb,$(DOCKER_HUBDB_PRODUCTION))
10099
@ sudo docker exec hubdb /app/mongodb_init.sh > /dev/null
101100

102101

103102
hub:
104-
@ sudo mkdir -p $(PATH_HOST)/keys/hub_authorized/
105-
@ sudo mkdir -p $(PATH_HOST)/keys/hub_ssh/
103+
@ sudo mkdir -p $(PATH_HUB_SSH_HOST) $(PATH_HUB_SSH_AUTOSSH)
106104
@ $(call dockerize,hub,$(DOCKER_HUB_PRODUCTION))
107105
@ if [ $(BUILD_MODE) != prod ]; \
108106
then \
109107
$(MAKE) ep-sample; \
110108
$(MAKE) queries; \
111109
fi
112110

111+
113112
auth:
114-
@ sudo mkdir -p $(PATH_HOST)/dacs/
113+
@ sudo mkdir -p $(PATH_DACS)
115114
@ $(call dockerize,auth,$(DOCKER_AUTH_PRODUCTION))
116115

117116

118117
dclapi:
119-
@ sudo mkdir -p $(PATH_HOST)/drugref/
120-
@ sudo test -s $(PATH_HOST)/drugref/dcl.sqlite || \
121-
sudo cp build/dclapi/drugref/dcl.sqlite $(PATH_HOST)/drugref/
118+
@ sudo mkdir -p $(PATH_DRUGREF)
119+
@ sudo test -s $(PATH_DRUGREF)/dcl.sqlite || \
120+
sudo cp build/dclapi/drugref/dcl.sqlite $(PATH_DRUGREF)
122121
@ $(call dockerize,dclapi,$(DOCKER_DCLAPI_PRODUCTION))
123122

124123

@@ -127,12 +126,12 @@ hapi:
127126

128127

129128
viz:
130-
@ sudo mkdir -p $(PATH_HOST)/cert/
131-
@ [ -f ./cert/server.crt -a ! -f $(PATH_HOST)/cert/server.crt ]&& \
132-
sudo cp ./cert/server.crt $(PATH_HOST)/cert/ || \
129+
@ sudo mkdir -p $(PATH_CERT)
130+
@ [ -f ./cert/server.crt -a ! -f $(PATH_CERT)/server.crt ]&& \
131+
sudo cp ./cert/server.crt $(PATH_CERT) || \
133132
true
134-
@ [ -f ./cert/server.key -a ! -f $(PATH_HOST)/cert/server.crt ]|| \
135-
sudo cp ./cert/server.key $(PATH_HOST)/cert/ || \
133+
@ [ -f ./cert/server.key -a ! -f $(PATH_CERT)/server.crt ]|| \
134+
sudo cp ./cert/server.key $(PATH_CERT) || \
136135
true
137136
@ $(call dockerize,viz,$(DOCKER_VIZ_PRODUCTION))
138137

@@ -185,18 +184,18 @@ ep-rm:
185184

186185

187186
ep-cloud:
188-
@ sudo mkdir -p $(PATH_KEYS_EP_CLOUD)
189-
@ if [ ! -e $(PATH_KEYS_EP_CLOUD) ]; \
187+
@ sudo mkdir -p $(PATH_HUB_SSH_AUTOSSH)
188+
@ if [ ! -e $(PATH_HUB_SSH_AUTOSSH) ]; \
190189
then \
191-
sudo cp id_rsa.pub id_rsa known_hosts $(PATH_KEYS_EP_CLOUD); \
192-
sudo chown root $(PATH_KEYS_EP_CLOUD)/*; \
190+
sudo cp id_rsa.pub id_rsa known_hosts $(PATH_HUB_SSH_AUTOSSH); \
191+
sudo chown root $(PATH_HUB_SSH_AUTOSSH)/*; \
193192
fi
194193
@ echo
195194
@ echo "Please enter a gatewayID (####) to run: "; \
196195
read gID; \
197196
NAME=pdc-$${gID}; \
198197
PORT=`expr 40000 + $${gID}`; \
199-
sudo docker run -dt --name $${NAME} -h $${NAME} -e gID=$${gID} --env-file=config.env --restart='always' -p $${PORT}:3001 -v $(PATH_KEYS_EP_CLOUD):/root/.ssh/:ro pdc.io/endpoint; \
198+
sudo docker run -dt --name $${NAME} -h $${NAME} -e gID=$${gID} --env-file=config.env --restart='always' -p $${PORT}:3001 -v $(PATH_HUB_SSH_AUTOSSH):/root/.ssh/:ro pdc.io/endpoint; \
200199
sudo docker exec $${NAME} /app/key_exchange.sh
201200

202201

@@ -239,7 +238,6 @@ mode-inform:
239238
@ echo "Environment complete"
240239
@ echo " - mode: $(BUILD_MODE)"
241240
@ echo
242-
@ echo
243241
@ echo "Enjoy!"
244242
@ echo
245243
@ echo "..."
@@ -298,28 +296,11 @@ config-packages:
298296
sudo modprobe aufs; \
299297
wget -qO- https://get.docker.com/ | sh; \
300298
)
301-
@ for a in \
302-
curl \
303-
lynx; \
304-
do \
305-
( dpkg -l | grep -w $${a} )|| sudo apt-get install -y $${a}; \
306-
done; \
307299

308300

309301
config-mongodb:
310302
@ ( echo never | sudo tee /sys/kernel/mm/transparent_hugepage/enabled )> /dev/null
311303
@ ( echo never | sudo tee /sys/kernel/mm/transparent_hugepage/defrag )> /dev/null
312-
@ if(! grep --quiet 'mongodb_dump.sh' /var/spool/cron/crontabs/root ); \
313-
then \
314-
( \
315-
echo ''; \
316-
echo '# Dump MongoDB for backup'; \
317-
echo '#'; \
318-
echo '15 3 * * * docker exec hubdb /app/mongodb_dump.sh'; \
319-
echo '15 11 * * * docker exec hubdb /app/mongodb_dump.sh'; \
320-
echo '15 19 * * * docker exec hubdb /app/mongodb_dump.sh'; \
321-
) | tee -a /var/spool/crontabs/root; \
322-
fi
323304

324305

325306
config-bash:
@@ -362,9 +343,9 @@ config-bash:
362343
config-oc:
363344
# Add repository and install owncloud cmd client
364345
#
365-
@ echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_14.10/ /' \
346+
@ echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_14.04/ /' \
366347
| sudo tee /etc/apt/sources.list.d/owncloud-client.list
367-
@ wget -qO- http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_14.10/Release.key \
348+
@ wget -qO- http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_14.04/Release.key \
368349
| sudo apt-key add -
369350
@ sudo apt-get update
370351
@ sudo apt-get install -y owncloud-client
@@ -392,10 +373,10 @@ config-oc:
392373
echo '#'; \
393374
echo 'sudo mkdir -p mongo_partial/'; \
394375
echo 'FROM=$\${PATH_HOST}'; \
395-
echo 'sudo cp mongo_dump/query_composer_development/delayed* mongo_partial/'; \
396-
echo 'sudo cp mongo_dump/query_composer_development/endpoints* mongo_partial/'; \
397-
echo 'sudo cp mongo_dump/query_composer_development/system* mongo_partial/'; \
398-
echo 'sudo cp mongo_dump/query_composer_development/users* mongo_partial/'; \
376+
echo 'sudo cp mongo/dump/query_composer_development/delayed* mongo_partial/'; \
377+
echo 'sudo cp mongo/dump/query_composer_development/endpoints* mongo_partial/'; \
378+
echo 'sudo cp mongo/dump/query_composer_development/system* mongo_partial/'; \
379+
echo 'sudo cp mongo/dump/query_composer_development/users* mongo_partial/'; \
399380
echo ''; \
400381
echo ''; \
401382
echo '# Backup cert, dacs, drugref, keys and mongo_partial folders to ownCloud'; \
@@ -410,7 +391,8 @@ config-oc:
410391
echo ' cert \\'; \
411392
echo ' dacs \\'; \
412393
echo ' drugref \\'; \
413-
echo ' keys \\'; \
394+
echo ' epx \\'; \
395+
echo ' hub \\'; \
414396
echo ' mongo_partial \\'; \
415397
echo ' recovery;'; \
416398
echo 'do'; \
@@ -420,6 +402,11 @@ config-oc:
420402
sudo chmod 700 \${PATH_HOST}/oc_backup.sh; \
421403
fi
422404

405+
406+
PATH_EPX_SSH_AUTOSSH=${PATH_HOST}/epx/cloud_shared
407+
408+
409+
423410
@ # Add script to cron
424411
@ #
425412
@ if((! sudo test -e /var/spool/cron/crontabs/root )||(! sudo grep --quiet 'oc_backup.sh' /var/spool/cron/crontabs/root )); \
@@ -517,7 +504,7 @@ define config_ep
517504
# Add Hub to known_hosts and receive Endpoint's public key
518505
#
519506
sudo docker exec ep$1 ssh -p $(PORT_AUTOSSH) -o StrictHostKeyChecking=no autossh@$(URL_HUB) 2> /dev/null || true
520-
sudo docker exec ep$1 /app/key_exchange.sh | sudo tee -a $(PATH_KEYS_HUB_AUTH)/authorized_keys > /dev/null
507+
sudo docker exec ep$1 /app/key_exchange.sh | sudo tee -a $(PATH_HUB_SSH_AUTOSSH)/authorized_keys > /dev/null
521508

522509
# Add Endpoint to the HubDB
523510
#

‎config.env‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ RELEASE_VERSION=0.1.1
1616

1717
# Hub external IP/Address (10.0.2.2 for Vagrant/VirtualBox)
1818
#
19-
URL_HUB=hub.pdc.io
19+
URL_HUB=10.0.2.2
20+
21+
22+
# Notification addresses
23+
#
24+
EMAIL_ERRORS=errors@pdc.io
2025

2126

2227
# ownCloud backup details
@@ -112,14 +117,13 @@ URL_DCLAPI=http://dclapi:3007
112117

113118
# Host data folders
114119
#
115-
PATH_KEYS_HUB_SSH=${PATH_HOST}/keys/hub_ssh
116-
PATH_KEYS_HUB_AUTH=${PATH_HOST}/keys/hub_authorized
117-
PATH_KEYS_EP_CLOUD=${PATH_HOST}/keys/cloud_shared
118-
PATH_CERT=${PATH_HOST}/cert/
119-
PATH_DACS=${PATH_HOST}/dacs/
120-
PATH_MONGO=${PATH_HOST}/mongo/
121-
PATH_MONGO_DUMP=${PATH_HOST}/mongo_dump/
122-
PATH_DRUGREF=${PATH_HOST}/drugref/
120+
PATH_HUB_SSH_HOST=${PATH_HOST}/hub/etc/ssh
121+
PATH_HUB_SSH_AUTOSSH=${PATH_HOST}/hub/home/autossh/DOTssh
122+
PATH_EPX_SSH_AUTOSSH=${PATH_HOST}/epx/cloud_shared
123+
PATH_CERT=${PATH_HOST}/cert
124+
PATH_DACS=${PATH_HOST}/dacs
125+
PATH_MONGO=${PATH_HOST}/mongo
126+
PATH_DRUGREF=${PATH_HOST}/drugref
123127

124128

125129
# DACS
@@ -137,19 +141,16 @@ DOCKER_AUTH_DEV_APPEND=-p ${PORT_AUTH_M}:${PORT_AUTH_M} -p ${PORT_AUTH_C}:${PORT
137141
DOCKER_DCLAPI_PRODUCTION=-v ${PATH_DRUGREF}:/app/drugref/
138142
DOCKER_DCLAPI_DEV_APPEND=-p ${PORT_DACS}:${PORT_DACS}
139143
#
140-
DOCKER_ENDPOINT_DB_PRODUCTION=
141-
DOCKER_ENDPOINT_DB_DEV_APPEND=
142-
#
143144
DOCKER_ENDPOINT_PRODUCTION=
144145
DOCKER_ENDPOINT_DEV_APPEND=
145146
#
146147
DOCKER_HAPI_PRODUCTION=--link auth:auth --link hubdb:hubdb --link dclapi:dclapi
147148
DOCKER_HAPI_DEV_APPEND=-p ${PORT_HAPI}:${PORT_HAPI}
148149
#
149-
DOCKER_HUB_PRODUCTION=--link hubdb:hubdb -v ${PATH_KEYS_HUB_AUTH}:/home/autossh/.ssh/:rw -v ${PATH_KEYS_HUB_SSH}:/etc/ssh/:rw -p ${PORT_AUTOSSH}:22 -p ${PORT_HUB_WEB}:3002
150+
DOCKER_HUB_PRODUCTION=--link hubdb:hubdb -v ${PATH_HUB_SSH_AUTOSSH}:/home/autossh/.ssh/:rw -v ${PATH_HUB_SSH_HOST}:/etc/ssh/:rw -p ${PORT_AUTOSSH}:22 -p ${PORT_HUB_WEB}:3002
150151
DOCKER_HUB_DEV_APPEND=
151152
#
152-
DOCKER_HUBDB_PRODUCTION=-v ${PATH_MONGO}:/data/db/:rw -v ${PATH_MONGO_DUMP}:/data/dump/:rw
153+
DOCKER_HUBDB_PRODUCTION=-v ${PATH_MONGO}:/data/:rw
153154
DOCKER_HUBDB_DEV_APPEND=-p ${PORT_MONGO}:27017
154155
#
155156
DOCKER_QI_PRODUCTION=--link hubdb:hubdb

0 commit comments

Comments
 (0)