X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/9196bf0d07203521a151dfde00bff2ec79cf8e72..467fb88cfa70f63cf566ffe5ac8a64809a65a06a:/Services.mdwn?ds=sidebyside

diff --git a/Services.mdwn b/Services.mdwn
index 8db25f0..69c4ead 100644
--- a/Services.mdwn
+++ b/Services.mdwn
@@ -1,36 +1,15 @@
+[[!meta stylesheet="assets/bw_graphs" rel="stylesheet" title="graphs"]]
+[[!meta stylesheet="assets/weights_graphs" rel="stylesheet" title="graphs"]]
+[[!meta link="https://onionoo.torproject.org" rel="preconnect"]]
 [[!meta script="assets/l10n.fr"]]
 [[!meta script="assets/relays"]]
 [[!meta script="assets/d3/d3.v3.min"]]
 [[!meta script="assets/bw_graphs"]]
-[[!meta stylesheet="assets/bw_graphs" rel="stylesheet" title="graphs"]]
 [[!meta script="assets/weights_graphs"]]
-[[!meta stylesheet="assets/weights_graphs" rel="stylesheet" title="graphs"]]
 [[!meta script="assets/pie_graphs"]]
 [[!meta title="Services"]]
 
-<script>
-
-var content = d3.select("#content");
-var consensus_figure = content.append("figure")
-  .attr('class', 'graph graph-consensus')
-consensus_figure.append("span")
-  .attr("id", "consensus-pie");
-consensus_figure.append("figcaption")
-  .text(L10n.consensus_weight);
-
-var exit_figure = content.append("figure")
-  .attr('class', 'graph graph-exit')
-exit_figure.append("span")
-  .attr("id", "exit-pie");
-exit_figure.append("figcaption")
-  .text(L10n.exit_probability);
-
-content.append("div")
-  .style("clear", "left");
-
-new ConsensusPieDrawer("#consensus-pie").draw();
-new ExitPieDrawer("#exit-pie").draw();
-</script>
+<script type="text/javascript" src="../assets/services-pie.js"></script>
 
 Relais
 ======
@@ -48,50 +27,73 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
   </thead>
   <tbody>
     <tr>
-      <td><a href="http://www.liazo.fr/">Liazo</a></td>
-      <td><a href="https://atlas.torproject.org/#details/EFAE44728264982224445E96214C15F9075DEE1D">marcuse1</a><sup>1</sup></td>
+      <td><a href="https://www.ielo-liazo.com/">IELO-LIAZO</a></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/EFAE44728264982224445E96214C15F9075DEE1D">marcuse1</a><sup>1</sup></td>
       <td><code>EFAE 4472 8264 9822 2444 5E96 214C 15F9 075D EE1D</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
     <tr>
-      <td><a href="http://www.liazo.fr/">Liazo</a></td>
-      <td><a href="https://atlas.torproject.org/#details/C656B41AEFB40A141967EBF49D6E69603C9B4A11">marcuse2</a><sup>2</sup></td>
+      <td><a href="https://www.ielo-liazo.com/">IELO-LIAZO</a></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/C656B41AEFB40A141967EBF49D6E69603C9B4A11">marcuse2</a><sup>2</sup></td>
       <td><code>C656 B41A EFB4 0A14 1967 EBF4 9D6E 6960 3C9B 4A11</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
     <tr>
       <td><a href="https://www.gandi.net/">Gandi</a><sup>3</sup></td>
-      <td><a href="https://atlas.torproject.org/#details/9BA84E8C90083676F86C7427C8D105925F13716C">ekumen</a></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/9BA84E8C90083676F86C7427C8D105925F13716C">ekumen</a></td>
       <td><code>9BA8 4E8C 9008 3676 F86C 7427 C8D1 0592 5F13 716C</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
     <tr>
       <td><a href="https://tetaneutral.net/">tetaneutral.net</a></td>
-      <td><a href="https://atlas.torproject.org/#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06">marylou1</a><sup>4</sup></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/578E007E5E4535FBFEF7758D8587B07B4C8C5D06">marylou1</a><sup>4</sup></td>
       <td><code>578E 007E 5E45 35FB FEF7 758D 8587 B07B 4C8C 5D06</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
     <tr>
       <td><a href="https://tetaneutral.net/">tetaneutral.net</a></td>
