SRCF · alethkit · May 8, 2022 · Aug 4, 2022 · Aug 9, 2022 · Sep 10, 2022
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 /inc/vms.html
 /inc/motd.txt
 /inc/counts.html
+/inc/grouplist.html
 /inc/ubuntuversion.html
 
 membershipgraph.png

diff --git a/.well-known/security.txt b/.well-known/security.txt
@@ -5,6 +5,6 @@
 # others.
 #
 Contact: mailto:[email protected]
-Expires: 2024-11-11T13:00:00.000Z
+Expires: 2026-11-11T13:00:00.000Z
 Preferred-Languages: en
 Canonical: https://www.srcf.net/.well-known/security.txt
diff --git a/_srcf/inc/vars.html b/_srcf/inc/vars.html
@@ -1,2 +1,3 @@
 <!--#set var="domain_web" value="https://www.srcf.net" -->
 <!--#set var="domain_control" value="https://control.srcf.net" -->
+<!--#set var="domain_docs" value="https://docs.srcf.net" -->
diff --git a/about.html b/about.html
@@ -10,18 +10,18 @@ <h3 id="what">What is the SRCF?</h3>
 
 <p>The SRCF is the University of Cambridge's Student-Run Computing
 Facility. We provide web hosting, shell accounts and various other
-computing services to members of the University and groups such as
+computing services to members of the University (including alumni) and groups such as
 University societies. We are a University society, registered with
 the Junior Proctor. As such we are not formally supported by the 
 University Administration in any way; instead the service is maintained 
 by a group of volunteers.</p>
 
 <h3 id="who">Who are the SRCF?</h3>
 
-<p>The SRCF executive &mdash; the <a href="/committee">committee</a> and sysadmin (system administration) team &mdash; consists of current and former University of Cambridge students.
+<p>The SRCF executive &mdash; the <a href="committee">committee</a> and sysadmin (system administration) team &mdash; consists of current and former University of Cambridge students.
 We hold elections for the committee positions every year at our AGM, according to our <a href="constitution">constitution</a>.
-Any member of the University (staff or student) can <a href="/signup">register</a> to become a lifetime member of the SRCF, and so use our services.
-We do not charge any membership fees, or require anything from our members beyond that they abide by our <a href="/tos">Terms of Service</a>.</p>
+Any member of the University (staff or student) can <a href="signup">register</a> to become a lifetime member of the SRCF, and so use our services.
+We do not charge any membership fees, or require anything from our members beyond that they abide by our <a href="tos">Terms of Service</a>.</p>
 
 <h3 id="why">Why does the SRCF exist?</h3>
 
@@ -44,7 +44,7 @@ <h3 id="help">You guys are doing a great job.  How can I help you
 
 <p>We always welcome donations &mdash; as we don't charge for our services,
 the future of the SRCF depends on the donations it receives. If you want to make a donation, please visit <a
-href="https://www.srcf.net/donate">this page</a></p>
+href="donate">this page</a></p>
 
 <p>If you want to donate some time and experience to help us out, then
 why not join our support team? This is an email-based help list for

diff --git a/code-of-conduct.html b/code-of-conduct.html
@@ -6,8 +6,8 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>SRCF Code of Conduct</title>
-  <link rel="stylesheet" href="https://www.srcf.net/_srcf/vendor/css/bootstrap.min.css" />
-  <link rel="stylesheet" href="https://www.srcf.net/_srcf/srcf-bs.css" />
+  <link rel="stylesheet" href="/_srcf/vendor/css/bootstrap.min.css" />
+  <link rel="stylesheet" href="/_srcf/srcf-bs.css" />
 </head>
 
 <body>

diff --git a/committee.html b/committee.html
@@ -7,19 +7,19 @@ <h2>Committee</h2>
     <div class="card">
       <div class="card-body">
         <h4 class="card-title">Committee members</h4>
-        <p>As of the Annual General Meeting held on Saturday 20<sup>th</sup> March 2021,
+        <p>As of the Extraordinary General Meeting held on Sunday 28<sup>th</sup> April 2024,
         the current SRCF committee consists of:</p>
         <ul>
-          <li><a href="mailto:[email protected]">Chair</a> &ndash; Matias Silva</li>
-          <li><a href="mailto:[email protected]">Secretary</a> &ndash; Andrew Jenkins</li>
-          <li><a href="mailto:[email protected]">Junior Treasurer</a> &ndash; Patrick Connolly</li>
-          <li><a href="mailto:[email protected]">Publicity</a> &ndash; David Bai</li>
+          <li><a href="mailto:[email protected]">Chair</a> &ndash; Mathew Blowers</li>
+          <li><a href="mailto:[email protected]">Secretary</a> &ndash; Bekalu Terefe-Zenebe</li>
+          <li><a href="mailto:[email protected]">Junior Treasurer</a> &ndash; Max Smith</li>
+          <li><a href="mailto:[email protected]">Publicity</a> &ndash; Vacant</li>
         </ul>
         <p>They may be contacted individually as above, or collectively at <a
         href="mailto:[email protected]">[email protected]</a>.</p>
         <p>If you are interested in running for any of the above positions, but
         you want to know more about what is involved, you might want to read our
