X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/2d85cbd8531a528da2da82bd0134f64359d39a29..048e7f9ec94c8edba03f5fc2d8e04fcf004e2f26:/Services.mdwn

diff --git a/Services.mdwn b/Services.mdwn
index 46d2843..9d59bd4 100644
--- a/Services.mdwn
+++ b/Services.mdwn
@@ -9,33 +9,18 @@
 <script>
 
 var content = d3.select("#content");
-var consensus_div = content.append("div")
-consensus_div.append("div")
-  .attr("id", "consensus-pie")
-  .style("width", PieDrawer.width + "px")
-  .style("height", PieDrawer.height + "px")
-  .style("float", "left");
-consensus_div.append("div")
-  .style("width", "460px")
-  .style("margin-left", "5px")
-  .style("line-height", PieDrawer.height + "px")
-  .style("font-weight", "bold")
-  .style("float", "left")
+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_div = content.append("div")
-exit_div.append("div")
-  .attr("id", "exit-pie")
-  .style("width", PieDrawer.width)
-  .style("height", PieDrawer.height)
-  .style("clear", "left")
-  .style("float", "left");
-exit_div.append("div")
-  .style("width", "460px")
-  .style("margin-left", "5px")
-  .style("line-height", PieDrawer.height + "px")
-  .style("font-weight", "bold")
-  .style("float", "left")
+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")
@@ -62,22 +47,35 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
   <tbody>
     <tr>
       <td><a href="http://www.liazo.fr/">Liazo</a></td>
-      <td><a href="https://atlas.torproject.org/#details/011FDD1EE84DAC7758119B69829C74A9D197B35E">marcuse1</a><sup>1</sup></td>
-      <td><code>011F DD1E E84D AC77 5811 9B69 829C 74A9 D197 B35E</code></td>
+      <td><a href="https://atlas.torproject.org/#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/1A503BBFFC82A4EFD75DB46A071A7340E11A9DB9">marcuse2</a><sup>2</sup></td>
-      <td><code>1A50 3BBF FC82 A4EF D75D B46A 071A 7340 E11A 9DB9</code></td>
+      <td><a href="https://atlas.torproject.org/#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/7F2CD6BD548C5FFA09B20A0C5CB07893C9451653">ekumen</a></td>
-      <td><code>7F2C D6BD 548C 5FFA 09B2 0A0C 5CB0 7893 C945 1653</code></td>
+      <td><a href="https://atlas.torproject.org/#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><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><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>
+
   </tbody>
   <tfoot class="footnotes">
     <tr>
@@ -90,8 +88,16 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
     </tr>
     <tr>
       <td colspan="4">
-        3 : Gandi nous fournit gracieusement les ressources pour faire tourner
-        ce noeud (machine virtuelle et bande passante).
+        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 palier à 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>