FVDE/ennstatus Changeset - 1abafdd2a20f · Chaos Computer Club Lëtzebuerg Projects

Changeset - 1abafdd2a20f

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 2

Dennis Fink - 12 years ago 2014-01-21 19:03:04
dennis.fink@c3l.lu

merge

4 files changed with 42 insertions and 15 deletions:

Scripts/update_server.pl

ennstatus/static/images/BPM.gif

bin+new file

ennstatus/templates/donate/bpm.html

ennstatus/templates/donate/index.html

0 comments (0 inline, 0 general)

Scripts/update_server.pl

➞

Show inline comments

 #!/usr/bin/env perl
 =About
 This is a perlized "Update Server" script which should run out of the box
 on most machines. If not you need to install HTTP::Tiny
 sudo cpan
 >install HTTP::Tiny
 by virii
 =cut
 use HTTP::Tiny;
 use IO::Socket;
 ######## [defaults] ########
 $data_dir = '/var/lib/tor';
 $pidfile  = '/var/run/tor/tor.pid';
 ######## [ennstatus URL] ########
 open ennstatus, "<", "/etc/ennstatus_updater.conf" || die "Ennstatus config file not found!\n";
     while (<ennstatus>) {
         $ennstatus_url = $1 if /^ennstatus_url = (.+)/i;
+    }
 close ennstatus;
 @configs = @ARGV if @ARGV;					 # perl updater_server.pl torrc torrc0 torrc1
 @configs = qw(torrc torrc2) unless @ARGV;			 # OR hardcode every config file! like: torrc torrc0 torrc1
 $data_dir = '/var/lib/tor';					 # default data dir
 $pidfile  = '/var/run/tor/tor.pid';				 # default pid file
 $API_url = 'http://enn.lu';					 # will be ignored if /etc/ennstatus_updater.conf is present
 ######## [ennstatus URL - config file] ######
 if (-e '/etc/ennstatus_updater.conf') {
 	open ennstatus, "<", "/etc/ennstatus_updater.conf" || die "Cannot open 'ennstatus_updater.conf'!\n";
     		while (<ennstatus>) {
         		$ennstatus_url = $1 if /^ennstatus_url = (.+)/i;
+    		}
 	close ennstatus;
 } else {
 	$ennstatus_url = $API_url;
+}
 ######## [loop through configs] ########
 @configs = qw(torrc);                                                   # every config file! like: torrc torrc0 torrc1
 for (1..scalar @configs) {
     open config, "<", "/etc/tor/" . $configs[$_ -1] || die "Cannot open $configs[$_ -1]\n";
         while (<config>) {
             $server_name = $1       if /^Nickname (\w+)/i;
             $server_type = 'Exit'   if /^ExitPolicy accept \*:\*/i;
             $server_type = 'Relay'  if /^ExitPolicy reject \*:\*/i;
             $server_type = 'Bridge' if /^BridgeRelay 1/i;
             $data_dir    = $1       if /^DataDirectory (.*)/i;
             $pidfile     = $1       if /^PidFile (.*)/i;
             $obfs        = 'True'   if /^ServerTransportPlugin obfs2,obfs3/i;
             $ip          = $1       if /^OutboundBindAddress (\d+\.\d+\.\d+\.\d+)/i;
+        }
     close config;
 ######## [obfs check] ########
     $obfs = 'False' if ($obfs ne "True" and $server_type == 'Bridge');
 ######## [ip check] ########
     if ($ip == "") {
         $socket = new IO::Socket::INET ( PeerAddr => "google.com",
                                          PeerPort => 80,
                                          Proto => 'tcp');
         $ip = $socket->sockhost;
         close $socket;
+    }
 ######## [fingerprint] ########
     open fingerprint, "<", $data_dir . '/fingerprint';
         $read_in = <fingerprint>;
         $fingerprint = $1 if $read_in =~ /^\w+ (\w{40})/i;
     close fingerprint;
 ######## [pid check] ########
     open pidfile, "<", $pidfile;
         $pid = <pidfile>;
     close pidfile;
     $psaux = kill 0, $pid;
     if ($psaux) {
         $tor_status = 'Online';
     } else {
         $tor_status = 'Offline';
+    }
 ######## [end of loop] ########
+}
 ######## [create json string] ########
 if ($server_type eq "Bridge") {
 $json_string = '{"fingerprint": "' . $fingerprint .
                 '", "ip": "' . $ip .
                 '", "server_name": "' . $server_name .
                 '", "server_type": "' . $server_type .
                 '", "obfs": "' . $obfs .
                 '", "tor_status": "' . $tor_status .
                 '"}';
 } else {
 $json_string = '{"fingerprint": "' . $fingerprint .
                 '", "ip": "' . $ip .
                 '", "server_name": "' . $server_name .
                 '", "server_type": "' . $server_type .
                 '", "tor_status": "' . $tor_status .
                 '"}';
+}
 ######## [Send to server] ########
 $request = HTTP::Tiny->new->request('POST', $ennstatus_url . '/api/update',
+                    {
                       content => $json_string,
                       headers => { 'content-type' => 'application/json' }
+                    }
                                     );
 print $request->{content};
 ######## [end of loop] ########
