| 1 |
commit: cd3b03e04c7f3f5693f4224caa44392ee8c066ae |
| 2 |
Author: Max Magorsch <arzano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 6 23:26:26 2020 +0000 |
| 4 |
Commit: Max Magorsch <arzano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 6 23:26:26 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=cd3b03e0 |
| 7 |
|
| 8 |
Move the tyrian based pages into production |
| 9 |
|
| 10 |
Signed-off-by: Max Magorsch <arzano <AT> gentoo.org> |
| 11 |
|
| 12 |
htdocs/.keep | 0 |
| 13 |
htdocs/index.html | 173 ------------------------------------------------------ |
| 14 |
html/generate.py | 2 +- |
| 15 |
3 files changed, 1 insertion(+), 174 deletions(-) |
| 16 |
|
| 17 |
diff --git a/htdocs/.keep b/htdocs/.keep |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..e69de29 |
| 20 |
|
| 21 |
diff --git a/htdocs/index.html b/htdocs/index.html |
| 22 |
deleted file mode 100644 |
| 23 |
index 3d907cb..0000000 |
| 24 |
--- a/htdocs/index.html |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,173 +0,0 @@ |
| 27 |
-<!DOCTYPE html> |
| 28 |
-<html> |
| 29 |
- <head> |
| 30 |
- <title>Gentoo mirrorstats</title> |
| 31 |
- <meta charset="utf-8"> |
| 32 |
- <meta name="viewport" content="width=device-width, initial-scale=1.0"> |
| 33 |
- <meta name="theme-color" content="#54487a"> |
| 34 |
- <link href="https://assets.gentoo.org/tyrian/v1/bootstrap.min.css" rel="stylesheet" media="screen"> |
| 35 |
- <link href="https://assets.gentoo.org/tyrian/v1/tyrian.min.css" rel="stylesheet" media="screen"> |
| 36 |
- <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon"> |
| 37 |
- </head> |
| 38 |
- <body> |
| 39 |
- <header> |
| 40 |
- <div class="site-title"> |
| 41 |
- <div class="container"> |
| 42 |
- <div class="row"> |
| 43 |
- <div class="site-title-buttons"> |
| 44 |
- <div class="btn-group btn-group-sm"> |
| 45 |
- <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> |
| 46 |
- <div class="btn-group btn-group-sm"> |
| 47 |
- <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#"> |
| 48 |
- <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs">gentoo.org sites</span> <span class="caret"></span> |
| 49 |
- </a> |
| 50 |
- <ul class="dropdown-menu dropdown-menu-right"> |
| 51 |
- <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li> |
| 52 |
- <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> |
| 53 |
- <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> |
| 54 |
- <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li> |
| 55 |
- <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> |
| 56 |
- <li class="divider"></li> |
| 57 |
- <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> |
| 58 |
- <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li> |
| 59 |
- <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li> |
| 60 |
- <li class="divider"></li> |
| 61 |
- <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> |
| 62 |
- </ul> |
| 63 |
- </div> |
| 64 |
- </div> |
| 65 |
- </div> |
| 66 |
- <div class="logo"> |
| 67 |
- <a href="/" title="Back to the homepage" class="site-logo"> |
| 68 |
- <object data="https://assets.gentoo.org/tyrian/v1/site-logo.svg" type="image/svg+xml"> |
| 69 |
- <img src="https://assets.gentoo.org/tyrian/v1/site-logo.png" alt="Gentoo Linux Logo"> |
| 70 |
- </object> |
| 71 |
- </a> |
| 72 |
- <span class="site-label">mirrorstats</span> |
| 73 |
- </div> |
| 74 |
- </div> |
| 75 |
- </div> |
| 76 |
- </div> |
| 77 |
- <nav class="tyrian-navbar" role="navigation"> |
| 78 |
- <div class="container"> |
| 79 |
- <div class="row"> |
| 80 |
- <div class="navbar-header"> |
| 81 |
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse"> |
| 82 |
- <span class="sr-only">Toggle navigation</span> |
| 83 |
- <span class="icon-bar"></span> |
| 84 |
- <span class="icon-bar"></span> |
| 85 |
- <span class="icon-bar"></span> |
| 86 |
- </button> |
| 87 |
- </div> |
| 88 |
- <div class="collapse navbar-collapse navbar-main-collapse"> |
| 89 |
- <ul class="nav navbar-nav"> |
| 90 |
- <li class="active"><a href="/">Home</a></li> |
| 91 |
- </ul> |
| 92 |
- <ul class="nav navbar-nav"> |
| 93 |
- <li><a href="/rsync/">rsync</a></li> |
| 94 |
- </ul> |
| 95 |
- <ul class="nav navbar-nav"> |
| 96 |
- <li><a href="/distfiles/">distfiles</a></li> |
| 97 |
- </ul> |
| 98 |
- <ul class="nav navbar-nav"> |
| 99 |
- <li><a href="/snapshots/">snapshots</a></li> |
| 100 |
- </ul> |
| 101 |
- <ul class="nav navbar-nav"> |
| 102 |
- <li><a href="/releases/">releases</a></li> |
| 103 |
- </ul> |
| 104 |
- <ul class="nav navbar-nav"> |
| 105 |
- <li><a href="/experimental/">experimental</a></li> |
| 106 |
- </ul> |
| 107 |
- </div> |
| 108 |
- </div> |
| 109 |
- </div> |
| 110 |
- </nav> |
| 111 |
- </header> |
| 112 |
- |
| 113 |
- <div class="container"> |
| 114 |
- <div class="row"> |
| 115 |
- <div class="col-md-12"> |
| 116 |
- <h1 class="first-header">Gentoo mirrorstats</h1> |
| 117 |
- |
| 118 |
- <p> |
| 119 |
- Welcome to the Gentoo Linux <tt>mirrorstats</tt> system. |
| 120 |
- This page links to the mirror status for rsync & source mirrors. |
| 121 |
- </p> |
| 122 |
- |
| 123 |
- <h2>Gentoo rsync mirrors</h2> |
| 124 |
- <p>Gentoo rsync mirrors tracked include both official mirrors run by the Gentoo Infrastructure team, as well as community-run mirrors.</p> |
| 125 |
- <ul> |
| 126 |
- <li><a href="https://www.gentoo.org/support/rsync-mirrors/">Listing of Gentoo rsync mirrors</a></li> |
| 127 |
- <li><a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Rsync">How to contribute a new rsync mirror</a></li> |
| 128 |
- <li><a href="/rsync/">Status of Gentoo rsync mirrors</a></li> |
| 129 |
- </ul> |
| 130 |
- |
| 131 |
- <h2>Gentoo source mirrors</h2> |
| 132 |
- <ul> |
| 133 |
- <li><a href="https://www.gentoo.org/downloads/mirrors/">Listing of Gentoo source mirrors</a></li> |
| 134 |
- <li><a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Source">How to contribute a new source mirror</a></li> |
| 135 |
- <li><a href="/distfiles/">Status of Gentoo source mirrors: <tt>/distfiles/</tt></a> |
| 136 |
- <li><a href="/experimental/">Status of Gentoo source mirrors: <tt>/experimental/</tt></a> |
| 137 |
- <li><a href="/releases/">Status of Gentoo source mirrors: <tt>/releases/</tt></a> |
| 138 |
- <li><a href="/snapshots/">Status of Gentoo source mirrors: <tt>/snapshots/</tt></a> |
| 139 |
- </ul> |
| 140 |
- |
| 141 |
- <div class="alert alert-warning"> |
| 142 |
- 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> |
| 143 |
- Please include lots of details about the problem, as the Gentoo |
| 144 |
- mirror team will have to contact the administrator of individual |
| 145 |
- mirrors to work on problems. |
| 146 |
- <ul> |
| 147 |
- <li><b>Hostname</b> of the mirror (in the summary & description)</li> |
| 148 |
- <li><b>IP</b> of the mirror: many mirrors have multiple nodes behind a single DNS entry</li> |
| 149 |
- <li><b>Timestamp</b> of the problem</li> |
| 150 |
- <li><b>Logs</b> of the problem</li> |
| 151 |
- </ul> |
| 152 |
- </div> |
| 153 |
- |
| 154 |
- <div class="alert alert-warning"> |
| 155 |
- If you experience problems with this site (<tt>mirrorstats.gentoo.org</tt>), please file clearly marked bugs in |
| 156 |
- <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>. |
| 157 |
- Please remember to include <tt>mirrorstats</tt> in the summary line. |
| 158 |
- </div> |
| 159 |
- |
| 160 |
- </div> |
| 161 |
- </div> |
| 162 |
- </div> |
| 163 |
- |
| 164 |
- <footer> |
| 165 |
- <div class="container"> |
| 166 |
- <div class="row"> |
| 167 |
- <div class="col-xs-12 col-md-offset-2 col-md-7"> |
| 168 |
- |
| 169 |
- </div> |
| 170 |
- <div class="col-xs-12 col-md-3"> |
| 171 |
- <h3 class="footerhead">Questions or comments?</h3> |
| 172 |
- Please feel free to <a href="https://www.gentoo.org/inside-gentoo/contact/">contact us</a>. |
| 173 |
- </div> |
| 174 |
- </div> |
| 175 |
- <div class="row"> |
| 176 |
- <div class="col-xs-2 col-sm-3 col-md-2"> |
| 177 |
- <ul class="footerlinks three-icons"> |
| 178 |
- <li><a href="https://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li> |
| 179 |
- <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li> |
| 180 |
- <li></li> |
| 181 |
- </ul> |
| 182 |
- </div> |
| 183 |
- <div class="col-xs-10 col-sm-9 col-md-10"> |
| 184 |
- <strong>© 2001–2020 Gentoo Foundation, Inc.</strong><br> |
| 185 |
- <small> |
| 186 |
- Gentoo is a trademark of the Gentoo Foundation, Inc. |
| 187 |
- The contents of this document, unless otherwise expressly stated, are licensed under the |
| 188 |
- <a href="https://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license. |
| 189 |
- The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply. |
| 190 |
- </small> |
| 191 |
- </div> |
| 192 |
- </div> |
| 193 |
- </div> |
| 194 |
- </footer> |
| 195 |
- |
| 196 |
- <script src="https://assets.gentoo.org/tyrian/v1/jquery.min.js"></script> |
| 197 |
- <script src="https://assets.gentoo.org/tyrian/v1/bootstrap.min.js"></script> |
| 198 |
- </body> |
| 199 |
-</html> |
| 200 |
|
| 201 |
diff --git a/html/generate.py b/html/generate.py |
| 202 |
index 8ab5898..025004d 100755 |
| 203 |
--- a/html/generate.py |
| 204 |
+++ b/html/generate.py |
| 205 |
@@ -19,7 +19,7 @@ import urllib.request, json |
| 206 |
import xml.etree.ElementTree as ET |
| 207 |
import jinja2 |
| 208 |
|
| 209 |
-html_folder = "/var/www/mirrorstats.gentoo.org/htdocs/new/" |
| 210 |
+html_folder = "/var/www/mirrorstats.gentoo.org/htdocs/" |
| 211 |
template_folder = "/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/html/" |
| 212 |
cache_path = "/var/www/mirrorstats.gentoo.org/var/html_data_cache.json" |
Archives
