diff --git a/Scripts/update_server.pl b/Scripts/update_server.pl --- a/Scripts/update_server.pl +++ b/Scripts/update_server.pl @@ -10,16 +10,22 @@ by virii 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_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_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 () { @@ -58,8 +64,6 @@ for (1..scalar @configs) { } else { $tor_status = 'Offline'; } -######## [end of loop] ######## -} ######## [create json string] ######## if ($server_type eq "Bridge") { $json_string = '{"fingerprint": "' . $fingerprint . @@ -86,4 +90,6 @@ if ($server_type eq "Bridge") { ); print $request->{content}; +######## [end of loop] ######## +} diff --git a/ennstatus/static/images/BPM.gif b/ennstatus/static/images/BPM.gif new file mode 100644 index 0000000000000000000000000000000000000000..44e72bbc8a34a31a5643171280f03d4529ccdf9f GIT binary patch literal 6526 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 diff --git a/ennstatus/templates/donate/bpm.html b/ennstatus/templates/donate/bpm.html new file mode 100644 --- /dev/null +++ b/ennstatus/templates/donate/bpm.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} + +{% set title = "Donate - Flattr" %} + +{% block content %} +
+ BPM +

BPM Points

+
+
+
+

"Privacy is not something that I'm merely entitled to, it's an absolute prerequisite."

+ Marlon Brandobrainyquote +
+ +

We accept BPM 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!

+
+ Mail us your BPM voucher code! +
+
+{% endblock %} diff --git a/ennstatus/templates/donate/index.html b/ennstatus/templates/donate/index.html --- a/ennstatus/templates/donate/index.html +++ b/ennstatus/templates/donate/index.html @@ -74,10 +74,10 @@
- -
Alternatives
-

Tell us

- Take Action Now + +
BPM Points
+

For our parcel station!

+ Take Action Now