From b8e49e6f3ed2d8875d3c26e83fe9d552fb4677fb Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Fri, 13 Jul 2018 20:03:22 +1000
Subject: Update links and use https where appropriate.

Bug: https://bugs.gentoo.org/661010
---
 archives/planet/index.php   | 23 ++++++++++++-----------
 archives/universe/index.php | 23 ++++++++++++-----------
 templates/index.html.tmpl   | 30 +++++++++++++++---------------
 templates/rss20.xml.tmpl    |  2 +-
 4 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/archives/planet/index.php b/archives/planet/index.php
index 6f5145f0..fd861b95 100644
--- a/archives/planet/index.php
+++ b/archives/planet/index.php
@@ -15,21 +15,22 @@
 
 
 <td class="logobox">
-<a href="http://www.gentoo.org/"><img alt="Gentoo Logo" src="/images/gtop-s.jpg" width="193" height="88"></a><br>
-<a href="http://www.gentoo.org/"><img alt="Gentoo Logo Side" src="/images/gbot-s.gif" width="193" height="31"></a>
+<a href="https://www.gentoo.org/"><img alt="Gentoo Logo" src="/images/gtop-s.jpg" width="193" height="88"></a><br>
+<a href="https://www.gentoo.org/"><img alt="Gentoo Logo Side" src="/images/gbot-s.gif" width="193" height="31"></a>
 </td>
 
 
 <td class="linkbar">
 <div class="menu">
-<a href="http://www.gentoo.org/main/en/about.xml" class="menulink">About</a> |
-          <a href="http://www.gentoo.org/proj/en/metastructure/projects.xml?showlevel=1" class="menulink">Projects</a> |
-          <a href="http://www.gentoo.org/doc/en/index.xml" class="menulink">Docs</a> |
-          <a href="http://forums.gentoo.org/" class="menulink">Forums</a> |
-          <a href="http://www.gentoo.org/main/en/lists.xml" class="menulink">Lists</a> |
-          <a href="http://bugs.gentoo.org/" class="menulink">Bugs</a> |
-          <a href="http://www.gentoo.org/main/en/where.xml" class="menulink">Get Gentoo!</a> |
-          <a href="http://www.gentoo.org/main/en/support.xml" class="menulink">Support</a>
+<a href="https://www.gentoo.org/get-started/about/" class="menulink">About</a> |
+          <a href="https://wiki.gentoo.org/wiki/Project:Gentoo" class="menulink">Projects</a> |
+          <a href="https://www.gentoo.org/support/documentation" class="menulink">Docs</a> |
+          <a href="https://forums.gentoo.org/" class="menulink">Forums</a> |
+          <a href="https://www.gentoo.org/get-involved/mailing-lists/" class="menulink">Lists</a> |
+          <a href="https://bugs.gentoo.org/" class="menulink">Bugs</a> |
+          <a href="https://www.gentoo.org/downloads/" class="menulink">Get Gentoo!</a> |
+          <a href="https://www.gentoo.org/support/" class="menulink">Support</a> |
+          <a href="https://wiki.gentoo.org/wiki/Main_Page" class="menulink">Wiki</a>
           <a href="http://planet.gentoo.org/" class="menulink">Planet</a>
 </div></td>
 
@@ -42,7 +43,7 @@
 <img alt="Gentoo Spaceship" src="/images/gridtest.gif" align="right" height="96" width="132"><br clear="all"><br>
 
 <div class='altmenu'>
-<br>Bugs? Comments? Suggestions? <a href="http://www.gentoo.org/proj/en/userrel/planet/">Contact us!</a>
+<br>Bugs? Comments? Suggestions? <a href="https://wiki.gentoo.org/wiki/Project:Planet">Contact us!</a>
 
 <br><br><b>Powered by:</b><br>
 <a href="http://www.intertwingly.net/code/venus/">Planet Venus</a>
diff --git a/archives/universe/index.php b/archives/universe/index.php
index d738a6d6..d62398a1 100644
--- a/archives/universe/index.php
+++ b/archives/universe/index.php
@@ -15,21 +15,22 @@
 
 
 <td class="logobox">
-<a href="http://www.gentoo.org/"><img alt="Gentoo Logo" src="/images/gtop-s.jpg" width="193" height="88"></a><br>
-<a href="http://www.gentoo.org/"><img alt="Gentoo Logo Side" src="/images/gbot-s.gif" width="193" height="31"></a>
+<a href="https://www.gentoo.org/"><img alt="Gentoo Logo" src="/images/gtop-s.jpg" width="193" height="88"></a><br>
+<a href="https://www.gentoo.org/"><img alt="Gentoo Logo Side" src="/images/gbot-s.gif" width="193" height="31"></a>
 </td>
 
 
 <td class="linkbar">
 <div class="menu">
