Changeset - 286ed44ec59c
[Not reviewed]
version_5
0 4 0
Dennis Fink - 9 years ago 2015-10-13 22:39:33
dennis.fink@c3l.lu
Fix hidden services url generation
4 files changed with 19 insertions and 23 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
Show inline comments
 
{% extends "bootstrap/base.html" %}
 

	
 
{% import 'macros.html' as base_macros with context %}
 

	
 
{% if '.onion' in request.url_root %}
 
  {% set wiki_url = config['ENNSTATUS_WIKI_ONION_ADDRESS'] %}
 
{% elif '.bit' in request.url_root %}
 
  {% set wiki_url = config['ENNSTATUS_WIKI_BIT_ADDRESS'] %}
 
{% else %}
 
  {% set wiki_url = "//wiki.enn.lu" %}
 
{% endif %}
 

	
 
{% block title %}
 
  Frënn vun der Ënn - {{ title }}
 
{% endblock %}
 

	
 
{% block metas %}
 
  {{ super() }}
 
  <meta charset="utf-8">
 
  <meta name="application-name" content="Ënnstatus">
 
  <meta name="author" content="Frënn vun der Ënn">
 
{% endblock %}
 

	
 
{% block styles %}
 
@@ -29,40 +37,40 @@
 
        <span class="icon-bar"></span>
 
        <span class="icon-bar"></span>
 
        <span class="icon-bar"></span>
 
      </button>
 
      <img class="navbar-brand" src="{{ url_for('static', filename='images/logo/FVDE_logo_thumbnail.png') }}"></img>
 
      <a class="navbar-brand" href="{{ url_for('root.index') }}">Enn.lu</a>
 
    </div>
 
    <div class="navbar-collapse collapse">
 
      <ul class="nav navbar-nav">
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="https://wiki.enn.lu/doku.php?id=news" target="blank">News</a></li>
 
            <li><a href="{{ wiki_url }}/doku.php?id=news" target="blank">News</a></li>
 
            <li><a href="{{ url_for('root.about') }}">Organization</a></li>
 
            <li><a href="{{ url_for('root.partners') }}">Partners</a></li>
 
          </ul>
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Services <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li class="dropdown-submenu">
 
              <a>Tor Servers</a>
 
              <ul class="dropdown-menu">
 
                <li><a href="{{ url_for('status.index') }}">Ennstatus Panel</a></li>
 
              </ul>
 
            </li>
 
            <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>
 
            <li><a href="{{ base_macros.get_wiki_address() }}">Wiki</a></li>
 
            <li><a href="{{ wiki_url }}">Wiki</a></li>
 
            <li><a href="{{ url_for('root.disclaimer') }}">About Ennstatus</a></li>
 
          </ul>
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('donate.index') }}">Donate</a></li>
 
            <li><a href="{{ url_for('donate.received') }}">Donation history</a></li>
 
            <li><a href="{{ url_for('root.member') }}">Join us</a></li>
 
            <li class="dropdown-submenu">
 
              <a>Special programs</a>
 
              <ul class="dropdown-menu">
ennstatus/templates/macros.html
Show inline comments
 
@@ -7,22 +7,12 @@
 
    "alert-info"
 
  {% endif %}
 
{% endmacro %}
 
    
 

	
 
{% macro display_error(category, message) %}
 
  {% set color = get_category_color(category) %}
 
  <div class="{{ ' '.join(('alert', color)) }}">
 
    <button type="button" class="close" data-dismiss="alert">&times;</button>
 
    {{ message }}
 
  </div>
 
{% endmacro %}
 

	
 
{% macro get_wiki_address() %}
 
  {% if '.onion' in request.url_root %}
 
    {{ config['ENNSTATUS_WIKI_ONION_ADDRESS'] }}
 
  {% elif '.bit' in request.url_root %}
 
    {{ config['ENNSTATUS_WIKI_BIT_ADDRESS'] }}
 
  {% else %}
 
    //wiki.enn.lu
 
  {% endif %}
 
{% endmacro %}
ennstatus/templates/root/abuse.html
Show inline comments
 
