Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to the Unity Web Portal
# Contributing to the UnityHPC Platform Account Portal

## Conventions

Expand Down Expand Up @@ -49,7 +49,7 @@ This repository will automatically check PRs for linting compliance.

While the environment is running, the following is accessible:

- http://127.0.0.1:8000 - Web Portal
- http://127.0.0.1:8000 - Account Portal
- http://127.0.0.1:8010 - PHPLDAPAdmin Portal
- http://127.0.0.1:8020 - PHPMyAdmin Portal
- http://127.0.0.1:8030 - Mailcatcher Portal
Expand All @@ -69,7 +69,7 @@ Notable users:

### Changes to Dev Environment

Should the default schema of the web portal change, the `ldap/bootstrap.ldif` and `sql/bootstrap.sql` must be updated for the LDAP server and the MySQL server, respectively.
Should the default schema change, the `ldap/bootstrap.ldif` and `sql/bootstrap.sql` must be updated for the LDAP server and the MySQL server, respectively.

## Testing

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
![UNITY](https://user-images.githubusercontent.com/40907639/137608695-2d914da2-1ecc-480b-a47e-a9e33b2b1b45.png)

# Unity Web Portal
# UnityHPC Account Portal

Unity Web Portal is a PHP application built in top of MariaDB and LDAP which acts as a central user portal for high-performance-computing clusters.
An identity management GUI for research computing written in PHP and built on MariaDB and OpenLDAP.

Typical Usage:

Expand Down
4 changes: 2 additions & 2 deletions defaults/config.ini.default
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ repo = "https://github.com/UnityHPC/unity-web-portal" ; Upstream URL for the we

[site]
prefix = "" ; prefix of website, no ending / should be included
name = "Unity Cluster" ; Name of the website
name = "UnityHPC Account Portal" ; Name of the website
url = "http://127.0.0.1:8000/" ; URL of the website
description = "The Unity Web Portal is a lightweight HPC cluster front-end" ; Description of the website
description = "The UnityHPC Account Portal is an identity management GUI for research computing" ; Description of the website
logo = "logo.png" ; path to logo file, in the webroot/assets/branding folder
terms_of_service_url = "https://github.com" ; this can be external or a portal page created with "content management"
account_policy_url = "https://github.com" ; this can be external or a portal page created with "content management"
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/UnityGithub.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class UnityGithub
public function getSshPublicKeys(string $username): array
{
$url = "https://api.github.com/users/$username/keys";
$headers = ["User-Agent: Unity Cluster User Portal"];
$headers = ["User-Agent: UnityHPC Account Portal"];

$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/UnityGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Exception;

/**
* Class that represents a single PI group in the Unity Cluster.
* Class that represents a single PI group in the UnityHPC Platform.
*/
class UnityGroup extends PosixGroup
{
Expand Down
2 changes: 1 addition & 1 deletion resources/lib/UnityLDAP.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use PHPOpenLDAPer\LDAPEntry;

/**
* An LDAP connection class which extends LDAPConn tailored for the Unity Cluster
* An LDAP connection class which extends LDAPConn tailored for the UnityHPC Platform
*/
class UnityLDAP extends LDAPConn
{
Expand Down
2 changes: 1 addition & 1 deletion resources/mail/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
>
<span>
You are receiving this email because you have an account
on the <?php echo getHyperlink("Unity Cluster", "/"); ?>.
on the <?php echo getHyperlink("UnityHPC Platform", "/"); ?>.
If you would like to stop receiving these emails,
you may request to close your account by replying to this email.
</span>
Expand Down
2 changes: 1 addition & 1 deletion resources/mail/group_created.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p>Hello,</p>

<p>
Your request for a PI account on the Unity cluster has been approved.
Your request for a PI account on the UnityHPC Platform has been approved.
You can access the management page for your group
<?php echo getHyperlink("on this page", "panel/pi.php"); ?>.
</p>
Expand Down
4 changes: 2 additions & 2 deletions resources/mail/group_denied.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

<p>Hello,</p>

<p>Unfortunately, your request for a PI account on the Unity cluster has not been approved.
<p>Unfortunately, your request for a PI account on the UnityHPC Platform has not been approved.
Usually, this is due to one of the following reasons:</p>

<ul>
<li>You are not a PI at your organization</li>
<li>We were not able to verify your PI status. In this case please reply with verification</li>
<li>Your organization has not been authorized on the Unity Cluster.
<li>Your organization has not been authorized on the UnityHPC Platform.
In this case please reply with more information about your request</li>
</ul>

Expand Down
4 changes: 2 additions & 2 deletions resources/mail/group_disband.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<p>Hello,</p>

<p>Your PI group, <?php echo $data["group_name"]; ?>, has been disbanded on the Unity
cluster. Any jobs associated with this PI account have been killed.</p>
<p>Your PI group, <?php echo $data["group_name"]; ?>, has been disbanded on the UnityHPC Platform.
Any jobs associated with this PI account have been killed.</p>

<p>If you believe this to be a mistake, please reply to this email</p>
2 changes: 1 addition & 1 deletion resources/mail/group_request.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p>Hello,</p>

<p>
You have requested a PI account on the Unity Cluster.
You have requested a PI account on the UnityHPC Platform.
The admin team is reviewing this request, and you will receive an email soon with more details.
</p>

Expand Down
2 changes: 1 addition & 1 deletion resources/mail/user_dequalified.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

<p>Hello,</p>

<p>Your account on the Unity cluster has been deactivated.</p>
<p>Your account on the UnityHPC Platform has been deactivated.</p>

<p>If you believe this to be a mistake, please reply to this email as soon as possible.</p>
2 changes: 1 addition & 1 deletion resources/mail/user_loginshell.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<p>Hello,</p>

<p>You have updated your login shell on the Unity cluster to <?php echo $data["new_shell"]; ?>.
<p>You have updated your login shell on the UnityHPC Platform to <?php echo $data["new_shell"]; ?>.
You can view the login shell settings on the
<?php echo getHyperlink("account settings", "panel/account.php"); ?> page</p>

Expand Down
2 changes: 1 addition & 1 deletion resources/mail/user_qualified.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<p>Hello,</p>

<p>Your account on the Unity cluster has been activated. Your account details are below:</p>
<p>Your account on the UnityHPC Platform has been activated. Your account details are below:</p>

<p>
<strong>Username</strong> <?php echo $data["user"]; ?>
Expand Down
2 changes: 1 addition & 1 deletion tools/docker-dev/identity/bootstrap.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -13492,7 +13492,7 @@ objectclass: posixGroup
objectclass: top

dn: ou=users,dc=unityhpc,dc=test
description: Hold all of the posix account of the cluster.
description: Holds all posix accounts.
objectclass: organizationalUnit
objectclass: top
ou: users
Expand Down
8 changes: 5 additions & 3 deletions webroot/panel/account.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@
$isPI = $USER->isPI();

if ($isPI) {
echo "<p>You are curently a <strong>principal investigator</strong> on the Unity Cluster</p>";
echo "
<p>You are curently a <strong>principal investigator</strong> on the UnityHPC Platform</p>
";
} elseif ($USER->isQualified()) {
echo "<p>You are curently a <strong>qualified user</strong> on the Unity Cluster</p>";
echo "<p>You are curently a <strong>qualified user</strong> on the UnityHPC Platform</p>";
} else {
$tos_url = CONFIG["site"]["terms_of_service_url"];
$form_url = getURL("panel/groups.php");
echo "
<p>
You are currently an <strong>unqualified user</strong>, and will be
<strong>unable to use the cluster</strong>.
<strong>unable to access UnityHPC Platform services</strong>.
To become qualified, request to join a PI group, or if you are a PI, request a PI group.
Do not request a PI group if you are a student.
</p>
Expand Down
2 changes: 1 addition & 1 deletion webroot/panel/new_account.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<strong>Email&nbsp;&nbsp;</strong>
<?php echo $SSO["mail"]; ?>
</div>
<p>Your unity cluster username will be <strong><?php echo $SSO["user"]; ?></strong></p>
<p>Your UnityHPC username will be <strong><?php echo $SSO["user"]; ?></strong></p>
<br>
<form action="" method="POST">
<?php echo UnityHTTPD::getCSRFTokenHiddenFormInput(); ?>
Expand Down