Changeset - de6652eaf965
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Dennis Fink - 10 years ago 2014-12-14 11:51:36
dennis.fink@c3l.lu
Use configuration variables for onion addresses, as these are more prone to change
3 files changed with 5 insertions and 5 deletions:
ennstatus/templates/base.html
3
3
ennstatus/templates/root/contact.html
1
1
ennstatus/templates/status/macros.html
1
1
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
➞
Show inline comments
 
@@ -13,93 +13,93 @@
 

			




	
	
	
		
 
{% block styles %}

			




	
	
	
		
 
  {{ super() }}

			




	
	
	
		
 
  <link rel="stylesheet" href="{{ url_for('static', filename='css/ennstatus.css') }}" />

			




	
	
	
		
 
  <link rel="shortcut icon" href="{{ url_for('static', filename='images/favicon.png') }}">

			




	
	
	
		
 
{% endblock %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block body %}

			




	
	
	
		
 
<a href="#content" class="sr-only">Skip to main content</a>

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  {% block navbar %}

			




	
	
	
		
 
  <div class="navbar navbar-default">

			




	
	
	
		
 
    <div class="navbar-header">

			




	
	
	
		
 
      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">

			




	
	
	
		
 
        <span class="icon-bar"></span>

			




	
	
	
		
 
        <span class="icon-bar"></span>

			




	
	
	
		
 
        <span class="icon-bar"></span>

			




	
	
	
		
 
      </button>

			




	
	
	
		
 
      <a class="navbar-brand" href="{{ url_for('root.index') }}">Enn.lu</a>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="navbar-collapse collapse">

			




	
	
	
		
 
      <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 %}

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li>

			




	
	
	
		
 
          <a href="{{ url_for('root.about') }}">About</a>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li>

			




	
	
	
		
 
          <a href="{{ url_for('root.services') }}">Services</a>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Donate <b class="caret"></b></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.index') }}">Support us</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.wiretransfer') }}">Wiretransfer</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.snailmail') }}">Snailmail</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.paypal') }}">PayPal</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.bitcoin') }}">Bitcoin</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.flattr') }}">Flattr</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.bpm') }}">BPM</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('donate.received') }}">Received Donations</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Partners <b class="caret"></b/></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li><a href="{{ url_for('root.partners') }}">Official Partners</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.bridgeprogram') }}">Bridge Program</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li>

			




	
	
	
		
 
          <a href="{{ url_for('root.contact') }}">Contact</a>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li>

			




	
	
	
		
 
          <a href="{{ url_for('root.abuse') }}">Abuse</a>

			




	
	
	
		
 
        </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">

			




	
	
	
		
 
            <li><a href="{{ url_for('status.index') }}">All nodes</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('status.exit') }}">Exit nodes</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('status.relay') }}">Relay nodes</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('status.bridge') }}">Bridge nodes</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('status.about') }}">Ënnstatus About</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistics <b class="caret"></b></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li class="disabled"><a href="#">Statistics</a></li>

			




	
	
	
		
 
            <li class="divider"></li>

			




	
	
	
		
 
            <li class="dropdown-header">Worldmaps</li>

			




	
	
	
		
 
            <li><a href="{{ url_for('stats.worldmap') }}">All nodes</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('stats.worldmap', server_type='exit') }}">Exit nodes</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('stats.worldmap', server_type='relay') }}">Relay nodes</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('stats.worldmap', server_type='bridge') }}">Bridge nodes</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
      </ul>

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/contact.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -9,45 +9,45 @@

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <div class="col-md-8">

			




	
	
	
		
 
    <h2>General</h2>

			




	
	
	
		
 
    <div class="pull-right">

			




	
	
	
		
 
      <form class="form-inline" role="form" method="POST" action="{{ url_for('root.contact') }}">

			




	
	
	
		
 
        {{ form.hidden_tag()}}

			




	
	
	
		
 
        <div class="form-group">

			




	
	
	
		
 
          {{ form.country.label }}

			




	
	
	
		
 
          {{ form.country(_class="form-control") }}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <input type="submit" class="btn btn-primary btn-sm" value="Submit">

			




	
	
	
		
 
      </form>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="clearfix"></div>

			




	
	
	
		
 

			




	
	
	
		
 
    <p>Please mail all general inquiries to:</p>

			




	
	
	
		
 
    <address>

			




	
	
	
		
 
      <strong>Frënn vun der Ënn, ASBL</strong><br>

			




	
	
	
		
 
              BPM 381892<br>

			




	
	
	
		
 
              {{ address['address'] }}<br>

			




	
	
	
		
 
              {{ address['postal_code'] }}, {{ address['city'] }}<br>

			




	
	
	
		
 
              {{ 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>

			




	
	
	
		
 
 

			




	
	
	
		
 
    <h2>Abuse</h2>

			




	
	
	
		
 
    <p>For further details about abuse handling, have a look over <a href="{{ url_for('root.abuse') }}">here</a>.</p>

			




	
	
	
		
 
    <address>

			




	
	
	
		
 
      <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:abuse@enn.lu">abuse@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="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>+352-691-71-77-44<br>

			




	
	
	
		
 
    </address>

			




	
	
	
		
 

			




	
	
	
		
 
    <h2>Press</h2>

			




	
	
	
		
 
    <p>Press related inqueries should go to:</p>

			




	
	
	
		
 
    <address>

			




	
	
	
		
 
      <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:press@enn.lu">press@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="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>+352-691-71-77-44<br>

			




	
	
	
		
 
    </address>

			




	
	
	
		
 

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
{% endblock %}

			




        

    


    
    

    

        

                

                    ennstatus/templates/status/macros.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -9,49 +9,49 @@

			




	
	
	
		
 
  <p class={{ color }}>{{ status }}</p>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro colorize_obfs(obfs) %}

			




	
	
	
		
 
  {% if obfs %}

			




	
	
	
		
 
    {% set color = "text-success" %}

			




	
	
	
		
 
  {% else %}

			




	
	
	
		
 
    {% set color = "text-danger" %}

			




	
	
	
		
 
  {% endif %}

			




	
	
	
		
 
  <p class={{ color }}>{{ obfs }}</p>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_country(country) %}

			




	
	
	
		
 
  {% set country_class = "flag-" + country|lower|replace(' ', '-') %}

			




	
	
	
		
 
  <i class={{ country_class }}></i> {{ country|title }}

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_fingerprint(fingerprint, server_type) %}

			




	
	
	
		
 
  {% if server_type in ('Exit', 'Relay') %}

			




	
	
	
		
 
    {% set url_type = 'relay' %}

			




	
	
	
		
 
  {% else %}

			




	
	
	
		
 
    {% 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 %}

			




	
	
	
		
 
  <a href="{{ url_root }}/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_name(name) %}

			




	
	
	
		
 
  <a href="http://{{ name|lower }}.enn.lu">{{ name }}</a>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_server_table(server_type, servers) %}

			




	
	
	
		
 
  {% if server_type in ('Exit', 'Relay') %}

			




	
	
	
		
 
    {% set headers = ('#', 'Name', 'IP', 'IP6', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)') %}

			




	
	
	
		
 
  {% else %}

			




	
	
	
		
 
    {% set headers = ('#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Flashproxy', 'meek', 'Last Updated (UTC)') %}

			




	
	
	
		
 
  {% endif %}

			




	
	
	
		
 
  <h2>{{ server_type }}</h2>

			




	
	
	
		
 
  <table class="table table-bordered table-striped">

			




	
	
	
		
 
    <thead>

			




	
	
	
		
 
      <tr>

			




	
	
	
		
 
        {% for name in headers %}

			




	
	
	
		
 
          <th>{{ name }}</th>

			




	
	
	
		
 
        {% endfor %}

			




	
	
	
		
 
      </tr>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: saturn-1810549
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support