# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2014-12-14 11:51:36
# Node ID de6652eaf96518752d56f04c4e6c3d5b7380b38f
# Parent  5ee60a4a2fb215e2b55194ecea0aa9be25c75fad

Use configuration variables for onion addresses, as these are more prone to change

diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html
--- a/ennstatus/templates/base.html
+++ b/ennstatus/templates/base.html
@@ -34,7 +34,7 @@
       <ul class="nav navbar-nav navbar-left">
         <li>
           {% if '.onion' in request.url_root %}
-            <a href="//qzz2cvotstk357oj.onion/doku.php?id=news">News</a>
+            <a href="//{{ config['ENNSTATUS_WIKI_ONION_ADDRESS']}}/doku.php?id=news">News</a>
           {% else %}
             <a href="//wiki.enn.lu/doku.php?id=news">News</a>
           {% endif %}
@@ -74,11 +74,11 @@
         </li>
         <li>
           {% if '.onion' in request.url_root %}
-            <a href="//qzz2cvotstk357oj.onion">Wiki</a>
+            <a href="//{{ config['ENNSTATUS_WIKI_ONION_ADDRESS'] }}">Wiki</a>
           {% else %}
             <a href="//wiki.enn.lu">Wiki</a>
           {% endif %}
-        </li>
+       </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Servers <b class="caret"></b></a>
           <ul class="dropdown-menu">
diff --git a/ennstatus/templates/root/contact.html b/ennstatus/templates/root/contact.html
--- a/ennstatus/templates/root/contact.html
+++ b/ennstatus/templates/root/contact.html
@@ -30,7 +30,7 @@
               {{ address['country'] }}<br>
               <br>
       <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a><br>
-      <abbr title="Website"><span class="glyphicon glyphicon-cloud"></span></abbr> : <a href="//enn.lu/">enn.lu/</a> <strong>or</strong> <a href="//wwjewp6ca4rkudyj.onion/" target="_blank">wwjewp6ca4rkudyj.onion</a><br>
+      <abbr title="Website"><span class="glyphicon glyphicon-cloud"></span></abbr> : <a href="//enn.lu/">enn.lu/</a> <strong>or</strong> <a href="//{{ config['ENNSTATUS_ONION_ADDRESS'] }}/" target="_blank">{{ config['ENNSTATUS_ONION_ADDRESS'] }}</a><br>
       <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : +352-691-71-77-44<br>
       <abbr title="Fax"><span class="glyphicon glyphicon-phone-alt"></span></abbr> : +352-20-21-18-60
     </address>
diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html
--- a/ennstatus/templates/status/macros.html
+++ b/ennstatus/templates/status/macros.html
@@ -30,7 +30,7 @@
     {% set url_type = 'bridge' %}
   {% endif %}
   {% if '.onion' in request.url_root %}
-    {% set url_root = '//ji3yb2tncy6naj7b.onion' %}
+    {% set url_root = '//%s' % config['ENNSTATUS_GLOBE_ONION_ADDRESS'] %}
   {% else %}
     {% set url_root = '//globe.enn.lu' %}
   {% endif %}