diff --git a/configure b/configure index 2ac950d75ef13652f35d87ff2b1b5bf3704ecfef..9b310e648f7cf28322ace48620c3643d27ed4902 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index 778b97120e42c1d5149717f9437afd178acf54c5..6aaa8cf9e1d778c7b244cf91288c83586db0f4fc 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/defs-apt b/defs-apt index d83048ef75a56d14b91f5cd96d54c02fa386263d..4d25c47985db78009f30737100164a6d0be48414 100644 --- a/defs-apt +++ b/defs-apt @@ -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 diff --git a/defs-cloudlab-clemson b/defs-cloudlab-clemson index 374aa06b8e900dd20337ad9764d8a82b8f5a8158..28387472332c2da5c9f910a957cea8d1f9c0ffec 100644 --- a/defs-cloudlab-clemson +++ b/defs-cloudlab-clemson @@ -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 diff --git a/defs-cloudlab-utah b/defs-cloudlab-utah index 3dd10d54307d98f4f806925a3701a531e75aae59..29014cb44b74ab4cce8fc0ba0f72ed7958b3d5bd 100644 --- a/defs-cloudlab-utah +++ b/defs-cloudlab-utah @@ -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 diff --git a/defs-cloudlab-wisc b/defs-cloudlab-wisc index 5fbb181d7fb1e48a1b4897d20ac9d10b41013bbf..7512dedf265b6ab43dfa8d59b13b9e67eac50b25 100644 --- a/defs-cloudlab-wisc +++ b/defs-cloudlab-wisc @@ -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 diff --git a/defs-default b/defs-default index c9e4a73e5b4a8f36303db5552d41d2ba9e191f2e..a5e03a7735a16e34239dc84f4891ed04d7f8f258 100644 --- a/defs-default +++ b/defs-default @@ -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! diff --git a/defs-onelab b/defs-onelab index 72982c7ee3c639b4f0784a4db1bf1c5c4ed6d163..3cfbe01812643221f8f02a1f9050291c020719a2 100644 --- a/defs-onelab +++ b/defs-onelab @@ -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 diff --git a/www/aptui/landing.php b/www/aptui/landing.php index 6710093287906c92953b230e469432ab864f2dd7..05bc39c7a50887109171195b38356befac285e56 100644 --- a/www/aptui/landing.php +++ b/www/aptui/landing.php @@ -1,6 +1,6 @@ IsActive()) { header("Location: $referrer"); } else { - header("Location: $APTBASE/landing.php"); + header("Location: $APTBASE/landing.php?redirect=yes"); } ?> diff --git a/www/defs.php3.in b/www/defs.php3.in index 607b9c0a3f2bfc7dbc45201200a8b46f79315ea8..ea026b9bdd0820b11bea57db497f7ca07fed07d7 100644 --- a/www/defs.php3.in +++ b/www/defs.php3.in @@ -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@"; diff --git a/www/index.html b/www/index.html index 75feabdf8338a895068b1294861232ee859beb8f..b83ab1aedbe585f1ed83b335aeefe4ab8a7a2f78 100644 --- a/www/index.html +++ b/www/index.html @@ -1,5 +1,5 @@