Commit f89d5ed5 authored by Clément OUDOT's avatar Clément OUDOT

Fix portal URL for test script (#1415)

parent 80ed8580
......@@ -405,7 +405,6 @@ prepare_test_server:
INITDIR=`pwd`/e2e-tests/conf/init \
ETCDEFAULTDIR=`pwd`/e2e-tests/conf/def
#@cp -f e2e-tests/index.* e2e-tests/conf/
@perl -i -pe 's/example\.com/example.com:19876/g' e2e-tests/conf/site/index.pl
@cp -f $(SRCMANAGERDIR)/site/htdocs/manager* e2e-tests/conf/manager
@cp -f $(SRCPORTALDIR)/site/htdocs/index* e2e-tests/conf/portal
@cp e2e-tests/saml-sp.xml e2e-tests/conf/site/saml-sp.xml
......
......@@ -15,10 +15,10 @@ my $color = $cgi->param("color") || "#ddd";
# Local parameters
my $host = $ENV{HTTP_HOST};
my ( $domain ) = ( $host =~ /\w+\.(.*)/ );
my $protocol = $ENV{HTTPS} ? "https" : "http";
my $portal_url = "$protocol://auth.$domain";
my $manager_url = "$protocol://manager.$domain";
my ( $domain, $port ) = ( $host =~ /\w+\.(.*?):(\d*)/ );
my $protocol = ( $ENV{HTTPS} =~ /^on$/i ) ? "https" : "http";
my $portal_url = "$protocol://auth.$domain:$port";
my $manager_url = "$protocol://manager.$domain:$port";
# CSS
my $css = <<EOT;
......@@ -67,7 +67,8 @@ print
"<script type=\"text/javascript\" src=\"$portal_url/static/bwr/jquery/dist/jquery.js\"></script>\n";
print
"<script type=\"text/javascript\" src=\"$portal_url/static/bwr/jquery-ui/jquery-ui.js\"></script>\n";
print "<script src=\"$portal_url/static/bwr/bootstrap/dist/js/bootstrap.js\"></script>\n";
print
"<script src=\"$portal_url/static/bwr/bootstrap/dist/js/bootstrap.js\"></script>\n";
print "</head>\n";
print "<body>\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment