Commit e18b4f0c authored by Leigh B Stoller's avatar Leigh B Stoller

Change all the old uses of PORTAL_ENABLE (and PORTAL_ISPRIMARY) to

PEER_ENABLE and PEER_ISPRIMARY. I want to take back PORTAL_ENABLE and
use it for the modern version. No one uses the peer login stuff so
should not be noticed
parent b7369761
#!/usr/bin/perl -w
#
# Copyright (c) 2010-2016 University of Utah and the Flux Group.
# Copyright (c) 2010-2016, 2019 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
......@@ -78,8 +78,8 @@ my $TB = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@";
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $PORTAL_ENABLE = @PORTAL_ENABLE@;
my $PORTAL_PRIMARY= @PORTAL_ISPRIMARY@;
my $PEER_ENABLE = @PEER_ENABLE@;
my $PEER_PRIMARY = @PEER_ISPRIMARY@;
my $OURDOMAIN = "@OURDOMAIN@";
my $DUMPUSER = "$TB/sbin/dumpuser";
my $DUMPPROJ = "$TB/sbin/dumpproject";
......@@ -133,10 +133,10 @@ my $cmd = shift(@ARGV);
my $peername = shift(@ARGV);
my $peerurn;
if (! $PORTAL_ENABLE) {
fatal("Portal mode is not enabled");
if (! $PEER_ENABLE) {
fatal("Peer mode is not enabled");
}
if (! ($PORTAL_PRIMARY || $cmd eq "addpeer")) {
if (! ($PEER_PRIMARY || $cmd eq "addpeer")) {
fatal("You can only run addpeer on this boss");
}
......
......@@ -728,7 +728,8 @@ VPUBADDR_BITLEN
VPUBADDR_BASE
LINUX_FSNODE
CLOUDLAB_FEDERATED
PORTAL_ISPRIMARY
PEER_ISPRIMARY
PEER_ENABLE
PORTAL_ENABLE
OPSVM_MOUNTPOINT
OPSVM_ENABLE
......@@ -5237,7 +5238,8 @@ OURTIMEZONE="America/Denver"
NODECONSOLE="sio"
MFSVERSION=""
PORTAL_ENABLE=0
PORTAL_ISPRIMARY=0
PEER_ENABLE=0
PEER_ISPRIMARY=0
CLOUDLAB_FEDERATED=0
LINUX_FSNODE=0
DHCPD_EXTRAIFS=""
......
......@@ -290,7 +290,8 @@ AC_SUBST(NEEDMCQUERIER)
AC_SUBST(OPSVM_ENABLE)
AC_SUBST(OPSVM_MOUNTPOINT)
AC_SUBST(PORTAL_ENABLE)
AC_SUBST(PORTAL_ISPRIMARY)
AC_SUBST(PEER_ENABLE)
AC_SUBST(PEER_ISPRIMARY)
AC_SUBST(CLOUDLAB_FEDERATED)
AC_SUBST(LINUX_FSNODE)
AC_SUBST(VPUBADDR_BASE)
......@@ -477,7 +478,8 @@ OURTIMEZONE="America/Denver"
NODECONSOLE="sio"
MFSVERSION=""
PORTAL_ENABLE=0
PORTAL_ISPRIMARY=0
PEER_ENABLE=0
PEER_ISPRIMARY=0
CLOUDLAB_FEDERATED=0
LINUX_FSNODE=0
DHCPD_EXTRAIFS=""
......
......@@ -15,7 +15,6 @@ WWW=www.emulab.net/dev/kwebb
THISHOMEBASE=Kwebb.Emulab.Net
PORTAL_ENABLE=1
PORTAL_ISPRIMARY=1
#PROTOGENI_SUPPORT=0
#WINSUPPORT=1
......@@ -14,4 +14,3 @@ WWW=www.emulab.net/dev/stoller
THISHOMEBASE=Stoller.Emulab.Net
PORTAL_ENABLE=1
PORTAL_ISPRIMARY=1
......@@ -138,8 +138,8 @@ use Carp qw(cluck confess);
my $MAINSITE = @TBMAINSITE@;
my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@";
my $PORTAL_ENABLE = @PORTAL_ENABLE@;
my $PORTAL_ISPRIMARY = @PORTAL_ISPRIMARY@;
my $PEER_ENABLE = @PEER_ENABLE@;
my $PEER_ISPRIMARY = @PEER_ISPRIMARY@;
my $TBBASE = "@TBBASE@";
my $GENIGROUP = "GeniSlices";
my $PGERRORS = "protogeni-errors\@flux.utah.edu";
......@@ -163,7 +163,7 @@ my %GENI_MODULES = ( "cm" => "@prefix@/lib/protogeni-cm.pm",
"instools" =>
"@prefix@/lib/instools/protogeni-instools.pm",
);
if ($PORTAL_ENABLE && !$PORTAL_ISPRIMARY) {
if ($PEER_ENABLE && !$PEER_ISPRIMARY) {
$GENI_MODULES{"emulab"} = "@prefix@/lib/protogeni-emulab.pm";
}
......
#!/usr/bin/perl -w
#
# Copyright (c) 2009-2013 University of Utah and the Flux Group.
# Copyright (c) 2009-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -50,8 +50,8 @@ my $SUDO = "/usr/local/bin/sudo";
my $PROTOUSER = "elabman";
my $WAP = "$TB/sbin/withadminprivs";
my $MANAGEREMOTE = "$TB/sbin/manageremote -p";
my $PORTAL_ENABLE = @PORTAL_ENABLE@;
my $PORTAL_PRIMARY= @PORTAL_ISPRIMARY@;
my $PEER_ENABLE = @PEER_ENABLE@;
my $PEER_PRIMARY = @PEER_ISPRIMARY@;
# un-taint path
$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin:/usr/site/bin';
......@@ -70,7 +70,7 @@ $| = 1;
#
# Exit if not a portal.
#
if (! ($PORTAL_ENABLE && $PORTAL_PRIMARY)) {
if (! ($PEER_ENABLE && $PEER_PRIMARY)) {
exit(0);
}
......
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -53,8 +53,8 @@ my $CONTROL = "@USERNODE@";
my $BOSSNODE= "@BOSSNODE@";
my $OURDOMAIN = "@OURDOMAIN@";
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $PORTAL_ENABLE = @PORTAL_ENABLE@;
my $PORTAL_PRIMARY = @PORTAL_ISPRIMARY@;
my $PEER_ENABLE = @PEER_ENABLE@;
my $PEER_PRIMARY = @PEER_ISPRIMARY@;
my $MODGROUPS = "$TB/sbin/modgroups";
my $TBACCT = "$TB/sbin/tbacct";
my $POSTCRL = "$TB/sbin/protogeni/postcrl";
......@@ -203,7 +203,7 @@ if ($PGENISUPPORT) {
#
# Cannot delete from Portal if exported.
#
if ($PORTAL_ENABLE && $PORTAL_PRIMARY) {
if ($PEER_ENABLE && $PEER_PRIMARY) {
my $exports;
if ($target_user->PeerExports(\$exports) != 0) {
fatal("Could not get peer exports list for $target_user");
......
......@@ -83,7 +83,8 @@ $NONAMEDSETUP = @DISABLE_NAMED_SETUP@;
$OPS_VM = @OPSVM_ENABLE@;
$PORTAL_ENABLE = @PORTAL_ENABLE@;
$CLUSTER_PORTAL = "@CLUSTER_PORTAL@";
$PORTAL_ISPRIMARY = @PORTAL_ISPRIMARY@;
$PEER_ENABLE = @PEER_ENABLE@;
$PEER_ISPRIMARY = @PEER_ISPRIMARY@;
$SPEWFROMOPS = @SPEWFROMOPS@;
$BROWSER_CONSOLE_ENABLE = @BROWSER_CONSOLE_ENABLE@;
$IPV6_ENABLED = @IPV6_ENABLED@;
......
<?php
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -30,8 +30,8 @@ $isadmin = ISADMIN();
PAGEHEADER("Portal Login");
if (! ($PORTAL_ENABLE && $PORTAL_ISPRIMARY)) {
USERERROR("Not a Portal", 1);
if (! ($PEER_ENABLE && $PEER_ISPRIMARY)) {
USERERROR("Not a Peer Portal", 1);
}
#
......
<?php
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -30,8 +30,8 @@ $reqargs = RequiredPageArguments("user", PAGEARG_USER,
"key", PAGEARG_STRING);
$optargs = OptionalPageArguments("redirected", PAGEARG_BOOLEAN);
if (! $PORTAL_ENABLE) {
USERERROR("No Portal", 1);
if (! $PEER_ENABLE) {
USERERROR("No Peer Portal", 1);
}
#
......
<?php
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -119,7 +119,7 @@ if ($isadmin) {
# Portal support; show exports.
#
$exports_html = null;
if ($PORTAL_ENABLE && $PORTAL_ISPRIMARY) {
if ($PEER_ENABLE && $PEER_ISPRIMARY) {
$pid_idx = $project->pid_idx();
$query_result =
......
<?php
#
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -158,7 +158,7 @@ if (!$archived && !$target_user->wikionly() &&
CreateURL("showmmlists", $target_user));
}
}
if ($PORTAL_ENABLE && $PORTAL_ISPRIMARY) {
if ($PEER_ENABLE && $PEER_ISPRIMARY) {
$peer_result =
DBQueryFatal("select peer from user_exports ".
"where uid_idx=$target_idx");
......@@ -376,7 +376,7 @@ if ($PUBSUPPORT) {
#
# Portal support; show exports.
#
if ($PORTAL_ENABLE && $PORTAL_ISPRIMARY) {
if ($PEER_ENABLE && $PEER_ISPRIMARY) {
$query_result =
DBQueryFatal("select * from user_exports where uid_idx='$target_idx'");
if (mysql_num_rows($query_result)) {
......
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