-        page about <a href="/roles">roles in the SRCF</a>.</p>
+        page about <a href="roles">roles in the SRCF</a>.</p>
         <p>The <a href="mailto:[email protected]">senior
         treasurer</a> is Bob Dowling.</p>
       </div>
@@ -39,6 +39,26 @@ <h5>-</h5>
           <li>Publicity &ndash; </li>
         </ul>
         -->
+        <h5>2023-2024</h5>
+        <ul>
+          <li>Chair &ndash; James Steiner</li>
+          <li>Secretary &ndash; Nils Andre</li>
+          <li>Junior Treasurer &ndash; Mathew Blowers</li>
+          <li>Publicity &ndash; Brychan Thomas</li>
+        </ul>
+        <h5>2022-23</h5>
+        <ul>
+          <li>Chair &ndash; Eleanor Clifford</li>
+          <li>Secretary &ndash; James Steiner</li>
+          <li>Junior Treasurer &ndash; Matias Silva</li>
+        </ul>
+        <h5>2021-22</h5>
+        <ul>
+          <li>Chair &ndash; Matias Silva</li>
+          <li>Secretary &ndash; Andrew Jenkins</li>
+          <li>Junior Treasurer &ndash; Patrick Connolly</li>
+          <li>Publicity &ndash; David Bai</li>
+        </ul>
         <h5>2020-2021</h5>
         <ul>
           <li>Chair &ndash; John-Joseph Gray</li>
@@ -219,16 +239,32 @@ <h4 class="card-title">System administrators</h4>
           </thead>
           <tbody>
             <tr>
-              <td>Daniel Carter</td>
-              <td>2020</td>
+              <td>Toby Clifton</td>
+              <td>2024</td>
             </tr>
             <tr>
-              <td>Harrison Pitcher</td>
-              <td>2019</td>
+              <td>Cameron Robey</td>
+              <td>2022</td>
             </tr>
             <tr>
-              <td>Jefferson Edralin Chua</td>
-              <td>2019</td>
+              <td>Naunidh Dua</td>
+              <td>2022</td>
+            </tr>
+            <tr>
+              <td>Mikel Bober-Irizar</td>
+              <td>2022</td>
+            </tr>
+            <tr>
+              <td>Andrei Popescu</td>
+              <td>2022</td>
+            </tr>
+            <tr>
+              <td>Eleanor Clifford</td>
+              <td>2022</td>
+            </tr>
+            <tr>
+              <td>Daniel Carter</td>
+              <td>2020</td>
             </tr>
             <tr>
               <td>Dimitrije Erdeljan</td>
@@ -242,10 +278,6 @@ <h4 class="card-title">System administrators</h4>
               <td>Edwin Bahrami Balani</td>
               <td>2017</td>
             </tr>
-            <tr>
-              <td>Dexter Chua</td>
-              <td>2015</td>
-            </tr>
             <tr>
               <td>Richard Allitt</td>
               <td>2014</td>
@@ -295,6 +327,14 @@ <h4 class="card-title">Previous sysadmins</h4>
               <td>Timo Wilken</td>
               <td>2020-2021</td>
             </tr>
+            <tr>
+              <td>Harrison Pitcher</td>
+              <td>2019-2022</td>
+            </tr>
+            <tr>
+              <td>Jefferson Edralin Chua</td>
+              <td>2019-2022</td>
+            </tr>
             <tr>
               <td>Olivier Wilkinson</td>
               <td>2019-2020</td>
@@ -303,6 +343,10 @@ <h4 class="card-title">Previous sysadmins</h4>
               <td>Sam Sully</td>
               <td>2018-2020</td>
             </tr>
+            <tr>
+              <td>Dexter Chua</td>
+              <td>2015-2024</td>
+            </tr>
             <tr>
               <td>Matthew Ireland</td>
               <td>2015-2020</td>

diff --git a/contact.html b/contact.html
@@ -2,30 +2,46 @@
 <!--#include virtual="inc/header.html" -->
 <h2>Contact addresses</h2>
 
