projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6260: so many golint complaints!!
[arvados.git]
/
docker
/
workbench
/
apache2_foreground.sh
diff --git
a/docker/workbench/apache2_foreground.sh
b/docker/workbench/apache2_foreground.sh
index 5475ff0a199e9b29bc6891968fa2f30f32b85770..fc6028ea8391b3445e13adc5de4439fe7207ec2d 100755
(executable)
--- a/
docker/workbench/apache2_foreground.sh
+++ b/
docker/workbench/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
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
-# Override the default API server address if necessary.
-if [[ "$API_PORT_443_TCP_ADDR" != "" ]]; then
- sed -i "s/localhost:9900/$API_PORT_443_TCP_ADDR/" /usr/src/arvados/apps/workbench/config/application.yml
-fi
-
source /etc/apache2/envvars
/usr/sbin/apache2 -D FOREGROUND
source /etc/apache2/envvars
/usr/sbin/apache2 -D FOREGROUND