Skip to content

Commit 0984e0b

Browse files
authored
Merge pull request #182 from UnityHPC/docs-eula
get rid of policy page / priv.php, allow external link instead
2 parents 89150e1 + 9f7265a commit 0984e0b

File tree

5 files changed

+5
-22
lines changed

5 files changed

+5
-22
lines changed

Diff for: defaults/config.ini.default

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ name = "Unity Cluster" ; Name of the website
1111
url = "https://127.0.0.1:8000/" ; URL of the website
1212
description = "The Unity Web Portal is a lightweight HPC cluster front-end" ; Description of the website
1313
logo = "logo.png" ; path to logo file, in the webroot/assets/branding folder
14+
terms_of_service_url = "https://github.com" ; this can be external or a portal page created with "content management"
1415

1516
[ldap]
1617
uri = "ldap://identity" ; URI of remote LDAP server
@@ -100,4 +101,3 @@ url = "https://hooks.slack.com/services/T04BB3N3M26/B050A55CBNX/IGm1YA0VhjczAfs5
100101
[page] ; which sql objects to use for the content on these pages
101102
home = "home"
102103
support = "support"
103-
policy = "policy"

Diff for: resources/templates/footer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="footerBlock">
2020
<span>Unity Web Portal Version <a target="_blank" href="<?php echo $CONFIG["upstream"]["repo"]; ?>">
2121
<?php echo $CONFIG["upstream"]["version"]; ?></a></span>&nbsp;|
22-
<a href="<?php echo $CONFIG["site"]["prefix"]; ?>/priv.php">Site Policy</a>
22+
<a href="<?php echo $CONFIG["site"]["terms_of_service_url"]; ?>">Terms of Service</a>
2323
</div>
2424
</footer>
2525

Diff for: tools/docker-dev/sql/bootstrap.sql

+1-2
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ CREATE TABLE `pages` (
175175
--
176176

177177
INSERT INTO `pages` (`id`, `page`, `content`) VALUES
178-
(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:[email protected]\">[email protected]</a>. We will do our best to reply as fast as possible!</p>'),
179-
(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:[email protected]\">[email protected]</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>');
178+
(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:[email protected]\">[email protected]</a>. We will do our best to reply as fast as possible!</p>');
180179

181180
-- --------------------------------------------------------
182181

Diff for: webroot/panel/new_account.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
echo "<hr>";
7575

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

8080
echo "<br>";
8181
echo "<input style='margin-top: 10px;' type='submit' value='Request Account'>";

Diff for: webroot/priv.php

-16
This file was deleted.

0 commit comments

Comments
 (0)