-      <td><a href="https://atlas.torproject.org/#details/90FD830C357A5109AB3C505287713F1AC811174C">marylou2</a><sup>5</sup></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/90FD830C357A5109AB3C505287713F1AC811174C">marylou2</a><sup>5</sup></td>
       <td><code>90FD 830C 357A 5109 AB3C 5052 8771 3F1A C811 174C</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
     <tr>
       <td><a href="http://www.globenet.org/">Globenet</a></td>
-      <td><a href="https://atlas.torproject.org/#details/8E6EDA78D8E3ABA88D877C3E37D6D4F0938C7B9F">AlGrothendieck</a><sup>5</sup></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/8E6EDA78D8E3ABA88D877C3E37D6D4F0938C7B9F">AlGrothendieck</a></td>
       <td><code>8E6E DA78 D8E3 ABA8 8D87 7C3E 37D6 D4F0 938C 7B9F</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
-
+    <tr>
+      <td><a href="https://www.aquilenet.fr/">Aquilenet</a></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/F47B13BFCE4EF48CDEF6C4D7C7A99208EBB972B5">elenagb</a></td>
+      <td><code>F47B 13BF CE4E F48C DEF6 C4D7 C7A9 9208 EBB9 72B5</code></td>
+      <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
+    </tr>
+    <tr>
+      <td><a href="https://www.data-expertise.com/">Data Expertise - Human's Connexion</a></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/B580111855B9C452EB224CA7932B626E28D3C2EA">mwittig</a></td>
+      <td><code>B580 1118 55B9 C452 EB22 4CA7 932B 626E 28D3 C2EA</code></td>
+      <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
+    </tr>
+    <tr>
+      <td><a href="https://milkywan.fr/">MilkyWan</a></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/CD1FD2C1F330A3293DA6068E6A23866D063D6DCB">arecoque1</a><sup>6</sup></td>
+      <td><code>CD1F D2C1 F330 A329 3DA6 068E 6A23 866D 063D 6DCB</code></td>
+      <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
+    </tr>
+    <tr>
+      <td><a href="https://milkywan.fr/">MilkyWan</a></td>
+      <td><a href="https://metrics.torproject.org/rs.html#details/42E817BE07AB39CA3BD7A442AF08E007FF2E3F5B">arecoque2</a><sup>7</sup></td>
+      <td><code>42E8 17BE 07AB 39CA 3BD7 A442 AF08 E007 FF2E 3F5B</code></td>
+      <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
+    </tr>
   </tbody>
   <tfoot class="footnotes">
     <tr>
       <td colspan="4">
-        1,2 : <code>marcuse1</code> et <code>marcuse2</code> sont sur une même
-        machine. Afin de pallier à des limitations techniques du logiciel dans
-        la gestion du multi-cœur, il est nécessaire de faire fonctionner deux
-        relais afin de pouvoir utiliser toute la bande passante disponible.
+        1,2; 4,5 et 6,7 : Ces deux nœuds sont sur une même machine. Afin de pallier des
+        limitations techniques du logiciel dans la gestion du multi-cœur, il
+        est nécessaire de faire fonctionner deux relais afin de pouvoir
+        utiliser toute la bande passante disponible.
       </td>
     </tr>
     <tr>
@@ -99,32 +101,8 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
         3 : Gandi nous fournit gracieusement la bande passante pour faire tourner
         ce noeud.
       </td>
-      </tr>
-	<tr>
-      <td colspan="4">
-        4,5 : <code>marylou1</code> et <code>marylou2</code> sont sur une même
-        machine. Afin de pallier à des limitations techniques du logiciel dans
-        la gestion du multi-cœur, il est nécessaire de faire fonctionner deux
-        relais afin de pouvoir utiliser toute la bande passante disponible.
-      </td>
     </tr>
   </tfoot>
 </table>
 
-<script>
-d3.select("#content").append("h1")
-  .text(L10n.bandwidth);
-d3.select("#content").append("div")
-  .attr("id", "bandwidth")
-  .text(L10n.loading);
-
-new BwDrawer("#bandwidth").draw();
-
-d3.select("#content").append("h1")
-  .text(L10n.weights);
-d3.select("#content").append("div")
-  .attr("id", "weights")
-  .text(L10n.loading);
-
-new WeightsDrawer("#weights").draw();
-</script>
+<script type="text/javascript" src="../assets/services-plot.js"></script>