Commit 2e5b1418 authored by Leigh Stoller's avatar Leigh Stoller

The URL for the certificates now comes from configure: PROTOGENI_URL

parent 7220f915
...@@ -43,6 +43,7 @@ my $MAINSITE = @TBMAINSITE@; ...@@ -43,6 +43,7 @@ my $MAINSITE = @TBMAINSITE@;
my $OURDOMAIN = "@OURDOMAIN@"; my $OURDOMAIN = "@OURDOMAIN@";
my $PGENIDOMAIN = "@PROTOGENI_DOMAIN@"; my $PGENIDOMAIN = "@PROTOGENI_DOMAIN@";
my $SLICESHUTDOWN = "$TB/sbin/protogeni/shutdownslice"; my $SLICESHUTDOWN = "$TB/sbin/protogeni/shutdownslice";
my $PROTOGENI_URL = "@PROTOGENI_URL@";
my $RegisterNow = 0; my $RegisterNow = 0;
my $API_VERSION = 1.01; my $API_VERSION = 1.01;
...@@ -306,7 +307,7 @@ sub Resolve($) ...@@ -306,7 +307,7 @@ sub Resolve($)
my $pid = $project->pid(); my $pid = $project->pid();
my $urn = GeniHRN::Generate("$OURDOMAIN:$pid", my $urn = GeniHRN::Generate("$OURDOMAIN:$pid",
"authority", "sa"); "authority", "sa");
my $url = "@TBBASE@/protogeni/xmlrpc/project/$pid/sa"; my $url = "$PROTOGENI_URL/project/$pid/sa";
$subsas{$urn} = $url; $subsas{$urn} = $url;
} }
$blob->{'subauthorities'} = \%subsas; $blob->{'subauthorities'} = \%subsas;
......
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