@@ -10,25 +10,25 @@
 
  <div class="col-md-1">
 
  </div>
 
  <div class="col-md-11">
 
    <h2>Abuse handling</h2>
 
    <p class="lead">We take our mission very seriously and carefully examine abuse cases.</p>
 
    <p>If you have any question regarding abusive traffic emanating from one of our Tor Exit nodes, don't hesitate to contact our abuse departement. Please make sure to include the following details in your enquiry:</p>
 
    <ul>
 
      <li>the offending IP address'</li>
 
      <li>the type &amp; address' of the abused service(s)</li>
 
      <li>your contact information</li>
 
    </ul><br>
 
    <p>
 
      For transparency reasons we publish monthly <a href="https://wiki.enn.lu/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.
 
    For transparency reasons we publish monthly <a href="{{ wiki_url }}/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.
 
    </p>
 
    <h3>Abuse contact</h3>
 
    <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>
 
    </address>
 
    <h3>RIPE Contact</h3>
 
    <p>We also have ar <a href="https://apps.db.ripe.net/search/lookup.html?source=ripe&key=FE1862-RIPE&type=PERSON">RIPE entry</a></p>
 
    <h3>Spam &amp; Trolling</h3>
 
    <p>
 
      We are receiving a lot of automatically generated messages from self-proclaimed DMCA-Ninjas. Many of those 'inquiries' don't even include basic contact information or meaningful server logs.
 
      It is not our job to process 'junk mail' or communicate with robots. Our sysadmins will take the appropriate measures to ban such 'abuse spam' from our network.
 
    </p>
ennstatus/templates/root/mirrors.html
Show inline comments
 
{% extends "base.html" %}
 

	
 
{% set title = "Partners" %}
 

	
 
{% macro get_globe_address() %}
 
  {% if '.onion' in request.url_root %}
 
    {{ config['ENNSTATUS_GLOBE_ONION_ADDRESS'] }}
 
  {% elif '.bit' in request.url_root %}
 
    {{ config['ENNSTATUS_GLOBE_BIT_ADDRESS'] }}
 
  {% else %}
 
    //globe.enn.lu
 
  {% endif %}
 
{% endmacro %}
 
{% if '.onion' in request.url_root %}
 
  {% set globe_url = config['ENNSTATUS_GLOBE_ONION_ADDRESS'] %}
 
{% elif '.bit' in request.url_root %}
 
  {% set globe_url = config['ENNSTATUS_GLOBE_BIT_ADDRESS'] %}
 
{% else %}
 
  {% set globe_url = "//globe.enn.lu" %}
 
{% endif %}
 

	
 
{% block content %}
 
  <div class="col-md-4 text-center">
 
    <img src="{{ url_for('static', filename='images/Services.png') }}" class="img-rounded" alt="Partners" width="160"></img>
 
    <h3>Mirrors</h3>
 
  </div>
 
  <div class="col-md-8">
 
    <h2>Mirrors</h2>
 
    <p class="lead">In addition to our Tor relays we are providing mirrors for some popular services.</p>
 
    <dl>
 
      <dt><a href="http://torproject.lu" target="_blank">torproject.lu</a></dt>
 
      <dd>This is a mirror of the the Tor Project's main website torproject.org</dd>
 
      <br>
 
      <dt><a href="http://tails.c3l.lu/" target="_blank">tails.enn.lu</a></dt>
 
      <dd>A Tails Download mirror. Tails is a live operating system, that you can start on almost any computer from a DVD, USB stick, or SD card. It aims at preserving your privacy and anonymity. <a href="https://tails.boum.org/" target="blank">Learn more about Tails</a></dd>
 
      <br>
 
      <dt><a href="{{ get_globe_address() }}" target="_blank">globe.enn.lu</a></dt>
 
      <dt><a href="{{ globe_url }}" target="_blank">globe.enn.lu</a></dt>
 
      <dd>Globe is a Tor relay and bridge explorer.</dd>
 
    </dl>
 
  </div>
 
{% endblock %}
0 comments (0 inline, 0 general)