-<a href="http://www.gentoo.org/main/en/about.xml" class="menulink">About</a> |
-          <a href="http://www.gentoo.org/proj/en/metastructure/projects.xml?showlevel=1" class="menulink">Projects</a> |
-          <a href="http://www.gentoo.org/doc/en/index.xml" class="menulink">Docs</a> |
-          <a href="http://forums.gentoo.org/" class="menulink">Forums</a> |
-          <a href="http://www.gentoo.org/main/en/lists.xml" class="menulink">Lists</a> |
-          <a href="http://bugs.gentoo.org/" class="menulink">Bugs</a> |
-          <a href="http://www.gentoo.org/main/en/where.xml" class="menulink">Get Gentoo!</a> |
-          <a href="http://www.gentoo.org/main/en/support.xml" class="menulink">Support</a>
+<a href="https://www.gentoo.org/get-started/about/" class="menulink">About</a> |
+          <a href="https://wiki.gentoo.org/wiki/Project:Gentoo" class="menulink">Projects</a> |
+          <a href="https://www.gentoo.org/support/documentation" class="menulink">Docs</a> |
+          <a href="https://forums.gentoo.org/" class="menulink">Forums</a> |
+          <a href="https://www.gentoo.org/get-involved/mailing-lists/" class="menulink">Lists</a> |
+          <a href="https://bugs.gentoo.org/" class="menulink">Bugs</a> |
+          <a href="https://www.gentoo.org/downloads/" class="menulink">Get Gentoo!</a> |
+          <a href="https://www.gentoo.org/support/" class="menulink">Support</a> |
+          <a href="https://wiki.gentoo.org/wiki/Main_Page" class="menulink">Wiki</a>
           <a href="http://planet.gentoo.org/" class="menulink">Planet</a>
 </div></td>
 
@@ -42,7 +43,7 @@
 <img alt="Gentoo Spaceship" src="/images/gridtest.gif" align="right" height="96" width="132"><br clear="all"><br>
 
 <div class='altmenu'>
-<br>Bugs? Comments? Suggestions? <a href="http://www.gentoo.org/proj/en/userrel/planet/">Contact us!</a>
+<br>Bugs? Comments? Suggestions? <a href="https://wiki.gentoo.org/wiki/Project:Planet">Contact us!</a>
 
 <br><br><b>Powered by:</b><br>
 <a href="http://www.intertwingly.net/code/venus/">Planet Venus</a>
diff --git a/templates/index.html.tmpl b/templates/index.html.tmpl
index 3f86df0a..49bb5a3f 100644
--- a/templates/index.html.tmpl
+++ b/templates/index.html.tmpl
@@ -16,23 +16,23 @@
 
 ### Gentoo logo
 <td class="logobox">
-<a href="http://www.gentoo.org/"><img alt="Gentoo Logo" src="/images/gtop-s.jpg" width="193" height="88"></a><br>
-<a href="http://www.gentoo.org/"><img alt="Gentoo Logo Side" src="/images/gbot-s.gif" width="193" height="31"></a>
+<a href="https://www.gentoo.org/"><img alt="Gentoo Logo" src="/images/gtop-s.jpg" width="193" height="88"></a><br>
+<a href="https://www.gentoo.org/"><img alt="Gentoo Logo Side" src="/images/gbot-s.gif" width="193" height="31"></a>
 </td>
 
 ### Links across top
 <td class="linkbar">
 <div class="menu">
-<a href="http://www.gentoo.org/main/en/about.xml" class="menulink">About</a> |
-          <a href="http://www.gentoo.org/proj/en/metastructure/projects.xml?showlevel=1" class="menulink">Projects</a> |
-          <a href="http://www.gentoo.org/doc/en/index.xml" class="menulink">Docs</a> |
-          <a href="http://forums.gentoo.org/" class="menulink">Forums</a> |
-          <a href="http://www.gentoo.org/main/en/lists.xml" class="menulink">Lists</a> |
-          <a href="http://bugs.gentoo.org/" class="menulink">Bugs</a> |
-          <a href="http://www.gentoo.org/main/en/where.xml" class="menulink">Get Gentoo!</a> |
-          <a href="http://www.gentoo.org/main/en/support.xml" class="menulink">Support</a> |
+<a href="https://www.gentoo.org/get-started/about/" class="menulink">About</a> |
+          <a href="https://wiki.gentoo.org/wiki/Project:Gentoo" class="menulink">Projects</a> |
+          <a href="https://www.gentoo.org/support/documentation" class="menulink">Docs</a> |
+          <a href="https://forums.gentoo.org/" class="menulink">Forums</a> |
+          <a href="https://www.gentoo.org/get-involved/mailing-lists/" class="menulink">Lists</a> |
+          <a href="https://bugs.gentoo.org/" class="menulink">Bugs</a> |
+          <a href="https://www.gentoo.org/downloads/" class="menulink">Get Gentoo!</a> |
+          <a href="https://www.gentoo.org/support/" class="menulink">Support</a> |
           <a href="/archives/" class="menulink">Archives</a> |
-	  <a href="http://wiki.gentoo.org" class="menulink">Wiki</a>
+	  <a href="https://wiki.gentoo.org/wiki/Main_Page" class="menulink">Wiki</a>
 </div></td>
 
 
@@ -63,7 +63,7 @@ Views expressed in the content published here do not necessarily represent the v
 </a><br>
 </div>
 
