Changeset - 9b6f573ebffd
ennstatus/__init__.py
Show inline comments
 
@@ -18,16 +18,16 @@ import os.path
 
import json
 

	
 
from flask import Flask, render_template
 
from flask.ext.bootstrap import Bootstrap
 
from flask.ext.wtf import CsrfProtect
 
from flask.ext.moment import Moment
 
from flask_bootstrap import Bootstrap
 
from flask_wtf import CSRFProtect
 
from flask_moment import Moment
 

	
 
from werkzeug.contrib.fixers import ProxyFix
 

	
 
import gnupg
 

	
 
bootstrap = Bootstrap()
 
csrf = CsrfProtect()
 
csrf = CSRFProtect()
 
moment = Moment()
 

	
 
config_file = os.path.abspath('config.json')
ennstatus/api/auth.py
Show inline comments
 
@@ -15,7 +15,7 @@
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

	
 
from flask import current_app
 
from flask.ext.httpauth import HTTPDigestAuth
 
from flask_httpauth import HTTPDigestAuth
 

	
 
httpauth = HTTPDigestAuth()
 

	
ennstatus/static/images/partners/Logo-Piratepartei2014.png
Show inline comments
 
binary diff not shown
Show images
ennstatus/static/images/partners/logo-c3l.png
Show inline comments
 
binary diff not shown
Show images
ennstatus/templates/donate/index.html
Show inline comments
 
@@ -20,13 +20,13 @@
 
{% set title = "Donate" %}
 

	
 
{% block content %}
 
  <div class="col-md-4">
 
  <div class="col-md-4 visible-md visible-lg">
 
    <img src="{{ url_for('static', filename='images/Support.png') }}" class="img-responsive img-rounded center-block" alt="WhoIs" width="160"></img>
 
    <div class="text-center">
 
      <h2>Support us!</h2>
 
    </div>
 
  </div>
 
  <div class="col-md-8">
 
  <div class="col-sm-12 col-md-8">
 
    <div class="jumbotron">
 
      <h2>Take action for a <strong>#FreeInternet</strong>! Support us today!</h2>
 
      <p>As a non-profit organization we are 100% community funded. Donations from our members and supporters will be used to <strong>power Tor nodes</strong>, <strong>print flyers and posters</strong> or cover administrative charges.</p>
 
@@ -35,7 +35,7 @@
 
    </div>
 
  </div>
 
  <div class="col-md-12">
 
    <div class="col-md-4">
 
    <div class="col-xs-12 col-sm-6 col-md-4">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>Wire Transfer </h3>
 
@@ -57,7 +57,7 @@
 
       </div>
 
      </div>
 
    </div>
 
    <div class="col-md-4 clearfix">
 
    <div class="col-xs-12 col-sm-6 col-md-4 clearfix">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>SnailMail</h3>
 
@@ -74,7 +74,7 @@
 
        </div>
 
      </div>
 
    </div>
 
    <div class="col-md-4">
 
    <div class="col-xs-12 col-sm-6 col-md-4">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>Bitcoin</h3>
 
@@ -91,7 +91,7 @@
 
    </div>
 
  </div>
 
  <div class="col-md-12">
 
    <div class="col-md-4">
 
    <div class="col-xs-12 col-sm-6 col-md-4">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>PayPal <small><span class="label label-danger">high fees</span></small></h3>
 
@@ -107,7 +107,7 @@
 
        </center>
 
      </div>
 
    </div>
 
    <div class="col-md-4">
 
    <div class="col-xs-12 col-sm-6 col-md-4">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>Flattr</h3>
 
@@ -120,7 +120,7 @@
 
        </center>
 
      </div>
 
    </div>
 
    <div class="col-md-4">
 
    <div class="col-xs-12 col-sm-6 col-md-4">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>Patreon</h3>
ennstatus/templates/root/about.html
Show inline comments
 
@@ -20,7 +20,7 @@
 
