diff --git a/content/resources/machine-usage-agreement/acceptable-and-unacceptable-use.md b/content/resources/machine-usage-agreement/acceptable-and-unacceptable-use.md index 29a25ea1..c23f9a23 100644 --- a/content/resources/machine-usage-agreement/acceptable-and-unacceptable-use.md +++ b/content/resources/machine-usage-agreement/acceptable-and-unacceptable-use.md @@ -5,3 +5,5 @@ title: Acceptable and Unacceptable Use The CSC machines are intended for research, personal projects, and general use in accordance with the aims of the CSC (see the [CSC Constitution](/about/constitution) for further details). Projects that are of interest to the CSC may be given special priority by the CSC Systems Committee. Users must adhere to the CSC's policies concerning machine usage. + +The same policies apply to the CSC Cloud resources. diff --git a/content/resources/machine-usage-agreement/club-accounts.md b/content/resources/machine-usage-agreement/club-accounts.md index 68ff3022..fa9a9b03 100644 --- a/content/resources/machine-usage-agreement/club-accounts.md +++ b/content/resources/machine-usage-agreement/club-accounts.md @@ -13,11 +13,13 @@ _Note: For the given section, any mention of the club, except in direct referenc Clubs are given accounts and provided with an e-mail and WWW pages, but are subject to the following to certain rules. They are as follows: -1. The club account is subject to all restrictions of a users account, except that it is a shareable account. +1. The club account is subject to all restrictions of a user account, except that it is a shareable account. 1. The club members must have regular user accounts on the CSC machine that the club account will be on. If the club member does not already have such an account, one will be created to allow the member to manage the club account. 1. The members of the club with access to the club account shall be known to the CSC Systems Administrator to ensure that these people are aware of this section of the user agreement. 1. The club members with access to the club account shall not grant access to any other members by any means that are available to them, other than approaching the CSC System Administrator and requesting the change of access. ## Responsibility and Accountability -The account is the responsibility of the members who have access. If the resources owned by the club account are found to be in violation of any policy/rule/law of any of, but not limited to, the Computer Science Club, MFCF, the University of Waterloo, or any relevant law enforcement agency, then the members with access will be held **equally** responsible for that action. +The account is the responsibility of the members who have access. If the resources owned by the club account are found to be in violation of any policy/rule/law of any of, but not limited to, the Computer Science Club, CSCF, the University of Waterloo, or any relevant law enforcement agency, then the members with access will be held **equally** responsible for that action. + +Club reps are required to read the [Club Hosting](https://wiki.csclub.uwaterloo.ca/Club_Hosting) page on the CSC Wiki when they first become a club rep, and thereafter at least once every term, and abide by any notices, warnings, recommendations and best practices provided on it. diff --git a/content/resources/machine-usage-agreement/definitions.md b/content/resources/machine-usage-agreement/definitions.md index 5816459e..5638d864 100644 --- a/content/resources/machine-usage-agreement/definitions.md +++ b/content/resources/machine-usage-agreement/definitions.md @@ -8,16 +8,16 @@ CSC CSC Network -- The network of computer hardware and peripherals owned by, rented to, on loan to, or otherwise under the control of the CSC. +- The network of computer hardware and peripherals owned by, rented to, on loan to, or otherwise under the control of the CSC, including everything under the `csclub.uwaterloo.ca` DNS zone. -MFCF +CSCF -- The [Math Faculty Computing Facility](http://www.math.uwaterloo.ca/mfcf/) at the University of Waterloo. +- The [Computer Science Computing Facility](https://uwaterloo.ca/computer-science-computing-facility/) at the University of Waterloo. Machine - Computer, terminal or other piece of hardware. -- Non-CSC machines include MFCF's xterms and printers. +- Non-CSC machines include CSCF's xterms and printers. Systems Committee @@ -40,3 +40,4 @@ Computing Resources - TTYs and pseudo-TTYs - Network bandwidth - Ports + - CSC Cloud Services diff --git a/content/resources/machine-usage-agreement/rights-of-syscom-and-exec.md b/content/resources/machine-usage-agreement/rights-of-syscom-and-exec.md index 141e175f..2e6dfac3 100644 --- a/content/resources/machine-usage-agreement/rights-of-syscom-and-exec.md +++ b/content/resources/machine-usage-agreement/rights-of-syscom-and-exec.md @@ -6,4 +6,6 @@ The Systems Committee may examine any files or programs believed to be out of co The Systems Committee may at any time revoke a user's permission to access an account provided that a written (possibly electronic) explanation is given. Cause for removal of access to an account includes, but is not limited to, violation of the machine usage policy. In the event of a dispute, a user whose account has been revoked may appeal to the CSC Executive for its reinstatement, as per the [CSC Constitution](/about/constitution). +The Systems Committee may delete a user's CSC Cloud resources when their CSC account expires, at its sole discretion. + The CSC Executive has the right to update any policy, including this one, with reasonable notice. diff --git a/content/resources/machine-usage-agreement/security.md b/content/resources/machine-usage-agreement/security.md index 2767f49c..7fbba79a 100644 --- a/content/resources/machine-usage-agreement/security.md +++ b/content/resources/machine-usage-agreement/security.md @@ -7,6 +7,6 @@ Users may not attempt to gain access to accounts other than those which they hav An account may only be used by the person assigned to it. *Do not tell your password to anybody, or let anyone else use your account*. Users should consider the security implications of their actions. For example: - Passwords for accounts on CSC machines should not be used on other machines -- Accounts not on MFCF or CSC machines should not be granted automatic access to CSC accounts (e.g. via .rhosts files). +- Accounts not on CSCF or CSC machines should not be granted automatic access to CSC accounts (e.g. via .rhosts files). The appropriate members of the systems committee must be notified immediately in the event that a security problem is found. Naturally, the problem should neither be exploited nor made public until it can be corrected. diff --git a/content/resources/machine-usage-agreement/summary.md b/content/resources/machine-usage-agreement/summary.md index eb23f2bd..28d2b817 100644 --- a/content/resources/machine-usage-agreement/summary.md +++ b/content/resources/machine-usage-agreement/summary.md @@ -6,14 +6,14 @@ This is a brief version of the usage policy. Everyone who receives an account on ## Use of accounts -- One person per account only. +- One person per account. - Usage intended for personal or course work. - Don't abuse system resources. - Use the machines in a respectful manner. ## Security -- Your `.rhosts` file should only contain your user IDs on CSC and MFCF machines. +- Your `.rhosts` file should only contain your user IDs on CSC and CSCF machines. - Don't use passwords that you use elsewhere, and *never* tell anyone your password. - If you find security holes, report them to the [Systems Committee](mailto:syscom@csclub.uwaterloo.ca). Intentional malpractice will not be tolerated. @@ -28,3 +28,4 @@ This is a brief version of the usage policy. Everyone who receives an account on - Don't do anything illegal, damaging, or unethical. - The executive team can change their policies with reasonable notice. - CS Club machines will not be up at all times, and may crash while you are using them. +- This document and its rules also apply to CSC Cloud resources. diff --git a/content/resources/machine-usage-agreement/user-agreement.md b/content/resources/machine-usage-agreement/user-agreement.md index 2dfea61a..3eb07d1c 100644 --- a/content/resources/machine-usage-agreement/user-agreement.md +++ b/content/resources/machine-usage-agreement/user-agreement.md @@ -2,7 +2,7 @@ title: User Agreement --- -I have read and understood the usage policy of 29 August 2007, and I agree to use my account(s) on the CSC network in accordance with this policy. I am responsible for all actions taken by anyone using this account. Furthermore, I accept full legal responsibility for all of the actions that I commit using the CSC network according to any and all applicable laws. +I have read and understood the CSC Usage Policy of 10 July 2022, and I agree to use my CSC account(s) in accordance with this policy. I am responsible for all actions taken by anyone using this account. Furthermore, I accept full legal responsibility for all of the actions that I commit using the CSC network according to any and all applicable laws. I understand that with little or no notice machines on the CSC network and resources on these machines may become unavailable. Machines may shut down while users are using them, and I will not hold the CSC responsible for lost time or data.