upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-03 22:08:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

haproxy: release 1.15

Browse source
This commit is contained in:
Franco Fichtner 2017-05-25 19:34:11 +02:00
parent a1c6a23181
commit 6a9d647754
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/haproxy/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= haproxy
PLUGIN_VERSION= 1.14
PLUGIN_VERSION= 1.15
PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer
PLUGIN_DEPENDS= haproxy
PLUGIN_MAINTAINER= opnsense@moov.de

2
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php
View file

@ -42,7 +42,7 @@ class IndexController extends \OPNsense\Base\IndexController
public function indexAction()
{
// set page title
$this->view->title = "HAProxy Load Balancer";
$this->view->title = gettext("HAProxy Load Balancer");
// include form definitions
$this->view->mainForm = $this->getForm("main");
$this->view->formDialogFrontend = $this->getForm("dialogFrontend");

2
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php
View file

@ -37,7 +37,7 @@ class StatisticsController extends \OPNsense\Base\IndexController
{
public function indexAction()
{
$this->view->title = "HAProxy Load Balancer / Statistics";
$this->view->title = gettext("HAProxy Load Balancer / Statistics");
// choose template
$this->view->pick('OPNsense/HAProxy/statistics');
}

3
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
View file

@ -249,8 +249,7 @@
<bind type="CSVListField">
<Required>Y</Required>
<multiple>Y</multiple>
<!-- <default>localhost:8080</default> -->
<mask>/^((([0-9a-zA-Z._\-\*]+:[0-9]+(-[0-9]+)?)([,]){0,1}))*/u</mask>
<mask>/^((([0-9a-zA-Z._\-\*:]+:[0-9]+(-[0-9]+)?)([,]){0,1}))*/u</mask>
<ChangeCase>lower</ChangeCase>
<ValidationMessage>Please provide a valid listen address, i.e. 127.0.0.1:8080 or www.example.com:443. Port range as start-end, i.e. 127.0.0.1:1220-1240.</ValidationMessage>
</bind>

11
net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt
View file

@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
"<td>"+value+"</td></tr>");
});
} else {
$("#infolist").html("<tr><td><br/><b>Error:</b> Unable to fetch statistics. Is HAProxy running?</td></tr>");
$("#infolist").html("<tr><td><br/>{{ lang._('The statistics could not be fetched. Is HAProxy running?') }}</td></tr>");
}
$('#processing-dialog').modal('hide');
}
@ -64,6 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
callback = function (data, status) {
if (status == "success") {
// status
$("#status_nav").show();
$("#grid-status").bootgrid('destroy');
var html = [];
$.each(data, function (key, value) {
@ -94,6 +95,7 @@ POSSIBILITY OF SUCH DAMAGE.
callback = function (data, status) {
if (status == "success") {
// counters
$("#counters_nav").show();
$("#grid-counters").bootgrid('destroy');
var html = [];
$.each(data, function (key, value) {
@ -124,6 +126,7 @@ POSSIBILITY OF SUCH DAMAGE.
callback = function (data, status) {
if (status == "success") {
// tables
$("#tables_nav").show();
$("#grid-tables").bootgrid('destroy');
var html = [];
$.each(data, function (key, value) {
@ -157,9 +160,9 @@ POSSIBILITY OF SUCH DAMAGE.
<ul class="nav nav-tabs" role="tablist" id="maintabs">
<li class="active"><a data-toggle="tab" href="#info"><b>{{ lang._('Overview') }}</b></a></li>
<li><a data-toggle="tab" href="#status"><b>{{ lang._('Status') }}</b></a></li>
<li><a data-toggle="tab" href="#counters"><b>{{ lang._('Counters') }}</b></a></li>
<li><a data-toggle="tab" href="#tables"><b>{{ lang._('Stick Tables') }}</b></a></li>
<li><a data-toggle="tab" href="#status" id="status_nav" style="display:none"><b>{{ lang._('Status') }}</b></a></li>
<li><a data-toggle="tab" href="#counters" id="counters_nav" style="display:none"><b>{{ lang._('Counters') }}</b></a></li>
<li><a data-toggle="tab" href="#tables" id="tables_nav" style="display:none"><b>{{ lang._('Stick Tables') }}</b></a></li>
</ul>
<div class="content-box tab-content">