Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/MGRAST/lib/resources/heartbeat.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/MGRAST/lib/resources/user.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
7 changes: 2 additions & 5 deletions src/WebApplication/WebConfig.pm
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,15 @@ 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';

#
# Login dependencies are used to grant login rights
# 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' => [] };


#
Expand Down