-<br>Bugs? Comments? Suggestions? <a href="http://www.gentoo.org/proj/en/userrel/planet/">Contact us!</a>
+<br>Bugs? Comments? Suggestions? <a href="https://wiki.gentoo.org/wiki/Project:Planet">Contact us!</a>
 
 <br><br><b>Powered by:</b><br>
 <a href="http://www.intertwingly.net/code/venus/">Planet Venus</a>
@@ -88,9 +88,9 @@ Views expressed in the content published here do not necessarily represent the v
 </span>
 <TMPL_IF channel_username>
 a.k.a. <b><TMPL_VAR channel_username></b>
-(<a href="http://dev.gentoo.org/~<TMPL_VAR channel_username ESCAPE="HTML">/">homepage</a>,
+(<a href="https://dev.gentoo.org/~<TMPL_VAR channel_username ESCAPE="HTML">/">homepage</a>,
 <a
-href="http://bugs.gentoo.org/buglist.cgi?bug_status=UNCONFIRMED&amp;bug_status=CONFIRMED&amp;bug_status=IN_PROGRESS&amp;email1=<TMPL_VAR channel_username ESCAPE="HTML">%40gentoo.org&amp;emailtype1=exact&amp;emailassigned_to1=1&amp;emailreporter1=1">bugs</a>)
+href="https://bugs.gentoo.org/buglist.cgi?bug_status=UNCONFIRMED&amp;bug_status=CONFIRMED&amp;bug_status=IN_PROGRESS&amp;email1=<TMPL_VAR channel_username ESCAPE="HTML">%40gentoo.org&amp;emailtype1=exact&amp;emailassigned_to1=1&amp;emailreporter1=1">bugs</a>)
 </TMPL_IF>
 <TMPL_IF channel_project>
  <b>(<TMPL_VAR channel_project ESCAPE="HTML">)</b>
@@ -107,7 +107,7 @@ href="http://bugs.gentoo.org/buglist.cgi?bug_status=UNCONFIRMED&amp;bug_status=C
 <table width="100%" style="table-layout:fixed"><tr><td>
 <div class="entrycontent"><p>
 <TMPL_IF channel_gravatar>
-<img class="face" src="http://www.gravatar.com/avatar/<TMPL_VAR channel_gravatar ESCAPE="HTML">.jpg?s=100&r=pg&d=http%3A%2F%2Fplanet.gentoo.org%2Fimages%2F<TMPL_IF channel_face><TMPL_VAR channel_face ESCAPE="HTML"><TMPL_ELSE>larrythecow.gif</TMPL_IF>" alt="" align="right">
+<img class="face" src="https://www.gravatar.com/avatar/<TMPL_VAR channel_gravatar ESCAPE="HTML">.jpg?s=100&r=pg&d=http%3A%2F%2Fplanet.gentoo.org%2Fimages%2F<TMPL_IF channel_face><TMPL_VAR channel_face ESCAPE="HTML"><TMPL_ELSE>larrythecow.gif</TMPL_IF>" alt="" align="right">
 </TMPL_IF>
 <TMPL_VAR content>
 </p>
diff --git a/templates/rss20.xml.tmpl b/templates/rss20.xml.tmpl
index 4c61278b..8cab2cab 100644
--- a/templates/rss20.xml.tmpl
+++ b/templates/rss20.xml.tmpl
@@ -13,7 +13,7 @@
 	<guid isPermaLink="false"><TMPL_VAR id ESCAPE="HTML"></guid>
 	<link><TMPL_VAR link ESCAPE="HTML"></link>
 	<TMPL_IF content>
-	<description><TMPL_IF channel_gravatar>&lt;img src=&quot;http://www.gravatar.com/avatar/<TMPL_VAR channel_gravatar ESCAPE="HTML">.jpg?s=100&amp;r=pg&amp;d=http%3A%2F%2Fplanet.gentoo.org%2Fimages%2F<TMPL_IF channel_face><TMPL_VAR channel_face ESCAPE="HTML"><TMPL_ELSE>larrythecow.gif</TMPL_IF>&quot; alt=&quot;&quot; align=&quot;right&quot; style=&quot;float: right;&quot;&gt;</TMPL_IF><TMPL_VAR content ESCAPE="HTML"></description>
+	<description><TMPL_IF channel_gravatar>&lt;img src=&quot;https://www.gravatar.com/avatar/<TMPL_VAR channel_gravatar ESCAPE="HTML">.jpg?s=100&amp;r=pg&amp;d=http%3A%2F%2Fplanet.gentoo.org%2Fimages%2F<TMPL_IF channel_face><TMPL_VAR channel_face ESCAPE="HTML"><TMPL_ELSE>larrythecow.gif</TMPL_IF>&quot; alt=&quot;&quot; align=&quot;right&quot; style=&quot;float: right;&quot;&gt;</TMPL_IF><TMPL_VAR content ESCAPE="HTML"></description>
 	</TMPL_IF>
 	<pubDate><TMPL_VAR date_822></pubDate>
 	<dc:creator><TMPL_VAR channel_name> (<TMPL_VAR channel_username>)</dc:creator>
-- 
cgit v1.2.3-65-gdbad