-<div class="card">
-  <div class="card-body">
-    <h4 class="card-title">Getting in touch about a site under <code>.user.srcf.net</code> or <code>.soc.srcf.net</code>?</h4>
-    <p>The SRCF hosts many user websites on its systems, and we provide built-in domains of the form
-    <i><span class="var">CRSid</span>.user.srcf.net</i> or <i><span class="var">acronym</span>.soc.srcf.net</i>.</p>
-    <p><strong>The SRCF itself is not immediately responsible for content under these domains.</strong></p>
-    <p>In the first instance, you should direct queries to the owners of the relevant account as follows:</p>
-    <ul>
-      <li>Websites like <b><span class="var">spqr2</span>.user.srcf.net</b>: emails to <b><span class="var">spqr2</span>@srcf.net</b>.</li>
-      <li>Websites like <b><span class="var">cuxs</span>.soc.srcf.net</b>: emails to <b><span class="var">cuxs</span>[email protected]</b>.</li>
-    </ul>
-    <p>For communications relating to infringing copyrighted material or other abuse, please also CC
-    <a href="mailto:[email protected]">[email protected]</a>.</p>
-    <p>We also host websites on <i>custom domains</i>, which do not end in <code>.srcf.net</code>.  Please contact the system administrators
-    at <a href="mailto:[email protected]">[email protected]</a> if you're getting in touch about a website hosted by
-    us under a custom domain and are unsure how to reach the site's owners.</p>
+<div class="card border-warning">
+  <div class="card-header bg-warning">
+    <h4 class="card-title mb-0">Before getting in touch...</h4>
+  </div>
+  <div class="card-body row">
+    <div class="col-lg-6">
+      <p>
+        Queries about user content of websites on a <b>.user.srcf.net</b>
+        or <b>.soc.srcf.net</b> subdomain, or requests for access to group
+        accounts, should be directed to
+        <a href="<!--#if expr="${domain_docs}" --><!--#echo var="domain_docs" --><!--#endif -->/reference/common-requests/">the owners of those accounts</a>.
+      </p>
+      <p>
+        Please review our
+        <a href="<!--#if expr="${domain_docs}" --><!--#echo var="domain_docs" --><!--#endif -->/reference/common-requests/">common requests</a>,
+        as your query may already be answered or explained there.
+      </p>
+    </div>
+    <div class="col-lg-6">
+      <p>
+        Changes to your own accounts (including password resets, account
+        reactivation, group account handover, updating personal details
+        and so on) can be done using the
+        <a href="<!--#if expr="${domain_control}" --><!--#echo var="domain_control" --><!--#endif -->">control panel</a>.
+      </p>
+      <p class="mb-0">
+        For technical help and support, our
+        <a href="<!--#if expr="${domain_docs}" --><!--#echo var="domain_docs" --><!--#endif -->">documentation</a>
+        describes how to use our services, and includes tutorials for
+        commonly used software like WordPress and Drupal.
+      </p>
+    </div>
   </div>
 </div>
 
 <div class="row">
   <div class="col-md-6">
     <div class="card">
       <div class="card-body">
-        <h4 class="card-title">Support team</h4>
+        <h4 class="card-title">Support and documentation</h4>
         <p>Technical assistance:</p>
         <ul>
           <li>how to upload web pages</li>
@@ -35,7 +51,8 @@ <h4 class="card-title">Support team</h4>
         </ul>
       </div>
       <div class="card-footer">
-        <a class="btn btn-outline-primary" href="https://docs.srcf.net">Get help</a>
+        <a class="btn btn-outline-primary" href="mailto:[email protected]">[email protected]</a>
+        <a class="btn btn-outline-secondary" href="<!--#if expr="${domain_docs}" --><!--#echo var="domain_docs" --><!--#endif -->/">docs.srcf.net</a>
       </div>
     </div>
     <div class="card">
@@ -47,12 +64,6 @@ <h4 class="card-title">System administrators</h4>
           <li>installing new software</li>
           <li>takedowns e.g. copyright infringement</li>
         </ul>
-        <p class="font-italic">
-        Note that many account actions, such as resetting passwords, adding
-        additional services, updating personal details, <i>etc.</i> can now be carried
-        out on our
-        <a href="<!--#if expr="${domain_control}" --><!--#echo var="domain_control" --><!--#endif -->">Control Panel</a>.
-        </p>
         <p>Reporting security issues:</p>
         <ul>
           <li>hacked accounts</li>

diff --git a/donate/index.html b/donate/index.html
@@ -9,47 +9,9 @@ <h2>Donate to the SRCF</h2>
         <h4 class="card-title">Before you donate...</h4>
         <p>
           Since we provide everything for free, we heavily rely on the kind
-          donations from our members.
+          donations from our members. Please chip in
+          if you like what we do or find our services valuable to you. Any donation goes a long way to securing the future of the SRCF for years to come.
         </p>