{% set title = "Who we are" %}
 

	
 
{% block content %}
 
  <div class="col-md-offset-1 col-md-11">
 
  <div class="col-sm-12 col-md-offset-1 col-md-11">
 
    <h2>Who we are</h2>
 
    <h3>Organization</h3>
 
    <p class="lead">
ennstatus/templates/root/abuse.html
Show inline comments
 
@@ -20,7 +20,7 @@
 
{% set title = "Abuse" %}
 

	
 
{% block content %}
 
  <div class="col-md-offset-1 col-md-11">
 
  <div class="col-sm-12 col-md-offset-1 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>
ennstatus/templates/root/bridgeprogram.html
Show inline comments
 
@@ -22,16 +22,14 @@
 
{% set title = "Bridge Program" %}
 

	
 
{% block content %}
 
  <div class="col-md-offset-1 col-md-10">
 
  <div class="col-sm-12 col-md-offset-1 col-md-11">
 
    <h2>Bridge Program</h2>
 
    <p class="lead">Fight censorship! Our bridge program allows you to support the Tor network by adopting a Tor bridge.</p>
 
    <p> Rather than making a single donation, you can now fund a Tor bridge on your own. Bridges are an important element in the Tor network because they allow people to use the network even if the direct acces to its entry-nodes is blocked in their country. This is mainly the case for people living under oppressive regimes. <a href="https://www.torproject.org/docs/bridges" target="blank"><strong>Read more about Tor bridges</strong></a></p>
 
    <p>With a recurring contribution of 3 EUR/month (duration min. 12 months) you can help us keep such a bridge up and running. The servers for this project are located in Luxembourg.</p>
 
    <p>As a partner in our project you can choose the nickname of your bridge and follow it on <a href="{{ url_for('status.index') }}">Ënnstatus</a>, our self-made information-panel.</p>
 
  </div>
 
  <div class="col-md-1">
 
  </div>
 
  <div class="col-md-offset-1 col-md-6">
 
  <div class="col-sm-12 col-md-offset-1 col-md-6">
 
    <h2>Apply for the bridge program</h2>
 
    <form method="post" class="form form-horizontal" role="form">
 
      {{ form.hidden_tag() }}
 
@@ -97,7 +95,7 @@
 
      </div>
 
    </form>
 
  </div>
 
  <div class="col-md-4">
 
  <div class="col-sm-12 col-md-5">
 
    <h3>More information</h3>
 
    <p>You want to know more about our work?</p>
 
    <p>Our <a href="//wiki.enn.lu/doku.php?id=user:kahpa">bridge operator</a> will give you further information about the project.</p>
ennstatus/templates/root/contact.html
Show inline comments
 
@@ -20,13 +20,13 @@
 
{% set title = "Contact" %}
 

	
 
{% block content %}
 
  <div class="col-md-4">
 
  <div class="col-sm-12 col-md-4">
 
    <img src="{{ url_for('static', filename='images/Contact.png') }}" class="img-responsive img-rounded center-block" alt="WhoIs" width="160"></img>
 
    <div class="text-center">
 
      <h2>Contact</h2>
 
    </div>
 
  </div>
 
  <div class="col-md-8">
 
  <div class="col-sm-12 col-md-8">
 
    <h2>General</h2>
 
    <p>Please mail all general inquiries to:</p>
 
    <address>
 
