summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Magorsch <arzano@gentoo.org>2020-05-07 01:26:26 +0200
committerMax Magorsch <arzano@gentoo.org>2020-05-07 01:26:26 +0200
commitcd3b03e04c7f3f5693f4224caa44392ee8c066ae (patch)
tree7713459e9c79648bf0b1126f99cf2c2439a3fb97
parentUse index.html instead of all.html for the landing page (diff)
downloadgentoo-mirrorstats-cd3b03e04c7f3f5693f4224caa44392ee8c066ae.tar.gz
gentoo-mirrorstats-cd3b03e04c7f3f5693f4224caa44392ee8c066ae.tar.bz2
gentoo-mirrorstats-cd3b03e04c7f3f5693f4224caa44392ee8c066ae.zip
Move the tyrian based pages into production
Signed-off-by: Max Magorsch <arzano@gentoo.org>
-rw-r--r--htdocs/.keep0
-rw-r--r--htdocs/index.html173
-rwxr-xr-xhtml/generate.py2
3 files changed, 1 insertions, 174 deletions
diff --git a/htdocs/.keep b/htdocs/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/htdocs/.keep
diff --git a/htdocs/index.html b/htdocs/index.html
deleted file mode 100644
index 3d907cb..0000000
--- a/htdocs/index.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Gentoo mirrorstats</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="theme-color" content="#54487a">
- <link href="https://assets.gentoo.org/tyrian/v1/bootstrap.min.css" rel="stylesheet" media="screen">
- <link href="https://assets.gentoo.org/tyrian/v1/tyrian.min.css" rel="stylesheet" media="screen">
- <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon">
- </head>
- <body>
- <header>
- <div class="site-title">
- <div class="container">
- <div class="row">
- <div class="site-title-buttons">
- <div class="btn-group btn-group-sm">
- <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"></span> <strong>Get Gentoo!</strong></a>
- <div class="btn-group btn-group-sm">
- <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">
- <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs">gentoo.org sites</span> <span class="caret"></span>
- </a>
- <ul class="dropdown-menu dropdown-menu-right">
- <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
- <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li>
- <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
- <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
- <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
- <li class="divider"></li>
- <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
- <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
- <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
- <li class="divider"></li>
- <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra Status</a></li>
- </ul>
- </div>
- </div>
- </div>
- <div class="logo">
- <a href="/" title="Back to the homepage" class="site-logo">
- <object data="https://assets.gentoo.org/tyrian/v1/site-logo.svg" type="image/svg+xml">
- <img src="https://assets.gentoo.org/tyrian/v1/site-logo.png" alt="Gentoo Linux Logo">
- </object>
- </a>
- <span class="site-label">mirrorstats</span>
- </div>
- </div>
- </div>
- </div>
- <nav class="tyrian-navbar" role="navigation">
- <div class="container">
- <div class="row">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- </div>
- <div class="collapse navbar-collapse navbar-main-collapse">
- <ul class="nav navbar-nav">
- <li class="active"><a href="/">Home</a></li>
- </ul>
- <ul class="nav navbar-nav">
- <li><a href="/rsync/">rsync</a></li>
- </ul>
- <ul class="nav navbar-nav">
- <li><a href="/distfiles/">distfiles</a></li>
- </ul>
- <ul class="nav navbar-nav">
- <li><a href="/snapshots/">snapshots</a></li>
- </ul>
- <ul class="nav navbar-nav">
- <li><a href="/releases/">releases</a></li>
- </ul>
- <ul class="nav navbar-nav">
- <li><a href="/experimental/">experimental</a></li>
- </ul>
- </div>
- </div>
- </div>
- </nav>
- </header>
-
- <div class="container">
- <div class="row">
- <div class="col-md-12">
- <h1 class="first-header">Gentoo mirrorstats</h1>
-
- <p>
- Welcome to the Gentoo Linux <tt>mirrorstats</tt> system.
- This page links to the mirror status for rsync &amp; source mirrors.
- </p>
-
- <h2>Gentoo rsync mirrors</h2>
- <p>Gentoo rsync mirrors tracked include both official mirrors run by the Gentoo Infrastructure team, as well as community-run mirrors.</p>
- <ul>
- <li><a href="https://www.gentoo.org/support/rsync-mirrors/">Listing of Gentoo rsync mirrors</a></li>
- <li><a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Rsync">How to contribute a new rsync mirror</a></li>
- <li><a href="/rsync/">Status of Gentoo rsync mirrors</a></li>
- </ul>
-
- <h2>Gentoo source mirrors</h2>
- <ul>
- <li><a href="https://www.gentoo.org/downloads/mirrors/">Listing of Gentoo source mirrors</a></li>
- <li><a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Source">How to contribute a new source mirror</a></li>
- <li><a href="/distfiles/">Status of Gentoo source mirrors: <tt>/distfiles/</tt></a>
- <li><a href="/experimental/">Status of Gentoo source mirrors: <tt>/experimental/</tt></a>
- <li><a href="/releases/">Status of Gentoo source mirrors: <tt>/releases/</tt></a>
- <li><a href="/snapshots/">Status of Gentoo source mirrors: <tt>/snapshots/</tt></a>
- </ul>
-
- <div class="alert alert-warning">
- If you experience problems with a specific mirror, please file clearly marked bugs in <a href="https://bugs.gentoo.org/enter_bug.cgi?product=Mirrors">Gentoo Bugzilla (product <i>Mirrors</i>)</a>.</br>
- Please include lots of details about the problem, as the Gentoo
- mirror team will have to contact the administrator of individual
- mirrors to work on problems.
- <ul>
- <li><b>Hostname</b> of the mirror (in the summary &amp; description)</li>
- <li><b>IP</b> of the mirror: many mirrors have multiple nodes behind a single DNS entry</li>
- <li><b>Timestamp</b> of the problem</li>
- <li><b>Logs</b> of the problem</li>
- </ul>
- </div>
-
- <div class="alert alert-warning">
- If you experience problems with this site (<tt>mirrorstats.gentoo.org</tt>), please file clearly marked bugs in
- <a href="https://bugs.gentoo.org/enter_bug.cgi?assigned_to=infra-bugs%40gentoo.org&bug_file_loc=http%3A%2F%2F&bug_severity=normal&bug_status=CONFIRMED&cf_runtime_testing_required=---&comment=This%20page%20is%20NOT%20for%20problems%20with%20a%20specific%20mirror.%0D%0A%0D%0APlease%20include%20a%20summary%20of%20your%20problem%20with%20mirrorstats.gentoo.org%20here.%0D%0A%0D%0A&component=Other%20web%20server%20issues&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&defined_groups=1&flag_type-4=X&form_name=enter_bug&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=Linux&priority=Normal&product=Gentoo%20Infrastructure&rep_platform=All&short_desc=mirrorstats.gentoo.org%3A%20PROBLEM%20SUMMARY&version=unspecified">Gentoo Bugzilla (product <i>Infrastructure</i>)</a>.
- Please remember to include <tt>mirrorstats</tt> in the summary line.
- </div>
-
- </div>
- </div>
- </div>
-
- <footer>
- <div class="container">
- <div class="row">
- <div class="col-xs-12 col-md-offset-2 col-md-7">
- &nbsp;
- </div>
- <div class="col-xs-12 col-md-3">
- <h3 class="footerhead">Questions or comments?</h3>
- Please feel free to <a href="https://www.gentoo.org/inside-gentoo/contact/">contact us</a>.
- </div>
- </div>
- <div class="row">
- <div class="col-xs-2 col-sm-3 col-md-2">
- <ul class="footerlinks three-icons">
- <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li>
- <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li>
- <li></li>
- </ul>
- </div>
- <div class="col-xs-10 col-sm-9 col-md-10">
- <strong>&copy; 2001&ndash;2020 Gentoo Foundation, Inc.</strong><br>
- <small>
- Gentoo is a trademark of the Gentoo Foundation, Inc.
- The contents of this document, unless otherwise expressly stated, are licensed under the
- <a href="https://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license.
- The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply.
- </small>
- </div>
- </div>
- </div>
- </footer>
-
- <script src="https://assets.gentoo.org/tyrian/v1/jquery.min.js"></script>
- <script src="https://assets.gentoo.org/tyrian/v1/bootstrap.min.js"></script>
- </body>
-</html>
diff --git a/html/generate.py b/html/generate.py
index 8ab5898..025004d 100755
--- a/html/generate.py
+++ b/html/generate.py
@@ -19,7 +19,7 @@ import urllib.request, json
import xml.etree.ElementTree as ET
import jinja2
-html_folder = "/var/www/mirrorstats.gentoo.org/htdocs/new/"
+html_folder = "/var/www/mirrorstats.gentoo.org/htdocs/"
template_folder = "/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/html/"
cache_path = "/var/www/mirrorstats.gentoo.org/var/html_data_cache.json"