From 53cae81716564a6eadc386ea2aaf61954d6fb9ff Mon Sep 17 00:00:00 2001 From: Sean Vernon Date: Sun, 10 Nov 2019 14:48:08 -0800 Subject: [PATCH 1/4] Fixed file --- .../docs/templates/docs/partials/account.md | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 ocfweb/docs/templates/docs/partials/account.md diff --git a/ocfweb/docs/templates/docs/partials/account.md b/ocfweb/docs/templates/docs/partials/account.md new file mode 100644 index 000000000..f0a657af1 --- /dev/null +++ b/ocfweb/docs/templates/docs/partials/account.md @@ -0,0 +1,37 @@ +What Your OCF Account Gets You + +Many think of the Open Computing Facility as an on-campus resource for free printing. While this is true, and printing is certainly our most-demanded service (we print hundreds of thousands of pages per year), there are plenty of other great services provided by the OCF, which come free with your account! + +## Free Computing + +The OCF was founded to provide all members of the Cal campus community with computing resources. Anytime we're open, all members of the community are welcome to use the computers for any reason – not just to print. All of the computers in the OCF run Linux as the operating system and have a variety of useful (although potentially unfamiliar) applications installed. Because of our committment to free, open-source software, we do not provide access to application suites such as Microsoft Office or Adobe Creative Cloud; instead, we provide free alternatives. +* Google Chrome, Firefox, and Brave are all installed, allowing users to choose their preferred web browser. +* The LibreOffice suite is installed as an alternative to Microsoft Office. It is mostly cross-compatible with Office files, meaning one can import or export .docx/.pptx/.xlsx files. Users can also use Google Docs from a web browser. +* GIMP (GNU Image Manipulation Program) is provided as an alternative to Adobe Photoshop, and Inkscape replaces Adobe Illustrator. For animation and 3D modeling, we provide access to Blender. +* Rather than iTunes/QuickTime or Windows Media Player, users can access music or video files using VLC. +* The pre-installed text editor is Atom, and the pre-installed IDE is Visual Studio Code. +* The OCF does not currently provide a true replacement for Adobe Acrobat; PDFs can be opened with the Document Viewer and edited using other applications. +Most of these applications can be found on the desktop, and all applications can be accessed from the menu in the top-left corner of the screen, analogous to the Start menu in Windows. + +## Persistent File Storage + +When you log out of one of our desktop computers, any files you saved to that computer will be erased. This is because most files saved to these computers are immediately printed, so there is no need to take up disk space holding onto them. However, some users may wish to have access to their files every time they log in to an OCF desktop. As part of your OCF account, you gain access to 5 GB of free file storage on OCF servers. This file storage is accessible by clicking on the "OCF File Storage" icon on any desktop computer or by SSHing into our account server (tsunami.ocf.berkeley.edu, and if you don't know what SSH means, read [our guide to the shell](LINK-GOES-HERE)). + +Files placed in the "OCF File Storage" folder are accessible from any desktop computer and are saved even after you log out, whereas files placed in the "Home" folder are local to that computer and are deleted upon log-out. The "OCF File Storage" folder should contain a folder called "public_html", which is used for web hosting – see below. + +## Free Printing + +Of course, printing is central to many users' experiences with the OCF. By signing up for an account, you get 200 free sides of printing (200 pages single-sided, 100 pages double-sided). We print black-and-white only, in economode (meaning the ink may be a bit lighter than expected). Users are limited to 20 sides of printing per day. We ask that users download or export any documents they wish to print as PDFs first, as these work best with our print server. + +## Web Hosting + +When you create an OCF account, you also create a subdomain on our website: ocf.berkeley.edu/\~yourusername. You can create your own website using HTML/CSS/JS or use a system like WordPress or Django. Alternatively, you can use your website as file storage. Either way, your website is sourced directly from the aforementioned "public_html" folder – meaning this is the folder in which you should place all content for your website. More technical information can be found at [our web hosting page](https://www.ocf.berkeley.edu/docs/services/web/). + +If you are a signatory of a student group and would like to request a \*.berkeley.edu website, you will need to create a group account and complete a few steps before making your request. Instructions can be found on [our vhost page](https://www.ocf.berkeley.edu/docs/services/vhost/). + +## Miscellaneous + +Various other services are also provided by the OCF to all users, such as access to our high-performance computing cluster, a personal MySQL database, access to our software mirrors, and more. For a full list and futher (more technical) documentation, visit [our services page](https://www.ocf.berkeley.edu/docs/services/). + +### Account Conduct +Bear in mind that access to the OCF's services, including free printing, are conditional on your conduct. Failure to comply with account conduct policies may lead to your account being disabled. For more information, visit [our conduct page](https://www.ocf.berkeley.edu/docs/services/account/account-policies/). From ae5067a2861ee835a5aba9cf6bb19275c6be6b90 Mon Sep 17 00:00:00 2001 From: seanvernon Date: Sun, 17 Nov 2019 12:46:14 -0800 Subject: [PATCH 2/4] Updated account.md as per pr561 --- .../docs/templates/docs/partials/account.md | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/ocfweb/docs/templates/docs/partials/account.md b/ocfweb/docs/templates/docs/partials/account.md index f0a657af1..545369d55 100644 --- a/ocfweb/docs/templates/docs/partials/account.md +++ b/ocfweb/docs/templates/docs/partials/account.md @@ -1,37 +1,35 @@ -What Your OCF Account Gets You - Many think of the Open Computing Facility as an on-campus resource for free printing. While this is true, and printing is certainly our most-demanded service (we print hundreds of thousands of pages per year), there are plenty of other great services provided by the OCF, which come free with your account! +Note: the following information applies to individual accounts, not group accounts. To request an account for your student group, or for information on student group web hosting, check out [our group account page](https://www.ocf.berkeley.edu/docs/services/vhost/). + ## Free Computing -The OCF was founded to provide all members of the Cal campus community with computing resources. Anytime we're open, all members of the community are welcome to use the computers for any reason – not just to print. All of the computers in the OCF run Linux as the operating system and have a variety of useful (although potentially unfamiliar) applications installed. Because of our committment to free, open-source software, we do not provide access to application suites such as Microsoft Office or Adobe Creative Cloud; instead, we provide free alternatives. -* Google Chrome, Firefox, and Brave are all installed, allowing users to choose their preferred web browser. -* The LibreOffice suite is installed as an alternative to Microsoft Office. It is mostly cross-compatible with Office files, meaning one can import or export .docx/.pptx/.xlsx files. Users can also use Google Docs from a web browser. +The OCF was founded to provide all members of the Cal campus community with computing resources. Anytime we're open, all members of the community are welcome to use the computers for any reason – not just to print. All of the computers in the OCF run Linux and have a variety of useful applications pre-installed. +* Google Chrome, Firefox, and Brave are all installed, allowing you to choose your preferred web browser. +* The LibreOffice suite is installed as an alternative to Microsoft Office. It is mostly cross-compatible with Office files, meaning one can import or export .docx/.pptx/.xlsx files. You can also use Google Docs from a web browser. * GIMP (GNU Image Manipulation Program) is provided as an alternative to Adobe Photoshop, and Inkscape replaces Adobe Illustrator. For animation and 3D modeling, we provide access to Blender. -* Rather than iTunes/QuickTime or Windows Media Player, users can access music or video files using VLC. -* The pre-installed text editor is Atom, and the pre-installed IDE is Visual Studio Code. -* The OCF does not currently provide a true replacement for Adobe Acrobat; PDFs can be opened with the Document Viewer and edited using other applications. -Most of these applications can be found on the desktop, and all applications can be accessed from the menu in the top-left corner of the screen, analogous to the Start menu in Windows. +* Rather than iTunes/QuickTime or Windows Media Player, you can access music or video files using VLC. +* Pre-installed IDEs include Atom and Visual Studio Code. +* The default PDF utility is Document Viewer, which can be used to view, print, and edit PDFs. +* Steam is installed, if you would like to play video games. +Most of these applications can be found on the desktop, and all applications can be accessed from the menu in the top-left corner of the screen, analogous to the Start menu in Windows. We also offer three computers with dedicated scanners, and one with a CD/DVD reader. ## Persistent File Storage -When you log out of one of our desktop computers, any files you saved to that computer will be erased. This is because most files saved to these computers are immediately printed, so there is no need to take up disk space holding onto them. However, some users may wish to have access to their files every time they log in to an OCF desktop. As part of your OCF account, you gain access to 5 GB of free file storage on OCF servers. This file storage is accessible by clicking on the "OCF File Storage" icon on any desktop computer or by SSHing into our account server (tsunami.ocf.berkeley.edu, and if you don't know what SSH means, read [our guide to the shell](LINK-GOES-HERE)). +When you log out of one of our desktop computers, any files you saved to that computer will be erased. This is because most files saved to these computers are immediately printed, so there is no need to take up disk space holding onto them. However, some users may wish to have access to their files every time they log in to an OCF desktop. As part of your OCF account, you gain access to 15 GB of free file storage on OCF servers. This file storage is accessible by clicking on the "OCF File Storage" icon on any desktop computer or by SSHing into our account server (tsunami.ocf.berkeley.edu, and if you don't know what SSH means, read [our guide to the shell](LINK-GOES-HERE)). Files placed in the "OCF File Storage" folder are accessible from any desktop computer and are saved even after you log out, whereas files placed in the "Home" folder are local to that computer and are deleted upon log-out. The "OCF File Storage" folder should contain a folder called "public_html", which is used for web hosting – see below. ## Free Printing -Of course, printing is central to many users' experiences with the OCF. By signing up for an account, you get 200 free sides of printing (200 pages single-sided, 100 pages double-sided). We print black-and-white only, in economode (meaning the ink may be a bit lighter than expected). Users are limited to 20 sides of printing per day. We ask that users download or export any documents they wish to print as PDFs first, as these work best with our print server. +By signing up for an account, you get 200 free sides of printing (200 pages single-sided, 100 pages double-sided). We print black-and-white only, in economode (meaning the ink may be a bit lighter than expected). You are limited to 20 sides of printing per day. We ask that you download or export any documents they wish to print as PDFs first, as these work best with our print server. ## Web Hosting -When you create an OCF account, you also create a subdomain on our website: ocf.berkeley.edu/\~yourusername. You can create your own website using HTML/CSS/JS or use a system like WordPress or Django. Alternatively, you can use your website as file storage. Either way, your website is sourced directly from the aforementioned "public_html" folder – meaning this is the folder in which you should place all content for your website. More technical information can be found at [our web hosting page](https://www.ocf.berkeley.edu/docs/services/web/). +When you create an OCF account, you also gain acccess to web hosting space on our domain: ocf.berkeley.edu/\~yourusername. You can create your own website using HTML/CSS/JS or use a system like WordPress or Django. Alternatively, you can use your website as file storage. For more technical information on building your website, check out [our web hosting page](https://www.ocf.berkeley.edu/docs/services/web/). If you are a signatory of a student group and would like to request a \*.berkeley.edu website, you will need to create a group account and complete a few steps before making your request. Instructions can be found on [our vhost page](https://www.ocf.berkeley.edu/docs/services/vhost/). ## Miscellaneous -Various other services are also provided by the OCF to all users, such as access to our high-performance computing cluster, a personal MySQL database, access to our software mirrors, and more. For a full list and futher (more technical) documentation, visit [our services page](https://www.ocf.berkeley.edu/docs/services/). - -### Account Conduct -Bear in mind that access to the OCF's services, including free printing, are conditional on your conduct. Failure to comply with account conduct policies may lead to your account being disabled. For more information, visit [our conduct page](https://www.ocf.berkeley.edu/docs/services/account/account-policies/). +Various other services are also provided by the OCF to all users, such as access to our high-performance computing cluster, Mastadon instance, software mirrors, a personal MySQL database, and more. For a full list and futher (more technical) documentation, visit [our services page](https://www.ocf.berkeley.edu/docs/services/). From 57af2d0997aafb076691000af4924ffaf5e10750 Mon Sep 17 00:00:00 2001 From: seanvernon Date: Tue, 3 Dec 2019 10:31:31 -0800 Subject: [PATCH 3/4] Updated account page, will now make group page --- .../docs/templates/docs/partials/account.md | 77 +++++++++++++++---- 1 file changed, 62 insertions(+), 15 deletions(-) diff --git a/ocfweb/docs/templates/docs/partials/account.md b/ocfweb/docs/templates/docs/partials/account.md index 545369d55..e58a05f8b 100644 --- a/ocfweb/docs/templates/docs/partials/account.md +++ b/ocfweb/docs/templates/docs/partials/account.md @@ -1,35 +1,82 @@ -Many think of the Open Computing Facility as an on-campus resource for free printing. While this is true, and printing is certainly our most-demanded service (we print hundreds of thousands of pages per year), there are plenty of other great services provided by the OCF, which come free with your account! +Many think of the Open Computing Facility as an on-campus resource for free +printing. While this is true, and printing is certainly our most-demanded +service (we print hundreds of thousands of pages per year), there are plenty of +other great services provided by the OCF, which come free with your account! -Note: the following information applies to individual accounts, not group accounts. To request an account for your student group, or for information on student group web hosting, check out [our group account page](https://www.ocf.berkeley.edu/docs/services/vhost/). +Note: the following information applies to individual accounts, not group +accounts. To request an account for your student group, or for information on +student group web hosting, check out +[our group account page](LINK-GOES-HERE). ## Free Computing -The OCF was founded to provide all members of the Cal campus community with computing resources. Anytime we're open, all members of the community are welcome to use the computers for any reason – not just to print. All of the computers in the OCF run Linux and have a variety of useful applications pre-installed. -* Google Chrome, Firefox, and Brave are all installed, allowing you to choose your preferred web browser. -* The LibreOffice suite is installed as an alternative to Microsoft Office. It is mostly cross-compatible with Office files, meaning one can import or export .docx/.pptx/.xlsx files. You can also use Google Docs from a web browser. -* GIMP (GNU Image Manipulation Program) is provided as an alternative to Adobe Photoshop, and Inkscape replaces Adobe Illustrator. For animation and 3D modeling, we provide access to Blender. -* Rather than iTunes/QuickTime or Windows Media Player, you can access music or video files using VLC. +The OCF was founded to provide all members of the Cal campus community with +computing resources. Anytime we're open, all members of the community are +welcome to use the computers for any reason – not just to print. All of the +computers in the OCF run Linux and have a variety of useful applications +pre-installed. +* Google Chrome, Firefox, and Brave are all installed, allowing you to choose +your preferred web browser. +* The LibreOffice suite is installed as an alternative to Microsoft Office. It +is mostly cross-compatible with Office files, meaning one can import or export +.docx/.pptx/.xlsx files. You can also use Google Docs from a web browser. +* GIMP (GNU Image Manipulation Program) is provided as an alternative to Adobe +Photoshop, and Inkscape replaces Adobe Illustrator. For animation and 3D +modeling, we provide access to Blender. +* Rather than iTunes/QuickTime or Windows Media Player, you can access music or +video files using VLC. * Pre-installed IDEs include Atom and Visual Studio Code. -* The default PDF utility is Document Viewer, which can be used to view, print, and edit PDFs. +* The default PDF utility is Document Viewer, which can be used to view, print, +and edit PDFs. * Steam is installed, if you would like to play video games. -Most of these applications can be found on the desktop, and all applications can be accessed from the menu in the top-left corner of the screen, analogous to the Start menu in Windows. We also offer three computers with dedicated scanners, and one with a CD/DVD reader. +Most of these applications can be found on the desktop, and all applications +can be accessed from the menu in the top-left corner of the screen, analogous +to the Start menu in Windows. We also offer three computers with dedicated +scanners, and one with a CD/DVD reader. ## Persistent File Storage -When you log out of one of our desktop computers, any files you saved to that computer will be erased. This is because most files saved to these computers are immediately printed, so there is no need to take up disk space holding onto them. However, some users may wish to have access to their files every time they log in to an OCF desktop. As part of your OCF account, you gain access to 15 GB of free file storage on OCF servers. This file storage is accessible by clicking on the "OCF File Storage" icon on any desktop computer or by SSHing into our account server (tsunami.ocf.berkeley.edu, and if you don't know what SSH means, read [our guide to the shell](LINK-GOES-HERE)). +When you log out of one of our desktop computers, any files you saved to that +computer will be erased. This is because most files saved to these computers +are immediately printed, so there is no need to take up disk space holding onto +them. However, some users may wish to have access to their files every time +they log in to an OCF desktop. As part of your OCF account, you gain access to +15 GB of free file storage on OCF servers. This file storage is accessible by +clicking on the "OCF File Storage" icon on any desktop computer or by +[SSHing into our account server](https://www.ocf.berkeley.edu/docs/services/shell/). -Files placed in the "OCF File Storage" folder are accessible from any desktop computer and are saved even after you log out, whereas files placed in the "Home" folder are local to that computer and are deleted upon log-out. The "OCF File Storage" folder should contain a folder called "public_html", which is used for web hosting – see below. +Files placed in the "OCF File Storage" folder are accessible from any desktop +computer and are saved even after you log out, whereas files placed in the +"Home" folder are local to that computer and are deleted upon log-out. The "OCF +File Storage" folder should contain a folder called "public_html", which is +used for web hosting – see below. ## Free Printing -By signing up for an account, you get 200 free sides of printing (200 pages single-sided, 100 pages double-sided). We print black-and-white only, in economode (meaning the ink may be a bit lighter than expected). You are limited to 20 sides of printing per day. We ask that you download or export any documents they wish to print as PDFs first, as these work best with our print server. +By signing up for an account, you get 200 free sides of printing (200 pages +single-sided, 100 pages double-sided). We print black-and-white only, in +economode (meaning the ink may be a bit lighter than expected). You are limited +to 20 sides of printing per day. We ask that you download or export any +documents they wish to print as PDFs first, as these work best with our print +server. ## Web Hosting -When you create an OCF account, you also gain acccess to web hosting space on our domain: ocf.berkeley.edu/\~yourusername. You can create your own website using HTML/CSS/JS or use a system like WordPress or Django. Alternatively, you can use your website as file storage. For more technical information on building your website, check out [our web hosting page](https://www.ocf.berkeley.edu/docs/services/web/). +When you create an OCF account, you also gain acccess to web hosting space on +our domain: ocf.berkeley.edu/\~yourusername. You can create your own website +using HTML/CSS/JS or use a system like WordPress or Django. Alternatively, you +can use your website as file storage. For more technical information on +building your website, check out +[our web hosting page](https://www.ocf.berkeley.edu/docs/services/web/). -If you are a signatory of a student group and would like to request a \*.berkeley.edu website, you will need to create a group account and complete a few steps before making your request. Instructions can be found on [our vhost page](https://www.ocf.berkeley.edu/docs/services/vhost/). +If you are a signatory of a student group and would like to request a website +under the berkeley.edu domain (i.e. ocf.berkeley.edu) you will need to create a +group account and complete a few steps before making your request. Instructions +can be found on [our vhost page](https://www.ocf.berkeley.edu/docs/services/vhost/). ## Miscellaneous -Various other services are also provided by the OCF to all users, such as access to our high-performance computing cluster, Mastadon instance, software mirrors, a personal MySQL database, and more. For a full list and futher (more technical) documentation, visit [our services page](https://www.ocf.berkeley.edu/docs/services/). +The OCF provides various other services to all users, such as access to our +high-performance computing cluster, Mastadon instance, software mirrors, a +personal MySQL database, and more. For a full list and futher (more technical) +documentation, visit [our services page](https://www.ocf.berkeley.edu/docs/services/). From 175bacea4b6a0f40680800379929dbea136a1bc9 Mon Sep 17 00:00:00 2001 From: seanvernon Date: Thu, 5 Dec 2019 10:53:31 -0800 Subject: [PATCH 4/4] Added group_account.md --- .../templates/docs/partials/group_account.md | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 ocfweb/docs/templates/docs/partials/group_account.md diff --git a/ocfweb/docs/templates/docs/partials/group_account.md b/ocfweb/docs/templates/docs/partials/group_account.md new file mode 100644 index 000000000..de1f2cc12 --- /dev/null +++ b/ocfweb/docs/templates/docs/partials/group_account.md @@ -0,0 +1,41 @@ +If you are a signatory of a Registered Student Organization (RSO) or other +eligible group here at Berkeley, then you are can create a group account for +your organization. Group accounts may not be used for printing, but do provide +your RSO with access to other services, such as web and mail hosting. + +To request a group account, please come to +[OCF staff hours](ocf.io/staff-hours). If you're not sure if your group is +eligible for a group account, refer to our +[eligibility page](https://www.ocf.berkeley.edu/docs/membership/eligibility/#h2_groups). + +## Web Hosting (group.berkeley.edu) + +When you create any OCF account, you gain access to web hosting space on our +domain: ocf.berkeley.edu/\~yourusername. However, eligible groups may also +request their own subdomains of the berkeley.edu domain, i.e. +group.berkeley.edu. This allows you to create a website for your student group. +There are various requirements set by the University and the OCF for such +websites; for instructions on setting up your website, visit our +[web hosting documentation](ocf.io/vhost) or visit the lab during +[staff hours](ocf.io/staff-hours). + +## Mail Hosting (president@group.berkeley.edu) + +Once you've set up your website, you can also enable email forwarding so you +can send and receive emails from arbitrary addresses on your domain, i.e. +president@group.berkeley.edu. Emails sent to these addresses will be forwarded +to your @berkeley.edu student account, and if desired, you can also send email +from these addresses by following +[these instructions](https://www.ocf.berkeley.edu/docs/services/vhost/mail/gmail/). + +Your custom email addresses can be easily managed online, without having to +come to OCF staff hours. For more information, visit our +[mail hosting documentation](https://www.ocf.berkeley.edu/docs/services/vhost/mail/). + +## Free Computing and File Storage + +Like any other account, group accounts allow you to sign into OCF computers, +SSH into our account server, and store up to 15 GB indefinitely. The main +service which is not available to group accounts is free printing. For +information about other services available to all accounts, such as free +computing and file storage, visit [our account page](LINK-GOES-HERE).