From 02eb987af6bd083527d53629528627b401af2301 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Sun, 28 Nov 2021 21:38:15 -0500
Subject: [PATCH] Remove more references to trac, indicate it is being replaced
 on team page

---
 i2p2www/pages/downloads/debian.html |  6 +++---
 i2p2www/pages/site/about/team.html  | 10 ++++++++++
 i2p2www/pages/site/contact.html     | 11 ++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/i2p2www/pages/downloads/debian.html b/i2p2www/pages/downloads/debian.html
index a904dd04..000188d4 100644
--- a/i2p2www/pages/downloads/debian.html
+++ b/i2p2www/pages/downloads/debian.html
@@ -12,10 +12,10 @@
   <li><a href="#debian">Knoppix</a></li>
 </ul>
 
-{% trans trac='http://trac.i2p2.de/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p' -%}
+{% trans gtitlab='https://i2pgit.org/i2p-hackers/i2p.i2p/' -%}
 The I2P packages <em>may</em> work on systems not listed above. Please report any issues
-with these packages on <a href="{{ trac }}">Trac</a> at
-<a href="{{ trac }}">https://trac.i2p2.de</a>.
+with these packages on <a href="{{ gtitlab }}">Gitlab</a> at
+<a href="{{ gtitlab }}">i2p.i2p</a>.
 {%- endtrans %}
 <ul>
   <li>{% trans %}Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<em>Try this if you're not using Debian)</em>{% endtrans %}</li>
diff --git a/i2p2www/pages/site/about/team.html b/i2p2www/pages/site/about/team.html
index 2e1a94d8..7014cdf0 100644
--- a/i2p2www/pages/site/about/team.html
+++ b/i2p2www/pages/site/about/team.html
@@ -91,6 +91,16 @@ network.
 	<td valign="top" class="blue">[{{ _('vacant') }}]</td>
 	<td valign="top"><i>{{ _('threat model / crypto expert') }}</i></td>
 </tr>
+<tr>
+	<td valign="top"><b><a href="https://i2pgit.org/">Gitlab</a> admin</b></td>
+	<td valign="top">idk</td>
+	<td valign="top"><i>{{ _('Manage the project gitlab') }}</i></td>
+</tr>
+<tr>
+	<td valign="top"><b><a href="https://i2pgit.org/dashboard/issues">Issue Tracker(Replaces Trac)</a> admin</b></td>
+	<td valign="top">idk</td>
+	<td valign="top"><i>{{ _('Manage the project bug tracker') }}</i></td>
+</tr>
 <tr>
 	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> admin</b></td>
 	<td valign="top">Meeh</td>
diff --git a/i2p2www/pages/site/contact.html b/i2p2www/pages/site/contact.html
index 30fc6512..023f0550 100644
--- a/i2p2www/pages/site/contact.html
+++ b/i2p2www/pages/site/contact.html
@@ -161,12 +161,17 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B  F47E CFCD C461 75E6 694A</tt>
 	<td valign="top"><i>{{ _('threat model / crypto expert') }}</i></td>
 </tr>
 <tr>
-	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> admin</b></td>
-	<td valign="top">Meeh</td>
+	<td valign="top"><b><a href="https://i2pgit.org/">Gitlab</a> admin</b></td>
+	<td valign="top">idk</td>
+	<td valign="top"><i>{{ _('Manage the project gitlab') }}</i></td>
+</tr>
+<tr>
+	<td valign="top"><b><a href="https://i2pgit.org/dashboard/issues">Issue Tracker(Replaces Trac)</a> admin</b></td>
+	<td valign="top">idk</td>
 	<td valign="top"><i>{{ _('Manage the project bug tracker') }}</i></td>
 </tr>
 <tr>
-	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> webserver admin</b></td>
+	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a>backup webserver admin</b></td>
 	<td valign="top">Meeh</td>
 	<td valign="top"><i>{{ _('manage the public project webservers') }}</i></td>
 </tr>