diff --git a/src/MGRAST/lib/resources/heartbeat.pm b/src/MGRAST/lib/resources/heartbeat.pm index dccb1fcf..562d33ab 100644 --- a/src/MGRAST/lib/resources/heartbeat.pm +++ b/src/MGRAST/lib/resources/heartbeat.pm @@ -15,8 +15,8 @@ sub new { # Add name / attributes $self->{name} = "heartbeat"; - $self->{services} = { 'FTP' => 'ftp://ftp.metagenomics.anl.gov', - 'website' => 'http://metagenomics.anl.gov/', + $self->{services} = { 'FTP' => $Conf::ftp_download, + 'website' => $Conf::cgi_url, 'SHOCK' => $Conf::shock_url, 'AWE' => $Conf::awe_url, 'M5NR' => $Conf::m5nr_solr, diff --git a/src/MGRAST/lib/resources/user.pm b/src/MGRAST/lib/resources/user.pm index ae904336..5d566438 100644 --- a/src/MGRAST/lib/resources/user.pm +++ b/src/MGRAST/lib/resources/user.pm @@ -1087,7 +1087,7 @@ sub create_user { $abody->param('LOGIN', $user->login); $abody->param('EMAIL_USER', $user->email); $abody->param('APPLICATION_NAME', "MG-RAST"); - $abody->param('APPLICATION_URL', "http://metagenomics.anl.gov"); + $abody->param('APPLICATION_URL', $Conf::cgi_url); $abody->param('EMAIL_ADMIN', "mg-rast\@mcs.anl.gov"); $abody->param('URL', $url); if ($cgi->param('country')) { @@ -1122,7 +1122,7 @@ sub create_user { $ubody->param('LOGIN', $user->{login}); $ubody->param('EMAIL_USER', $user->{email}); $ubody->param('APPLICATION_NAME', "MG-RAST"); - $ubody->param('APPLICATION_URL', "http://metagenomics.anl.gov"); + $ubody->param('APPLICATION_URL', $Conf::cgi_url); $ubody->param('EMAIL_ADMIN', "mg-rast\@mcs.anl.gov"); $user->send_email( "mg-rast\@mcs.anl.gov", @@ -1145,7 +1145,7 @@ sub set_password { $body->param('LOGIN', $user->{login}); $body->param('NEWPASSWORD', $password); $body->param('APPLICATION_NAME', "MG-RAST"); - $body->param('APPLICATION_URL', "http://metagenomics.anl.gov"); + $body->param('APPLICATION_URL', $Conf::cgi_url); $body->param('EMAIL_ADMIN', "mg-rast\@mcs.anl.gov"); $user->send_email( "mg-rast\@mcs.anl.gov", diff --git a/src/WebApplication/WebConfig.pm b/src/WebApplication/WebConfig.pm index 0d38ff5f..3e3479f6 100644 --- a/src/WebApplication/WebConfig.pm +++ b/src/WebApplication/WebConfig.pm @@ -42,7 +42,7 @@ our $NODB = undef; # Default values for the web application # our $APPLICATION_NAME = 'MG-RAST'; -our $APPLICATION_URL = 'http://metagenomics.anl.gov/'; +our $APPLICATION_URL = "$Conf::cgi_url/"; our $ADMIN_EMAIL = 'mg-rast@mcs.anl.gov'; # @@ -50,10 +50,7 @@ our $ADMIN_EMAIL = 'mg-rast@mcs.anl.gov'; # to web applications a backend depends on. # rf. to User->grant_login_right # -our $LOGIN_DEPENDENCIES = { 'RAST' => [ 'SeedViewer', 'MGRAST', 'PRAST' ], - 'SeedViewer' => [ 'RAST', 'MGRAST', 'PRAST' ], - 'MGRAST' => [ 'RAST', 'SeedViewer', 'PRAST' ], - 'PRAST' => [ 'RAST', 'SeedViewer', 'MGRAST' ] }; +our $LOGIN_DEPENDENCIES = { 'MGRAST' => [] }; #