diff --git a/data/etc/apache2/conf-available/repro-plinth.conf b/data/etc/apache2/conf-available/repro-plinth.conf index e7b0c38d9..6b8bc2e82 100644 --- a/data/etc/apache2/conf-available/repro-plinth.conf +++ b/data/etc/apache2/conf-available/repro-plinth.conf @@ -1,3 +1,7 @@ +## +## On all sites, provide repro admin interface on a path: /repro +## Only allow users of admin LDAP group. +## ProxyPass http://localhost:5080 diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py index 75961bc21..7517052f8 100644 --- a/plinth/modules/repro/__init__.py +++ b/plinth/modules/repro/__init__.py @@ -33,12 +33,12 @@ service = None def init(): """Initialize the repro module.""" menu = cfg.main_menu.get('apps:index') - menu.add_urlname(_('SIP Proxy (Repro)'), 'glyphicon-phone-alt', - 'repro:index', 800) + menu.add_urlname(_('SIP Server (repro)'), 'glyphicon-phone-alt', + 'repro:index', 825) global service service = service_module.Service( - 'repro', _('repro SIP Proxy'), ['sip-plinth', 'sip-tls-plinth'], + 'repro', _('repro SIP Server'), ['sip-plinth', 'sip-tls-plinth'], is_external=True, enabled=is_enabled()) diff --git a/plinth/modules/repro/forms.py b/plinth/modules/repro/forms.py index 1fd313222..b584701cd 100644 --- a/plinth/modules/repro/forms.py +++ b/plinth/modules/repro/forms.py @@ -26,5 +26,5 @@ from django.utils.translation import ugettext_lazy as _ class ReproForm(forms.Form): """Configuration form.""" enabled = forms.BooleanField( - label=_('Enable Repro service'), + label=_('Enable repro service'), required=False) diff --git a/plinth/modules/repro/templates/repro.html b/plinth/modules/repro/templates/repro.html index c6df8731c..1d4b2fe7d 100644 --- a/plinth/modules/repro/templates/repro.html +++ b/plinth/modules/repro/templates/repro.html @@ -23,58 +23,61 @@ {% block content %} -

{% trans "SIP Proxy (Repro)" %}

+

{% trans "SIP Server (repro)" %}

-

- {% blocktrans trimmed %} - Repro is a SIP proxy service that a SIP softphone can connect to. Before - using Repro, the domain and users will need to be configured using the - web-based configuration panel, available at - /repro/domains.html. Users in the - admin group will be able to log in to the Repro configuration panel. - {% endblocktrans %} -

+

+ {% blocktrans trimmed %} + repro provides various SIP services that a SIP softphone can utilize to + provide audio and video calls as well as presence and instant messaging. + repro provides a server and SIP user accounts that clients can use to let + their presence known. It also acts as a proxy to federate SIP + communications to other servers on the Internet similar to email. + {% endblocktrans %} +

-

- {% blocktrans trimmed %} - Note: After setting the domain, it is required to restart the Repro - service. Disable the service using the checkbox and Update setup button - below. Then, re-enable the service. - {% endblocktrans %} -

+

+ {% blocktrans trimmed %} + To make SIP calls, a client application is needed. Available clients + include Jitsi (for computers) and + + CSipSimple (for Android phones). + {% endblocktrans %} +

-

- {% blocktrans trimmed %} - To make SIP calls, a client application is needed. Available clients include - Jitsi (for computers) and - - CSipSimple (for Android phones). - {% endblocktrans %} -

+

+ {% blocktrans trimmed %} + Note: Before using repro, domains and users will need + to be configured using the web-based + configuration panel. Users in the admin group will be able + to log in to the repro configuration panel. After setting the domain, it + is required to restart the repro service. Disable the service and + re-enable it. + {% endblocktrans %} +

-

{% trans "Status" %}

+

{% trans "Status" %}

-

- {% if status.is_running %} - - {% trans "Repro service is running" %} - {% else %} - - {% trans "Repro service is not running" %} - {% endif %} -

+

+ {% if status.is_running %} + + {% trans "repro service is running" %} + {% else %} + + {% trans "repro service is not running" %} + {% endif %} +

-{% include "diagnostics_button.html" with module="repro" %} + {% include "diagnostics_button.html" with module="repro" %} -

{% trans "Configuration" %}

+

{% trans "Configuration" %}

-
- {% csrf_token %} + + {% csrf_token %} - {{ form|bootstrap }} + {{ form|bootstrap }} - -
+ + {% endblock %} diff --git a/plinth/modules/repro/views.py b/plinth/modules/repro/views.py index 3b3bbe506..40392f48a 100644 --- a/plinth/modules/repro/views.py +++ b/plinth/modules/repro/views.py @@ -52,7 +52,7 @@ def index(request): form = ReproForm(initial=status, prefix='repro') return TemplateResponse(request, 'repro.html', - {'title': _('SIP Proxy (Repro)'), + {'title': _('SIP Server (repro)'), 'status': status, 'form': form})