diff --git a/roles/django/files/django-uwsgi.service b/roles/django/files/django-uwsgi.service index f8b28199..9cfd27f7 100644 --- a/roles/django/files/django-uwsgi.service +++ b/roles/django/files/django-uwsgi.service @@ -4,7 +4,6 @@ After=syslog.target [Service] ExecStart=/usr/local/bin/uwsgi --ini /etc/uwsgi/upri_uwsgi.ini --touch-reload /etc/uwsgi/upri_uwsgi.ini -# Requires systemd version 211 or newer RuntimeDirectory=uwsgi Restart=always KillSignal=SIGQUIT diff --git a/upribox_interface/lib/locale/en/LC_MESSAGES/django.po b/upribox_interface/lib/locale/en/LC_MESSAGES/django.po index f08a7c4c..d7c831df 100644 --- a/upribox_interface/lib/locale/en/LC_MESSAGES/django.po +++ b/upribox_interface/lib/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-25 14:14+0000\n" +"POT-Creation-Date: 2016-07-27 11:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/upribox_interface/more/locale/en/LC_MESSAGES/django.po b/upribox_interface/more/locale/en/LC_MESSAGES/django.po index 6c9c7847..0fd74f99 100644 --- a/upribox_interface/more/locale/en/LC_MESSAGES/django.po +++ b/upribox_interface/more/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-25 14:14+0000\n" +"POT-Creation-Date: 2016-07-27 11:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -108,7 +108,7 @@ msgid "Einschalten" msgstr "switch On" #: more/templates/more.html:42 -msgid "Software Version" +msgid "upribox Software" msgstr "" #: more/templates/more.html:43 diff --git a/upribox_interface/statistics/locale/en/LC_MESSAGES/django.po b/upribox_interface/statistics/locale/en/LC_MESSAGES/django.po index dc1e9f3b..0bd12f82 100644 --- a/upribox_interface/statistics/locale/en/LC_MESSAGES/django.po +++ b/upribox_interface/statistics/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-25 14:14+0000\n" +"POT-Creation-Date: 2016-07-27 11:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/upribox_interface/urls.py b/upribox_interface/urls.py index 859ea875..6d3309c6 100644 --- a/upribox_interface/urls.py +++ b/upribox_interface/urls.py @@ -35,6 +35,7 @@ url(r'^silent/$', "wlan.views.silent", name="upri_silent"), url(r'^ninja/$', "wlan.views.ninja", name="upri_ninja"), url(r'^ninja/toggle/$', "wlan.views.ninja_toggle", name="upri_ninja_toggle"), + url(r'^ninja/check_pi3/$', "wlan.views.check_pi3", name="upri_check_pi3"), url(r'^jobstatus/$', "www.views.jobstatus", name="upri_jobstatus"), url(r'^jobstatus/clear/$', "www.views.clear_jobstatus", name="upri_clear_jobstatus"), diff --git a/upribox_interface/vpn/locale/en/LC_MESSAGES/django.po b/upribox_interface/vpn/locale/en/LC_MESSAGES/django.po index 17dfd587..9452b8dd 100644 --- a/upribox_interface/vpn/locale/en/LC_MESSAGES/django.po +++ b/upribox_interface/vpn/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-25 14:14+0000\n" +"POT-Creation-Date: 2016-07-27 11:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/upribox_interface/vpn/templates/vpn.html b/upribox_interface/vpn/templates/vpn.html index 47c7bfa6..9f12ab11 100644 --- a/upribox_interface/vpn/templates/vpn.html +++ b/upribox_interface/vpn/templates/vpn.html @@ -34,7 +34,7 @@

{% trans "VPN" %}

  • {% trans "UPnP oder NAT-PMP auf Ihrem Router (Gateway) aktivieren, oder" %}
  • {% trans "eine Port-Weiterleitung auf Ihrem Router für UDP-Port 1194 zu Ihrer upribox konfigurieren!" %}
    • -
    +
    + +
    diff --git a/upribox_interface/wlan/views.py b/upribox_interface/wlan/views.py index df7cc94c..48771dca 100644 --- a/upribox_interface/wlan/views.py +++ b/upribox_interface/wlan/views.py @@ -10,10 +10,13 @@ from wlan import jobs as wlanjobs from django.core.urlresolvers import reverse from lib import utils +from lib.info import HardwareInfo +from django.http import HttpResponse # Get an instance of a logger logger = logging.getLogger('uprilogger') + @login_required def ninja(request): context = RequestContext(request) @@ -39,6 +42,7 @@ def ninja(request): return render_to_response("ninja.html", context) + @login_required def ninja_toggle(request): if request.method != 'POST': @@ -70,4 +74,13 @@ def silent(request): context.push({'form': form}) context.push({'messagestore': jobs.get_messages()}) - return render_to_response("silent.html", context) \ No newline at end of file + return render_to_response("silent.html", context) + + +@login_required +def check_pi3(request): + hw = HardwareInfo() + if hw.runs_on_pi3(): + return HttpResponse('{"pi3": "yes"}') + else: + return HttpResponse('{"pi3": "no"}') diff --git a/upribox_interface/www/locale/en/LC_MESSAGES/django.po b/upribox_interface/www/locale/en/LC_MESSAGES/django.po index 62594f82..a111110f 100644 --- a/upribox_interface/www/locale/en/LC_MESSAGES/django.po +++ b/upribox_interface/www/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-25 14:14+0000\n" +"POT-Creation-Date: 2016-07-27 11:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"