@@ -41,20 +41,17 @@
 
      <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> : {{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>
 
    </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>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<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>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>
 
    </address>
 

	
 
  </div>
 
{% endblock %}
ennstatus/templates/root/ennstatus.html
Show inline comments
 
@@ -20,15 +20,15 @@
 
{% set title = "About Ënnstatus" %}
 

	
 
{% block content %}
 
  <div class="col-md-offset-1 col-md-11">
 
  <div class="col-sm-12 col-md-offset-1 col-md-11">
 
    <h2>About Ënnstatus</h2>
 
    <div class="col-md-6">
 
    <div class="col-sm-12 col-md-6">
 
      <h3>API</h3>
 
      <p>We provide a <a href="http://json.org/">JSON</a> API for exporting the current status of our servers</p>
 
      <h4>Exporting all servers</h4>
 
      <p>Under the endpoint <a href="{{ url_for('api.export') }}">/api/export</a>, you can find an export of all our servers</p>
 
    </div>
 
    <div class="col-md-6">
 
    <div class="col-sm-12 col-md-6">
 
      <h3>Used libraries:</h3>
 
      <ul>
 
        <li><a href="http://flask.pocoo.org/">Flask</a></li>
ennstatus/templates/root/index.html
Show inline comments
 
@@ -25,10 +25,10 @@
 
{% endblock %}
 

	
 
{% block content %}
 
  <div class="col-md-4">
 
    <img class="img-rounded center-block" alt="FVDE_Logo" src="{{ url_for('static', filename='images/logo/FVDE_logo_resize.png') }}"></img>
 
  <div class="col-xs-12 col-sm-6 col-md-4">
 
    <img class="img-responsive img-rounded center-block" alt="FVDE_Logo" src="{{ url_for('static', filename='images/logo/FVDE_logo_resize.png') }}"></img>
 
  </div>
 
  <div class="col-md-8">
 
  <div class="col-xs-12 col-sm-6 col-md-8">
 
    <div class="jumbotron">
 
      <h2>Frënn vun der Ënn A.S.B.L.</h2>
 
	    <p><em>Luxembourg based non-profit organization defending civil rights on the internet.</em></p>
 
@@ -39,9 +39,7 @@
 
      <span class="highlighted-label pull-right"><a href="https://twitter.com/FrennVunDerEnn" target="blank"><span class="label label-info">@FrennVunDerEnn</span></a></span>
 
    </div>
 
  </div>
 
  <div class="col-md-1">
 
  </div>
 
  <div class="col-md-8">
 
  <div class="col-sm-12 col-md-offset-1 col-md-8">
 
    <blockquote>
 
      <p>
 
        <em>I support <abbr title="Frënn vun der Ënn a.s.b.l.">FVDE</abbr> because even small organizations can contribute to protect fundamental civil rights. This noble goal can be pursued by making use of technology and putting knowledge to the service of users who want to maintain their privacy.</em>
 
@@ -49,13 +47,13 @@
 
      </p>
 
    </blockquote>
 
  </div>
 
  <div class="col-md-3">
 
  <div class="col-sm-12 col-md-3">
 
    <blockquote>
 
      <a href="https://vimeo.com/160952562" target="blank"><h2 class="text-center">Privacy is the right to a free mind!</h2></a>
 
      <footer>Edward J. Snowden</footer>
 
    </blockquote>
 
  </div>
 
  <div class="col-md-6">
 
  <div class="col-sm-12 col-md-6">
 
    <div class="embed-responsive embed-responsive-16by9">
 
      <video id="tor-animation" width="560" height="315" controls preload="none" class="video-js vjs-default-skin vjs-big-play-centered embed-responsive-item" data-setup="">
 
        <source src="{{ url_for('static', filename='videos/Tor_Animation.webm') }}" type='video/webm' />
 
@@ -85,7 +83,7 @@
 
      </video>
 
    </div>
 
  </div>
 
  <div class="col-md-6">
 
  <div class="col-sm-12 col-md-6">
 
      <p class=lead>
 
        <br>
 
        Tor is free software and an open network that helps you defend against network surveillance and preserve your personal freedom and privacy on the Internet.
ennstatus/templates/root/member.html
Show inline comments
 
@@ -20,13 +20,13 @@
 
{% set title = "Member" %}
 

	
 
{% block content %}
 
  <div class="col-md-4">
 
  <div class="col-sm-12 col-md-4">
 
    <img src="{{ url_for('static', filename='images/Partners.png') }}" class="img-responsive img-rounded center-block" alt="Partners" width="160"></img>
 
    <div class="text-center">
 
      <h2>Join</h2>
 
    </div>
 
  </div>
 
  <div class="col-md-8">
 
  <div class="col-sm-12 col-md-8">
 
    <h2>Membership</h2>
 
    <p class="lead">Joining our organization has several advantages.</p>
 
    <p>As an active member you get to know the people behind <abbr title="Frënn vun der Enn a.s.b.l.">FVDE</abbr> and you can join us on our weekly meetings (online or AFK).
ennstatus/templates/root/mirrors.html
Show inline comments
 
@@ -28,13 +28,13 @@
 
{% endif %}
 

	
 
{% block content %}
 
  <div class="col-md-4">
 
  <div class="col-md-4 visible-md visible-lg">
 
    <img src="{{ url_for('static', filename='images/Services.png') }}" class="img-responsive img-rounded center-block" alt="Partners" width="160"></img>
 
    <div class="text-center">
 
      <h2>Mirrors</h2>
 
    </div>
 
  </div>
 
  <div class="col-md-8">
 
  <div class="col-sm-12 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>
ennstatus/templates/root/partners.html
Show inline comments
 
@@ -20,34 +20,30 @@
 
{% set title = "Partners" %}
 

	
 
{% block content %}
 
  <div class="col-md-4">
 
  <div class="col-md-4 visible-md visible-lg">
 
    <img src="{{ url_for('static', filename='images/Partners.png') }}" class="img-responsive img-rounded center-block" alt="Partners" width="160"></img>
 
    <div class="text-center">
 
      <h2>Partners</h2>
 
    </div>
 
  </div>
 
  <div class="col-md-8">
 
  <div class="col-sm-12 col-md-8">
 
    <h2>Partners</h2>
 
    <p class="lead">We are constantly looking for new partners who want join us in our endevaour for a free Internet. At the moment we are beeing supported by the following organizations:</p>
 
    <div class="row">
 
      <div class="col-md-4">
 
        <a href="https://edri.org" target="_blank"><img src="{{ url_for('static', filename='images/partners/edri_logo_web.png') }}" alt="European Digital Rights" class="img-responsive"></img></a>
 
      <div class="col-xs-12 col-sm-6 col-md-4">
 
        <a href="https://edri.org" target="_blank"><img src="{{ url_for('static', filename='images/partners/edri_logo_web.png') }}" alt="European Digital Rights" class="img-responsive center-block"></img></a>
 
      </div>
 
      <div class="col-md-4">
 
        <a href="http://c3l.lu" target="_blank"><img src="{{ url_for('static', filename='images/partners/logo-c3l.png') }}" alt="Chaos Computer Club Lëtzebuerg" class="img-responsive"></img></a>
 
      </div>
 
       <div class="col-md-4">
 
        <a href="https://torservers.net" target="_blank"><img src="{{ url_for('static', filename='images/partners/torservers.png') }}" alt="Zwiebelfreunde eV" class="img-responsive"></img></a>
 
      <div class="col-xs-12 col-sm-6 col-md-4">
 
        <a href="http://c3l.lu" target="_blank"><img src="{{ url_for('static', filename='images/partners/logo-c3l.png') }}" alt="Chaos Computer Club Lëtzebuerg" class="img-responsive center-block"></img></a>
 
      </div>
 
    </div>
 
    <div class="row">
 
     <div class="col-md-4">
 
        <a href="https://piratepartei.lu" target="_blank"><img src="{{ url_for('static', filename='images/partners/Logo-Piratepartei2014.png') }}" alt="Pirate Partei" class="img-responsive"></img></a>
 
       <div class="col-xs-12 col-sm-6 col-md-4">
 
        <a href="https://torservers.net" target="_blank"><img src="{{ url_for('static', filename='images/partners/torservers.png') }}" alt="Zwiebelfreunde eV" class="img-responsive center-block"></img></a>
 
      </div>
 
     <div class="col-xs-12 col-sm-6 col-md-4">
 
        <a href="https://piratepartei.lu" target="_blank"><img src="{{ url_for('static', filename='images/partners/Logo-Piratepartei2014.png') }}" alt="Pirate Partei" class="img-responsive center-block"></img></a>
 
     </div>
 
     <div class="col-md-4">
 
       <a href="https://flokinet.is/" target="_blank"><img src="{{ url_for('static', filename='images/partners/flokinet.png') }}" alt="FlokiNET" class="img-responsive"></img></a>
 
     </div>
 
     <div class="col-md-4">
 
     <div class="col-xs-12 col-sm-6 col-md-4">
 
       <a href="https://flokinet.is/" target="_blank"><img src="{{ url_for('static', filename='images/partners/flokinet.png') }}" alt="FlokiNET" class="img-responsive center-block"></img></a>
 
     </div>
 
    </div>
 
    <h3>Becoming a Partner?</h3>
requirements.txt
Show inline comments
 
@@ -5,25 +5,25 @@
 
#    pip-compile requirements.in
 
#
 
Babel==2.2.0
 
click==6.3
 
dominate==2.1.17          # via flask-bootstrap
 
Flask-Bootstrap==3.3.5.7
 
Flask-HTTPAuth==2.7.2
 
Flask-Moment==0.5.1
 
Flask-WTF==0.12
 
Flask==0.10.1             # via flask-bootstrap, flask-httpauth, flask-moment, flask-wtf
 
blinker==1.4              # via flask-mail
 
click==6.7
 
dominate==2.3.1           # via flask-bootstrap
 
Flask-Bootstrap==3.3.7.1
 
Flask-HTTPAuth==3.2.3
 
Flask-Mail==0.9.1
 
Flask-Moment==0.5.2
 
Flask-WTF==0.14.2
 
Flask==0.12.2             # via flask-bootstrap, flask-httpauth, flask-mail, flask-moment, flask-wtf
 
itsdangerous==0.24        # via flask
 
Jinja2==2.8               # via flask
 
Jinja2==2.9.6             # via flask
 
jsonschema==2.5.1
 
MarkupSafe==0.23          # via jinja2
 
MarkupSafe==1.0           # via jinja2
 
onionpy==0.3.2
 
pygeoip==0.3.2
 
python-gnupg==0.3.8
 
pytz==2015.7              # via babel
 
requests==2.9.1           # via onionpy, rt
 
rt==1.0.8
 
six==1.10.0               # via rt
 
strict-rfc3339==0.6
 
visitor==0.1.2            # via flask-bootstrap
 
Werkzeug==0.11.4          # via flask, flask-wtf
 
requests==2.9.1           # via onionpy
 
strict-rfc3339==0.7
 
visitor==0.1.3            # via flask-bootstrap
 
Werkzeug==0.12.2          # via flask, flask-wtf
 
WTForms==2.1              # via flask-wtf
setup.py
Show inline comments
 
@@ -3,7 +3,7 @@ from setuptools import setup, find_packa
 

	
 
def _get_requirements():
 

	
 
    with open('requirements.in', encoding='utf-8') as f:
 
    with open('requirements.txt', encoding='utf-8') as f:
 
        lines = f.readlines()
 

	
 
    lines = [line[:-1] for line in lines if not line.startswith('#')]
 
@@ -11,7 +11,7 @@ def _get_requirements():
 

	
 

	
 
setup(name='Ennstatus',
 
      version='5.6.5',
 
      version='5.7.1-dev',
 
      description=('Ennstatus provides the user with vital information about '
 
                   'the status of the organizations Tor servers.'),
 
      author='Frënn vun der Ënn',
0 comments (0 inline, 0 general)