Merge branch 'master' into 3193-manage-account

[arvados.git] / docker / api / apache2_foreground.sh

diff --git a/docker/api/apache2_foreground.sh b/docker/api/apache2_foreground.sh
index c3facfe6f246578db9825ee46f697e1a583ba291..fc6028ea8391b3445e13adc5de4439fe7207ec2d 100755 (executable)
--- a/docker/api/apache2_foreground.sh
+++ b/docker/api/apache2_foreground.sh
@@ -3,10 +3,5 @@
 read pid cmd state ppid pgrp session tty_nr tpgid rest < /proc/self/stat
 trap "kill -TERM -$pgrp; exit" EXIT TERM KILL SIGKILL SIGTERM SIGQUIT
 
-# Start ssh daemon if requested via the ENABLE_SSH env variable
-if [[ ! "$ENABLE_SSH" =~ (0|false|no|f|^$) ]]; then
-  /etc/init.d/ssh start
-fi
-
 source /etc/apache2/envvars
 /usr/sbin/apache2 -D FOREGROUND