From 4c220cf534629be547ccdee8020c74d3d60b7bd0 Mon Sep 17 00:00:00 2001 From: zeus Date: Mon, 29 Nov 2021 12:29:34 +0200 Subject: [PATCH] ad config --- .../usr/share/swarmlab.io/sec/sec_bootstrap | 18 +++++++++--------- install/usr/share/swarmlab.io/sec/swarmlab-sec | 4 ++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/install/usr/share/swarmlab.io/sec/sec_bootstrap b/install/usr/share/swarmlab.io/sec/sec_bootstrap index 1dd7c5a..8f191c5 100755 --- a/install/usr/share/swarmlab.io/sec/sec_bootstrap +++ b/install/usr/share/swarmlab.io/sec/sec_bootstrap @@ -47,25 +47,25 @@ case $ROLE in auto_update_hosts "${HOSTNAMES}" > /dev/null 2>&1 & # Start ssh server - /usr/sbin/sshd -D + #/usr/sbin/sshd -D ;; "workerservice") # Start ssh server in background - /usr/sbin/sshd -D & - + #/usr/sbin/sshd -D & + # Keep trying to connect to master node and stay there indefinitely so that master node can see # the connected hosts that are ready for MPI work - while sleep 1 - do + #while sleep 1 + #do # shellcheck disable=SC2086 - ssh -T -o "StrictHostKeyChecking no" \ - -i "${USER_HOME}/.ssh/id_rsa" \ - ${USER}@${MPI_MASTER_SERVICE_NAME} \ + # ssh -T -o "StrictHostKeyChecking no" \ + # -i "${USER_HOME}/.ssh/id_rsa" \ + # ${USER}@${MPI_MASTER_SERVICE_NAME} \ "tail -f /dev/null" - done + #done ;; *) echo 'role argument only accepts "masterservice" or "workerservice"' diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index c8d8a58..f23b46f 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -277,6 +277,10 @@ services: - ${HYBRID_NETWORK} volumes: - $Wdir/project:/home/docker/project + - $Wdir/project/data-www:/data-www + - $Wdir/project/config/nginx.conf:/etc/nginx/nginx.conf + - $Wdir/project/config/default.conf:/etc/nginx/conf.d/default.conf + - $Wdir/project/config/supervisord.conf:/etc/supervisor/supervisord.conf workerservice: