remove all traces of news.archlinux32.org and replace by links to forum as deemed appropriate

3 files changed, 4 insertions, 6 deletions

diff --git a/download/index.html b/download/index.html
index 861dec6..9cbea4e 100644
--- a/download/index.html
+++ b/download/index.html
@@ -16,7 +16,6 @@
         <div id="archnavbarmenu">
             <ul id="archnavbarlist">
                 <li id="anb-home"><a href="http://www.archlinux32.org">Home</a></li>
-                <li id="anb-news"><a href="https://news.archlinux32.org">News</a></li>
                 <li id="anb-packages"><a href="https://www.archlinux32.org/packages">Packages</a></li>
                 <li id="anb-forum"><a href="https://bbs.archlinux32.org">Forums</a></li>
                 <li id="anb-bugs"><a href="https://bugs.archlinux32.org/" title="Report and track bugs">Bugs</a></li>
diff --git a/index.php b/index.php
index 9dd1926..f0405a4 100644
--- a/index.php
+++ b/index.php
@@ -66,11 +66,11 @@ print_header("", "home");
           </div>
           <div id="news">
             <h3>
-              <a href="https://news.archlinux32.org/" title="Browse the news archives">Latest News</a>
+              <a href="https://bbs.archlinux32.org/viewforum.php?id=12" title="Browse the news archives">Latest News</a>
               <span class="arrow"></span>
             </h3>
             <a href="https://archlinux.org/feeds/news/" title="Arch News RSS Feed" class="rss-icon"><img width="16" height="16" src="/static/rss.c5ebdc5318d6.png" alt="RSS Feed" /></a>
-            <a href="https://news.archlinux32.org/rss.php" title="Arch 32 News RSS Feed" class="rss-icon"><img width="16" height="16" src="/static/rss.c5ebdc5318d6.png" alt="RSS Feed" /></a>
+            <a href="https://bbs.archlinux32.org/extern.php?action=feed&fid=12&type=atom" title="Arch 32 News RSS Feed" class="rss-icon"><img width="16" height="16" src="/static/rss.c5ebdc5318d6.png" alt="RSS Feed" /></a>
 <?php
 
 $news_reachable = apcu_fetch('news_reachable', $apcu_success);
@@ -140,7 +140,7 @@ foreach($news as $entry) {
   $news_count ++;
   if ($news_count == 0) {
     print "            <h3>\n";
-    print "              <a href=\"https://news.archlinux32.org/\" title=\"Browse the news archives\">Older News</a>\n";
+    print "              <a href=\"https://bbs.archlinux32.org/viewforum.php?id=12\" title=\"Browse the news archives\">Older News</a>\n";
     print "              <span class=\"arrow\"></span>\n";
     print "            </h3>\n";
     print "            <dl class=\"newslist\">\n";
@@ -306,7 +306,7 @@ foreach($package_updates as $pkg) {
             More Resources
           </h4>
           <ul>
-            <li><a href="https://news.archlinux32.org/" title="News Archives">News Archives</a></li>
+            <li><a href="https://bbs.archlinux32.org/viewforum.php?id=12" title="News Archives">News Archives</a></li>
             <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
           </ul>
         </div>
diff --git a/lib/style.php b/lib/style.php
index 8696156..0d2b4dc 100644
--- a/lib/style.php
+++ b/lib/style.php
@@ -28,7 +28,6 @@ if (!empty($title))
       <div id="archnavbarmenu">
         <ul id="archnavbarlist">
           <li id="anb-home"><a href="https://www.archlinux32.org/">Home</a></li>
-          <li id="anb-news"><a href="https://news.archlinux32.org/">News</a></li>
           <li id="anb-packages"><a href="https://www.archlinux32.org/packages">Packages</a></li>
           <li id="anb-forums"><a href="https://bbs.archlinux32.org/">Forums</a></li>
           <li id="anb-bugs"><a href="https://bugs.archlinux32.org/" title="Report and track bugs">Bugs</a></li>