Skip to content

get rid of policy page / priv.php, allow external link instead #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2025
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
2 changes: 1 addition & 1 deletion defaults/config.ini.default
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ name = "Unity Cluster" ; Name of the website
url = "https://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
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"

[ldap]
uri = "ldap://identity" ; URI of remote LDAP server
Expand Down Expand Up @@ -100,4 +101,3 @@ url = "https://hooks.slack.com/services/T04BB3N3M26/B050A55CBNX/IGm1YA0VhjczAfs5
[page] ; which sql objects to use for the content on these pages
home = "home"
support = "support"
policy = "policy"
2 changes: 1 addition & 1 deletion resources/templates/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="footerBlock">
<span>Unity Web Portal Version <a target="_blank" href="<?php echo $CONFIG["upstream"]["repo"]; ?>">
<?php echo $CONFIG["upstream"]["version"]; ?></a></span>&nbsp;|
<a href="<?php echo $CONFIG["site"]["prefix"]; ?>/priv.php">Site Policy</a>
<a href="<?php echo $CONFIG["site"]["terms_of_service_url"]; ?>">Terms of Service</a>
</div>
</footer>

Expand Down
3 changes: 1 addition & 2 deletions tools/docker-dev/sql/bootstrap.sql
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,7 @@ CREATE TABLE `pages` (
--

INSERT INTO `pages` (`id`, `page`, `content`) VALUES
(1, 'support', '<h3>Docmentation and FAQ</h3>\r\n<p>You can find our documentation <a href=\"https://esdconfluence.it.umass.edu/confluence/display/UNITY/Unity+Cluster+Documentation+Home\" target=\"_blank\">here</a>. We also have an <a target=\"_blank\" href=\"https://esdconfluence.it.umass.edu/confluence/display/UNITY/Frequently+Asked+Questions\">FAQ</a> page which could help answer quick questions.\r\n\r\n<h3>Office Hours</h3>\r\n<p>We offer office hours every week on <strong>Tuesdays 2-4 PM</strong> in-person at <strong>W.E.B. DuBois Library 786</strong> or remote on <strong><a target=\"_blank\" href=\"https://umass-amherst.zoom.us/j/95663998309\">Zoom</a></strong>. Be sure to check the <a href=\"<?php echo $CONFIG[\"site\"][\"prefix\"]; ?>/index.php\">cluster notes</a> page for up-to-date information on any canceled/delayed office hours.</p>\r\n\r\n<h3>Support Email</h3>\r\n<p>You can create a support ticket by emailing <a target=\"_blank\" href=\"mailto:hpc@umass.edu\">hpc@umass.edu</a>. We will do our best to reply as fast as possible!</p>'),
(2, 'policy', '<p>By using resources associated with Unity, you agree to comply with the following conditions of use. This is an extension of the University of Massachussetts Amherst Information Technology Acceptable Use Policy, which can be found <a target=\"_blank\" href=\"https://www.umass.edu/it/security/acceptable-use-policy\">here</a>.</p>\r\n\r\n<ol>\r\n <li>You will not use Unity resources for illicit financial gain, such as virtual currency mining, or any unlawful purpose, nor attempt to breach or circumvent any Unity administrative or security controls. You will comply with all applicable laws, working with your home institution and the specific Unity service providers utilized to determine what constraints may be placed on you by any relevant regulations such as export control law or HIPAA.</li>\r\n <li>You will respect intellectual property rights and observe confidentiality agreements.</li>\r\n <li>You will protect the access credentials (e.g., passwords, private keys, and/or tokens) issued to you or generated to access Unity resources; these are issued to you for your sole use.</li>\r\n <li>You will immediately report any known or suspected security breach or loss or misuse of Unity access credentials to <a href=\"mailto:hpc@it.umass.edu\">hpc@it.umass.edu</a>.</li>\r\n <li>You will have only one Unity User account and will keep your profile information up-to-date.</li>\r\n <li>Use of resources and services through Unity is at your own risk. There are no guarantees that resources and services will be available, that they will suit every purpose, or that data will never be lost or corrupted. Users are responsible for backing up critical data.</li>\r\n <li>Logged information, including information provided by you for registration purposes, is used for administrative, operational, accounting, monitoring and security purposes. This information may be disclosed, via secured mechanisms, only for the same purposes and only as far as necessary to other organizations cooperating with Unity .</li>\r\n</ol>\r\n\r\n<p>The Unity team reserves the right to restrict access to any individual/group found to be in breach of the above.</p>');
(1, 'support', '<h3>Docmentation and FAQ</h3>\r\n<p>You can find our documentation <a href=\"https://esdconfluence.it.umass.edu/confluence/display/UNITY/Unity+Cluster+Documentation+Home\" target=\"_blank\">here</a>. We also have an <a target=\"_blank\" href=\"https://esdconfluence.it.umass.edu/confluence/display/UNITY/Frequently+Asked+Questions\">FAQ</a> page which could help answer quick questions.\r\n\r\n<h3>Office Hours</h3>\r\n<p>We offer office hours every week on <strong>Tuesdays 2-4 PM</strong> in-person at <strong>W.E.B. DuBois Library 786</strong> or remote on <strong><a target=\"_blank\" href=\"https://umass-amherst.zoom.us/j/95663998309\">Zoom</a></strong>. Be sure to check the <a href=\"<?php echo $CONFIG[\"site\"][\"prefix\"]; ?>/index.php\">cluster notes</a> page for up-to-date information on any canceled/delayed office hours.</p>\r\n\r\n<h3>Support Email</h3>\r\n<p>You can create a support ticket by emailing <a target=\"_blank\" href=\"mailto:hpc@umass.edu\">hpc@umass.edu</a>. We will do our best to reply as fast as possible!</p>');

-- --------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions webroot/panel/new_account.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
echo "<hr>";

echo "<label><input type='checkbox' id='chk_eula' name='eula' value='agree' required>
I have read and accept the <a target='_blank' href='" . $CONFIG["site"]["prefix"] . "/priv.php'>
Unity EULA</a></label>";
I have read and accept the <a target='_blank' href='" . $CONFIG["site"]["terms_of_service_url"] . "'>
Unity Terms of Service</a></label>";

echo "<br>";
echo "<input style='margin-top: 10px;' type='submit' value='Request Account'>";
Expand Down
16 changes: 0 additions & 16 deletions webroot/priv.php

This file was deleted.

Loading