Merge pull request #447 from reosarevok/drop-mirrors-from-datasets

Drop mirror links
metabrainz · Nov 23, 2023 · be816d4 · be816d4
2 parents 1c456b0 + 21ff23b
commit be816d4
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 34 deletions.
diff --git a/frontend/img/logos/sponsors/dotsrc.png b/frontend/img/logos/sponsors/dotsrc.png
diff --git a/frontend/img/logos/sponsors/osl.png b/frontend/img/logos/sponsors/osl.png
diff --git a/metabrainz/templates/base.html b/metabrainz/templates/base.html
@@ -91,11 +91,9 @@
             </div>
           </div>
           <div class="lower-footer">
-            {{ _('Sponsored by <a href="%(google_url)s">Google</a>,
-            <a href="%(osuosl_url)s">OSUOSL</a> and
+            {{ _('Sponsored by <a href="%(google_url)s">Google</a> and
             <a href="%(sponsors_url)s">others&hellip;</a>',
             sponsors_url=url_for('index.sponsors'),
-            osuosl_url='https://osuosl.org/',
             google_url='https://www.google.com/') }}
           </div>
         </div>

diff --git a/metabrainz/templates/index/datasets/download.html b/metabrainz/templates/index/datasets/download.html
@@ -15,44 +15,34 @@ <h3>MetaBrainz Database Dumps</h3>
     <h4 class="panel-heading">MusicBrainz PostgreSQL Data Dumps</h4>
     <ul class="list-group">
       <li class="list-group-item"><a href="https://data.metabrainz.org/pub/musicbrainz/data/fullexport/">https://data.metabrainz.org/pub/musicbrainz/data/fullexport/</a> (Germany, EU)</li>
-      <li class="list-group-item"><a href="https://ftp.osuosl.org/pub/musicbrainz/data/fullexport/">https://ftp.osuosl.org/pub/musicbrainz/data/fullexport/</a> (Oregon, USA)</li>
-      <li class="list-group-item"><a href="https://mirrors.dotsrc.org/MusicBrainz/data/fullexport/">https://mirrors.dotsrc.org/MusicBrainz/data/fullexport/</a> (Denmark, EU)</li>
     </ul>
   </div>
 
   <div class="panel panel-default dataset-panel">
     <h4 class="panel-heading">MusicBrainz JSON Data Dumps</h4>
     <ul class="list-group">
       <li class="list-group-item"><a href="https://data.metabrainz.org/pub/musicbrainz/data/json-dumps">https://data.metabrainz.org/pub/musicbrainz/data/json-dumps</a> (Germany, EU)</li>
-      <li class="list-group-item"><a href="https://ftp.osuosl.org/pub/musicbrainz/data/json-dumps">https://ftp.osuosl.org/pub/musicbrainz/data/json-dumps</a> (Oregon, USA)</li>
-      <li class="list-group-item"><a href="https://mirrors.dotsrc.org/MusicBrainz/data/json-dumps">https://mirrors.dotsrc.org/MusicBrainz/data/json-dumps</a> (Denmark, EU)</li>
     </ul>
   </div>
 
   <div class="panel panel-default dataset-panel">
     <h4 class="panel-heading">Full ListenBrainz PostgreSQL Data Dumps</h4>
     <ul class="list-group">
       <li class="list-group-item"><a href="https://data.metabrainz.org/pub/musicbrainz/listenbrainz/fullexport/">https://data.metabrainz.org/pub/musicbrainz/listenbrainz/fullexport/</a> (Germany, EU)</li>
-      <li class="list-group-item"><a href="https://ftp.osuosl.org/pub/musicbrainz/listenbrainz/fullexport/">https://ftp.osuosl.org/pub/musicbrainz/listenbrainz/fullexport/</a> (Oregon, USA)</li>
-      <li class="list-group-item"><a href="https://mirrors.dotsrc.org/MusicBrainz/listenbrainz/fullexport/">https://mirrors.dotsrc.org/MusicBrainz/listenbrainz/fullexport/</a> (Denmark, EU)</li>
     </ul>
   </div>
 
   <div class="panel panel-default dataset-panel">
     <h4 class="panel-heading">Incremental ListenBrainz PostgreSQL Data Dumps</h4>
     <ul class="list-group">
       <li class="list-group-item"><a href="https://data.metabrainz.org/pub/musicbrainz/listenbrainz/incremental/">https://data.metabrainz.org/pub/musicbrainz/listenbrainz/incremental/</a> (Germany, EU)</li>
-      <li class="list-group-item"><a href="https://ftp.osuosl.org/pub/musicbrainz/listenbrainz/incremental/">https://ftp.osuosl.org/pub/musicbrainz/listenbrainz/incremental/</a> (Oregon, USA)</li>
-      <li class="list-group-item"><a href="https://mirrors.dotsrc.org/MusicBrainz/listenbrainz/incremental/">https://mirrors.dotsrc.org/MusicBrainz/listenbrainz/incremental/</a> (Denmark, EU)</li>
     </ul>
   </div>
 
   <div class="panel panel-default dataset-panel">
     <h4 class="panel-heading">CritiqueBrainz PostgreSQL Data Dumps</h4>
     <ul class="list-group">
       <li class="list-group-item"><a href="https://data.metabrainz.org/pub/musicbrainz/critiquebrainz/">https://data.metabrainz.org/pub/musicbrainz/critiquebrainz/</a> (Germany, EU)</li>
-      <li class="list-group-item"><a href="https://ftp.osuosl.org/pub/musicbrainz/critiquebrainz/">https://ftp.osuosl.org/pub/musicbrainz/critiquebrainz/</a> (Oregon, USA)</li>
-      <li class="list-group-item"><a href="https://mirrors.dotsrc.org/MusicBrainz/critiquebrainz/">https://mirrors.dotsrc.org/MusicBrainz/critiquebrainz/</a> (Denmark, EU)</li>
     </ul>
   </div>
 
@@ -62,8 +52,6 @@ <h3>MetaBrainz Derived Dumps</h3>
     <h4 class="panel-heading">MusicBrainz Canonical Data Dumps</h4>
     <ul class="list-group">
       <li class="list-group-item"><a href="https://data.metabrainz.org/pub/musicbrainz/canonical_data/">https://data.metabrainz.org/pub/musicbrainz/canonical_data/</a> (Germany, EU)</li>
-      <li class="list-group-item"><a href="https://ftp.osuosl.org/pub/musicbrainz/canonical_data/">https://ftp.osuosl.org/pub/musicbrainz/canonical_data/</a> (Oregon, USA)</li>
-      <li class="list-group-item"><a href="https://mirrors.dotsrc.org/MusicBrainz/canonical_data/">https://mirrors.dotsrc.org/MusicBrainz/canonical_data/</a> (Denmark, EU)</li>
     </ul>
   </div>
 

diff --git a/metabrainz/templates/index/sponsors.html b/metabrainz/templates/index/sponsors.html
@@ -28,25 +28,6 @@ <h2>{{ _('Sponsors') }}</h2>
       </td>
     </tr>
 
-    <tr>
-      <td><img src="{{ url_for('static', filename='img/logos/sponsors/osl.png') }}"></td>
-      <td>
-        {{ _('The <b><a href="%(osuosl_url)s">OSU Open Source Lab</a></b> hosts the FTP
-        mirror server that handles the distribution of the
-        <a href="%(mb_db_url)s">MusicBrainz Database</a>
-        and virtual machines, thus saving us considerable load and bandwidth costs.', osuosl_url='https://osuosl.org/', mb_db_url='https://musicbrainz.org/doc/MusicBrainz_Database') }}
-      </td>
-    </tr>
-
-    <tr>
-      <td><img src="{{ url_for('static', filename='img/logos/sponsors/dotsrc.png') }}"></td>
-      <td>
-        {{ _('<b><a href="%(dotsrc_url)s">DotSrc</a></b> hosts an
-        <a href="%(mb_ftp_url)s">EU mirror of our FTP site</a>.
-        This gives better download speeds of our large data sets for supporters in Europe.', dotsrc_url='http://dotsrc.org/', mb_ftp_url='ftp://mirrors.dotsrc.org/MusicBrainz') }}
-      </td>
-    </tr>
-
     <tr>
       <td><img src="{{ url_for('static', filename='img/logos/sponsors/github.svg') }}"></td>
       <td>