Commit 3f7d874b authored by Leigh B Stoller's avatar Leigh B Stoller

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 84cc8e8b b7c68bd6
...@@ -12,11 +12,11 @@ use Frontier::RPC2; ...@@ -12,11 +12,11 @@ use Frontier::RPC2;
# Do this early so that we talk to the right DB. # Do this early so that we talk to the right DB.
use vars qw($GENI_DBNAME $GENI_METHODS $EMULAB_PEMFILE use vars qw($GENI_DBNAME $GENI_METHODS $EMULAB_PEMFILE
$GENI_RESPONSE_CONVERTER); $GENI_RESPONSE_CONVERTER);
BEGIN { $GENI_DBNAME = "geni"; } BEGIN { $GENI_DBNAME = "geni-cm"; }
# Configure variables # Configure variables
my $ETCDIR = "@prefix@/etc"; my $ETCDIR = "@prefix@/etc";
$EMULAB_PEMFILE = "$ETCDIR/genisa.pem"; $EMULAB_PEMFILE = "$ETCDIR/genicm.pem";
# Testbed libraries. # Testbed libraries.
use lib '@prefix@/lib'; use lib '@prefix@/lib';
......
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