-
-        <p>
-          Our donations are <b>steadily falling</b> and
-          <b> less than 0.1% of our total membership</b> donate. Please chip in
-          if you like what we do or find our services valuable to you.
-        </p>
-
-        <h5>Targets & goals</h5>
-        <ul>
-          <li>
-            <b>£75</b> of monthly income for essential upkeep and maintenance of
-            our hardware
-          </li>
-          <li>
-            Purchase of 4 AMD EPYC servers that will:
-            <ul>
-              <li>
-                provide a much-needed refresh to our <b>8+ year old cluster</b>
-              </li>
-              <li>
-                improve performance, ecofriendliness and space-efficiency of our
-                servers
-              </li>
-              <li>
-                allow us to <b>scale up our video conferencing</b> in order to
-                support the virtual freshers fair at the start of October,
-                enable remote teaching/learning, and group projects running over
-                the summer
-                <i>[editor's note: we wound down our first attempt at a video conferencing
-                  platform, called Timeout, in May 2021, although a future video conferencing
-                  platform deployment project has not been ruled out]</i>
-              </li>
-              <li>
-                considerably reduce maintenance costs in the long run
-              </li>
-            </ul>
-          </li>
-        </ul>
-
         <h5>Benefits</h5>
         <p>
           We intend to mention all donors on <a href="https://srcf.net/donors" target="_blank">our donors page</a>

diff --git a/fundraiser.html b/fundraiser.html
@@ -10,9 +10,9 @@
     <title>SRCF Executive meeting - 14 Nov 2019</title>
     <link
       rel="stylesheet"
-      href="https://www.srcf.net/_srcf/vendor/css/bootstrap.min.css"
+      href="/_srcf/vendor/css/bootstrap.min.css"
     />
-    <link rel="stylesheet" href="https://www.srcf.net/_srcf/srcf-bs.css" />
+    <link rel="stylesheet" href="/_srcf/srcf-bs.css" />
   </head>
   <body>
     <main class="container">

diff --git a/get-involved.html b/get-involved.html
@@ -44,7 +44,7 @@ <h2 id="community">Ways to get involved</h2>
 
 <div class="alert alert-warning w-100" role="alert">
   We are dedicated to providing a safe, inclusive, welcoming, harassment-free experience for members of the SRCF
-  community. Note that participation in these platforms is subject to our <a href="https://www.srcf.net/code-of-conduct"
+  community. Note that participation in these platforms is subject to our <a href="code-of-conduct"
     target="_blank">code of conduct</a>.
 </div>
 
@@ -60,10 +60,6 @@ <h4 class="card-title">Join the online community</h4>
       <div class="card-footer">
         <a href="https://discord.com/invite/et353sv"><img style="width: 100%; max-width: 150px;"
             src="images/discord.png" alt="discord" title="Join our Discord" /></a>
-        <a href="https://mattermost.srcf.net" target="_blank">
-          <img style="width: 100%; max-width: 150px;" class="mx-3" src="images/mattermost.svg" alt="mattermost"
-            title="Join our Mattermost" />
-        </a>
         <a class="btn btn-primary" href="irc://irc.srcf.net/hackday">IRC #hackday</a>
       </div>
     </div>
@@ -139,4 +135,4 @@ <h5 class="mb-1">Writing documentation</h5>
   </a>
 </div>
 
-<!--#include virtual="inc/footer.html" -->
+<!--#include virtual="inc/footer.html" -->
diff --git a/groups.html b/groups.html
@@ -5,7 +5,7 @@ <h2>Group accounts</h2>
 
 <p>This is a list of all active group accounts on the SRCF.  If you are looking to become an admin of a group account, you should contact the group's own admins to request your addition.  If we don't have an account for your group, you can create one using the <a href="<!--#if expr="${domain_control}" --><!--#echo var="domain_control" --><!--#endif -->/signup/society">Control Panel</a>.</p>
 
-<p>If a group account you're looking for is not listed here, it may be considered <em>unmaintained</em> (no current admins).  In this state, any web hosting and email delivery is suspended.  To gain administrative access to an unmaintained account, you'll need to <a href="/contact">contact the sysadmins</a> for assistance.</p>
+<p>If a group account you're looking for is not listed here, it may be considered <em>unmaintained</em> (no current admins).  In this state, any web hosting and email delivery is suspended.  To gain administrative access to an unmaintained account, you'll need to <a href="contact">contact the sysadmins</a> for assistance.</p>
 
 <!--#comment This file doesn't exist in public_html as it is autogenerated by root; the Apache config serves it from /var/www/grouplist.html -->
 <!--#include virtual="inc/grouplist.html" -->