projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2857-collection-tests
[arvados.git]
/
docker
/
api
/
apache2_vhost.in
diff --git
a/docker/api/apache2_vhost.in
b/docker/api/apache2_vhost.in
index d29be245573498d60744480ef54e6a522e5c642e..fdbb2f929332089b3d36c6b817a8572b4d98f2bb 100644
(file)
--- a/
docker/api/apache2_vhost.in
+++ b/
docker/api/apache2_vhost.in
@@
-2,7
+2,7
@@
<VirtualHost *:80>
ServerName @@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@
<VirtualHost *:80>
ServerName @@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@
- ServerAdmin sysadmin@c
linicalfutur
e.com
+ ServerAdmin sysadmin@c
urovers
e.com
RedirectPermanent / https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/
RedirectPermanent / https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/
@@
-14,7
+14,7
@@
<VirtualHost *:443>
ServerName @@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@
<VirtualHost *:443>
ServerName @@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@
- ServerAdmin sysadmin@c
linicalfutur
e.com
+ ServerAdmin sysadmin@c
urovers
e.com
RailsEnv production
RackBaseURI /
RailsEnv production
RackBaseURI /