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

Add an override that forces the Classic UI even when the Portal is

enabled. This was for Chuck. Also, define PORTAL_ENABLE on all of
our clusters.
parent bfe61570
......@@ -731,6 +731,7 @@ CLOUDLAB_FEDERATED
PEER_ISPRIMARY
PEER_ENABLE
PORTAL_ENABLE
CLASSICWEB_OVERRIDE
OPSVM_MOUNTPOINT
OPSVM_ENABLE
NEEDMCQUERIER
......@@ -5238,6 +5239,7 @@ OURTIMEZONE="America/Denver"
NODECONSOLE="sio"
MFSVERSION=""
PORTAL_ENABLE=0
CLASSICWEB_OVERRIDE=0
PEER_ENABLE=0
PEER_ISPRIMARY=0
CLOUDLAB_FEDERATED=0
......
......@@ -289,6 +289,7 @@ AC_SUBST(BIGDB)
AC_SUBST(NEEDMCQUERIER)
AC_SUBST(OPSVM_ENABLE)
AC_SUBST(OPSVM_MOUNTPOINT)
AC_SUBST(CLASSICWEB_OVERRIDE)
AC_SUBST(PORTAL_ENABLE)
AC_SUBST(PEER_ENABLE)
AC_SUBST(PEER_ISPRIMARY)
......@@ -477,6 +478,7 @@ OPSVM_MOUNTPOINT="/ops"
OURTIMEZONE="America/Denver"
NODECONSOLE="sio"
MFSVERSION=""
CLASSICWEB_OVERRIDE=0
PORTAL_ENABLE=0
PEER_ENABLE=0
PEER_ISPRIMARY=0
......
......@@ -179,3 +179,6 @@ NODE_USAGE_SUPPORT=1
# Enable idle stats collection (RRD files)
SDCOLLECTD_DOSTATS=1
SDCOLLECTD_USE_RRDTOOL=1
# New world order
PORTAL_ENABLE=1
......@@ -169,3 +169,6 @@ SDCOLLECTD_USE_RRDTOOL=1
# Enable the reportboot_daemon (rather then using BOOTINFO_EVENTS=0)
REPORTBOOT_ENABLED=1
REPORTBOOT_FLAGS="-C"
# New world order
PORTAL_ENABLE=1
......@@ -190,3 +190,6 @@ NODE_USAGE_SUPPORT=1
# Enable idle stats collection (RRD files)
SDCOLLECTD_DOSTATS=1
SDCOLLECTD_USE_RRDTOOL=1
# New world order
PORTAL_ENABLE=1
......@@ -606,3 +606,6 @@ INCREMENTAL_MOUNTD=1
# Enable idle stats collection (RRD files)
SDCOLLECTD_DOSTATS=1
SDCOLLECTD_USE_RRDTOOL=1
# New world order
PORTAL_ENABLE=1
......@@ -110,6 +110,8 @@ PROTOGENI_LOCALUSER=1
CLUSTER_PORTAL="boss.emulab.net"
CLUSTER_PUBSUBD_SSLPORT=16506
CLUSTER_PUBSUBD_ALTPORT=16507
# Fancy new Portal interface. Requires PROTOGENI_SUPPORT=1
PORTAL_ENABLE=1
# Mobile networking support (PhantomNet)
MOBILESUPPORT=1
# Do not set these without talking to Utah!
......
......@@ -504,3 +504,6 @@ BOOTINFO_EVENTS=0
# Enable idle stats collection (RRD files)
SDCOLLECTD_DOSTATS=1
SDCOLLECTD_USE_RRDTOOL=1
# New world order
PORTAL_ENABLE=1
<?php
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -38,10 +38,14 @@ $this_user = CheckLogin($check_status);
#
# Verify page arguments.
#
$optargs = OptionalPageArguments("login", PAGEARG_BOOLEAN);
$optargs = OptionalPageArguments("login", PAGEARG_BOOLEAN,
"redirect", PAGEARG_BOOLEAN);
if (! ($CHECKLOGIN_STATUS & CHECKLOGIN_LOGGEDIN)) {
if ($ISEMULAB && !$login) {
if ($redirect) {
header("Location: landing.php");
}
elseif ($ISEMULAB && !$login) {
header("Location: frontpage.php");
}
else {
......
<?php
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -381,6 +381,6 @@ if (isset($referrer) && $CHECKLOGIN_USER->IsActive()) {
header("Location: $referrer");
}
else {
header("Location: $APTBASE/landing.php");
header("Location: $APTBASE/landing.php?redirect=yes");
}
?>
......@@ -93,6 +93,7 @@ $TBMAILTAG = $THISHOMEBASE;
$WITHZFS = @WITHZFS@;
$ZFS_NOEXPORT = @ZFS_NOEXPORT@;
$UI_EXTERNAL_ACCOUNTS = @UI_EXTERNAL_ACCOUNTS@;
$CLASSICWEB_OVERRIDE = @CLASSICWEB_OVERRIDE@;
$TBMAILADDR_OPS = "@TBOPSEMAIL_NOSLASH@";
$TBMAILADDR_WWW = "@TBWWWEMAIL_NOSLASH@";
......
<!--
Copyright (c) 2000-2018 University of Utah and the Flux Group.
Copyright (c) 2000-2019 University of Utah and the Flux Group.
{{{EMULAB-LICENSE
......@@ -24,7 +24,7 @@
<html>
<head>
<title>Emulab.Net</title>
<META HTTP-EQUIV="Refresh" Content= "0; URL=portal/frontpage.php" ALT="Emulab home page">
<META HTTP-EQUIV="Refresh" Content= "0; URL=index.php" ALT="Emulab home page">
</head>
</html>
......
<?php
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -21,5 +21,12 @@
#
# }}}
#
header("Location: portal/frontpage.php");
require("defs.php3");
if ($PORTAL_ENABLE && !$CLASSICWEB_OVERRIDE) {
header("Location: portal/landing.php");
return;
}
header("Location: classic.php");
?>
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