+}

ennstatus/static/images/BPM.gif

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/templates/donate/bpm.html

➞

Show inline comments

@@ new file 100644 @@
 {% extends "base.html" %}
 {% set title = "Donate - Flattr" %}
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/bpm.gif') }}" class="img-rounded" alt="BPM"></img>
     <h2>BPM Points</h2>
   </div>
   <div class="col-md-8">
     <blockquote>
       <p>"<em>Privacy is not something that I'm merely entitled to, it's an absolute prerequisite.</em>"</p>
       <small>Marlon Brando<cite>brainyquote</cite></small>
     </blockquote>
     <p>We accept <strong>BPM</strong> points as they will be used for our BPM Parcel Station. The parcel station is used for receiving and sending mails and packages around the world!</p>
     <div class="alert-info text-center">
 	    <a href="mailto:info@fvde.lu">Mail us your BPM voucher code!</a>
     </div>
   </div>
 {% endblock %}

ennstatus/templates/donate/index.html

➞

Show inline comments

 {% extends "base.html" %}
 {% set title = "Donate" %}
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Support.png') }}" class="img-rounded" alt="WhoIs" width="160"></img>
     <h2>Act Now!</h2>
   </div>
   <div class="col-md-8">
     <blockquote>
       <p>"<em>The limits of tyrants are prescribed by the endurance of those whom they oppress</em>"</p>
       <small>Frederick Douglas  <citi"Source Title"></cite></small>
     </blockquote>
     <p>Act <strong>now</strong> supporting a <strong>#FreeInternet</strong> either by
     <ul>
       <li>becoming an active / support <a href="{{ url_for('static', filename='files/MembershipForm.pdf') }}">member</a></li>
       <li>sponsoring bandwidth</li>
       <li>traditional donations</li>
       <li>or what you might judge as useful for us.</li>
     </ul>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <a href="{{ url_for('donate.wiretransfer') }}"><img src="{{ url_for('static', filename='images/WireTransfer.png') }}" width="135" height="135"></img></a>
           <h5>Wire Transfer</h5>
           <p>The easiest way.</p>
           <a class="btn btn-info" href="{{ url_for('donate.wiretransfer') }}">Take Action Now</a>
         </center>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <a href="{{ url_for('donate.snailmail') }}"><img src="{{ url_for('static', filename='images/SnailMail.png') }}" width="135" height="135"></img></a>
           <h5>SnailMail</h5>
           <p>As anonymous as possible.</p>
           <a class="btn btn-info" href="{{ url_for('donate.snailmail') }}">Take Action Now</a>
         </center>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <a href="{{ url_for('donate.paypal') }}"><img src="{{ url_for('static', filename='images/PayPal_Logo.png') }}" width="135" height="135"></img></a>
           <h5>PayPal</h5>
           <p>All major cards accepted.</p>
           <a class="btn btn-info" href="{{ url_for('donate.paypal') }}">Take Action Now</a>
         </center>
       </div>
     </div>
     <!-- Second row of possibilities -->
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <a href="{{ url_for('donate.bitcoin') }}"><img src="{{ url_for('static', filename='images/BitCoin_Logo.png') }}" width="135" height="135"></img></a>
           <h5>BitCoin</h5>
           <p>A free alternative method.</p>
           <a class="btn btn-info" href="{{ url_for('donate.bitcoin') }}">Take Action Now</a>
         </center>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <a href="{{ url_for('donate.flattr') }}"><img src="{{ url_for('static', filename='images/Flattr_Logo.png') }}" width="135" height="135"></img></a>
           <h5>Flattr</h5>
           <p>Flattr us!</p>
           <a class="btn btn-info" href="{{ url_for('donate.flattr') }}">Take Action Now</a>
         </center>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <a href="{{ url_for('root.contact') }}"><img src="{{ url_for('static', filename='images/QuestionMark.png') }}" width="135" height="135"></img></a>
           <h5>Alternatives</h5>
           <p>Tell us</p>
           <a class="btn btn-info" href="{{ url_for('root.contact') }}">Take Action Now</a>
           <a href="{{ url_for('root.contact') }}"><img src="{{ url_for('static', filename='images/BPM.gif') }}" width="135" height="135"></img></a>
           <h5>BPM Points</h5>
           <p>For our parcel station!</p>
           <a class="btn btn-info" href="{{ url_for('donate.bpm') }}">Take Action Now</a>
         </center>
       </div>
     </div>
   </div>
 {% endblock %}

0 comments (0 inline, 0 general)