From f5533c602afacc2ae1a5a401ea265c293711db5e Mon Sep 17 00:00:00 2001
From: Stephen Frost <sfrost@snowman.net>
Date: Sat, 22 May 2021 16:20:06 -0400
Subject: [PATCH] Update IRC page for Libera Chat

Per discussion among the PostgreSQL IRC Admin team, the official
 #postgresql channel has been migrated to the Libera Chat network.  Also
rework the page to be a bit cleaner and clearer, and to list the current
PostgreSQL IRC Admin team.
---
 templates/pages/community/irc.html | 60 +++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/templates/pages/community/irc.html b/templates/pages/community/irc.html
index 71094999..4f2d78c5 100644
--- a/templates/pages/community/irc.html
+++ b/templates/pages/community/irc.html
@@ -4,27 +4,51 @@
 
 <h1>IRC <i class="fas fa-comments"></i></h1>
 
-<p>If you have a problem that you cannot resolve, you might want to try asking a question in our IRC channel
-<a href="irc://irc.freenode.net/postgresql">#postgresql on irc.freenode.net</a>. The channel has many active users,
-and it is an entry into participating in the wider PostgreSQL community.  Don't forget to consult
-the <a href="/docs/">documentation</a> about your problem before asking your question.</p>
+<p>The PostgreSQL community is welcome to gather on the Libera Chat IRC network to discuss PostgreSQL,
+generally chat among PostgreSQL community members, and to ask questions about PostgreSQL and assist others
+using PostgreSQL.  The channel has many active users and it is an entry into participating in the wider
+PostgreSQL community.  Don't forget to consult the <a href="/docs/">documentation</a> before asking
+questions which may be answered there.  Note that, as with other community areas, all users should review
+and are required to follow the PostgreSQL community
+<a href="https://www.postgresql.org/about/policies/coc/">Code of Conduct</a>.</p>
 
-<h2>Other PostgreSQL Related Channels</h2>
-<p>PostgreSQL Related Projects:</p>
+<h2>PostgreSQL Channels:</h2>
 <ul>
-	<li><a href="irc://irc.freenode.net/pgadmin">pgAdmin</a> - Cross platform graphical administration</li>
-	<li><a href="irc://irc.freenode.net/plphp">PLphp</a> - Procedures and Functions in PHP</li>
-	<li><a href="irc://irc.freenode.net/postgis">PostGIS</a> -  Spatial objects for PostgreSQL</li>
-	<li><a href="irc://irc.freenode.net/slony">Slony</a> - FOSS PostgreSQL replication</li>
-	<li><a href="irc://irc.freenode.net/postgresql-eu">postgresql-eu</a> - European PostgreSQL Usergroup</li>
+  <li><a href="irc://irc.libera.chat/postgresql">#postgresql</a>: General technical PostgreSQL discussion (English)</li>
+  <li><a href="irc://irc.libera.chat/postgresql-lounge">#postgresql-lounge</a>: Off-topic discussion among PostgreSQL Users</li>
+  <li><a href="irc://irc.libera.chat/postgresql-eu">#postgresql-eu</a>: European PostgreSQL Usergroup - #postgresql-eu</li>
+</ul>
+
+<h2>Language Specific Channels:</h2>
+<ul>
+  <li><a href="irc://irc.libera.chat/postgresql-br">Brazilian Portuguese - #postgresql-br</a></li>
+  <li><a href="irc://irc.libera.chat/postgresql-fr">French - #postgresql-fr</a></li>
+  <li><a href="irc://irc.libera.chat/postgresql-it">Italian - #postgresql-it</a></li>
+  <li><a href="irc://irc.libera.chat/postgresql-de">German - #postgresql-de</a></li>
+</ul>
+
+<p>Any issues, concerns, or violations of the CoC may be reported directly to the PostgreSQL IRC Admin team by
+contacting them directly on Libera Chat, or by emailing the team at
+<a href="mailto:irc-admins@lists.postgresql.org">irc-admins@lists.postgresql.org</a>.  CoC violations
+can be alternatively submitted to the Code of Conduct Committee at
+<a href="mailto:coc@postgresql.org">coc@postgresql.org</a>.</p>
+
+<h2>PostgreSQL IRC Admin Team:</h2>
+<ul>
+  <li>RhodiumToad [Andrew Gierth]</li>
+  <li>xocolatl [Vik Fearing] - Admin for #postgresql-fr</li>
+  <li>magnush [Magnus Hagander] - Admin for #postgresql-eu</li>
+  <li>johto [Marko Tiikkaja]</li>
+  <li>Snow-Man [Stephen Frost]</li>
+  <li>ilmari [Dagfinn Ilmari Mannsåker]</li>
+  <li>davidfetter [David Fetter]</li>
+  <li>Myon [Christoph Berg] - Admin for #postgresql-apt, #postgresql-de</li>
+  <li>Zr40 [Matthijs van der Vleuten]</li>
 </ul>
-<p>Language Specific Channels:</p>
+
+<h2>Other PostgreSQL Related Channels on other IRC networks</h2>
+<p>PostgreSQL Related Projects:</p>
 <ul>
-  <li><a href="irc://irc.freenode.net/postgresql-br">Brazilian Portuguese</a></li>
-  <li><a href="irc://irc.freenode.net/postgresqlfr">French</a></li>
-  <li><a href="irc://irc.freenode.net/postgresql-it">Italian</a></li>
-  <li><a href="irc://irc.freenode.net/postgresql-es">Spanish</a></li>
-  <li><a href="irc://irc.freenode.net/postgresql-de">German</a></li>
-  <li><a href="irc://irc.freenode.net/postgresql-tr">Turkish</a></li>
+	<li><a href="irc://irc.freenode.net/postgis">PostGIS</a> -  Spatial objects for PostgreSQL</li>
 </ul>
 {%endblock%}
-- 
2.39.5