netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/haproxy: use a consistent wording throughout (GUI only, backend unchanged)

Browse Source 
While here, improve visibility of important table data in maintenance page.
This commit is contained in:
Frank Wall
2021-03-02 17:05:08 +01:00
parent b39646a842
commit 5cb97e8110
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/maintenance.volt
+13 -13
View File
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
$.post('/api/haproxy/maintenance/certDiff', payload, function(data) { $.post('/api/haproxy/maintenance/certDiff', payload, function(data) {
BootstrapDialog.show({ BootstrapDialog.show({
type: BootstrapDialog.TYPE_INFO, type: BootstrapDialog.TYPE_INFO,
title: "{{ lang._('Diff between configured and active ssl certificates') }}", title: "{{ lang._('Diff between configured and active SSL certificates') }}",
message: `<pre>${data}</pre>`, message: `<pre>${data}</pre>`,
buttons: [{ buttons: [{
label: '{{ lang._('Close') }}', label: '{{ lang._('Close') }}',
@@ -80,7 +80,7 @@ POSSIBILITY OF SUCH DAMAGE.
$.post('/api/haproxy/maintenance/certActions', payload, function(data_actions) { $.post('/api/haproxy/maintenance/certActions', payload, function(data_actions) {
question = '' question = ''
question += `<pre>${data_actions}</pre>`; question += `<pre>${data_actions}</pre>`;
question += '<b>{{ lang._('Apply ssl certificates to HaProxy?') }}</b></br></br>'; question += '<b>{{ lang._('Apply SSL certificates to HAProxy?') }}</b></br></br>';
stdDialogConfirm('{{ lang._('Confirmation Required') }}', stdDialogConfirm('{{ lang._('Confirmation Required') }}',
question, question,
@@ -92,7 +92,7 @@ POSSIBILITY OF SUCH DAMAGE.
var error_msg = syncErrorMessage(data.result.modified, data.result.deleted); var error_msg = syncErrorMessage(data.result.modified, data.result.deleted);
BootstrapDialog.show({ BootstrapDialog.show({
type: BootstrapDialog.TYPE_DANGER, type: BootstrapDialog.TYPE_DANGER,
title: "{{ lang._('Error applying ssl certificates to HAProxy') }}", title: "{{ lang._('Error applying SSL certificates to HAProxy') }}",
message: error_msg, message: error_msg,
buttons: [{ buttons: [{
label: '{{ lang._('Close') }}', label: '{{ lang._('Close') }}',
@@ -124,8 +124,8 @@ POSSIBILITY OF SUCH DAMAGE.
formatters: { formatters: {
"commands": function (column, row) { "commands": function (column, row) {
buttons = "" buttons = ""
buttons += "<button type=\"button\" data-action=\"showDiff\" title=\"{{ lang._('Show diff between configured ssl certificates and certificates from HAProxy memory.') }}\" class=\"btn btn-xs btn-default\" data-row-id=\"" + row.id + "\"><span class=\"fa fa-info-circle\"></span></button>" buttons += "<button type=\"button\" data-action=\"showDiff\" title=\"{{ lang._('Show diff between configured SSL certificates and certificates from running HAProxy service.') }}\" class=\"btn btn-xs btn-default\" data-row-id=\"" + row.id + "\"><span class=\"fa fa-info-circle\"></span></button>"
buttons += " <button type=\"button\" data-action=\"applyDiff\" title=\"{{ lang._('Apply diff and sync certificates into HAProxy memory.') }}\" class=\"btn btn-xs btn-default\" data-row-id=\"" + row.id + "\"><span class=\"fa fa-refresh\"></span></button>" buttons += " <button type=\"button\" data-action=\"applyDiff\" title=\"{{ lang._('Apply diff and sync certificates into running HAProxy service.') }}\" class=\"btn btn-xs btn-default\" data-row-id=\"" + row.id + "\"><span class=\"fa fa-refresh\"></span></button>"
return buttons; return buttons;
}, },
}, },
@@ -202,7 +202,7 @@ POSSIBILITY OF SUCH DAMAGE.
var error_msg = syncErrorMessage(data.result.modified, data.result.deleted); var error_msg = syncErrorMessage(data.result.modified, data.result.deleted);
BootstrapDialog.show({ BootstrapDialog.show({
type: BootstrapDialog.TYPE_DANGER, type: BootstrapDialog.TYPE_DANGER,
title: "{{ lang._('Error applying ssl certificates to HAProxy') }}", title: "{{ lang._('Error applying SSL certificates to HAProxy') }}",
message: error_msg, message: error_msg,
buttons: [{ buttons: [{
label: '{{ lang._('Close') }}', label: '{{ lang._('Close') }}',
@@ -344,7 +344,7 @@ POSSIBILITY OF SUCH DAMAGE.
}); });
question += '</ul>'; question += '</ul>';
question += '<b>{{ lang._('State: ') }}' + state + '</b></br></br>'; question += '<b>{{ lang._('State: ') }}' + state + '</b></br></br>';
question += '{{ lang._('Set administrative state for all selected server?') }} </br></br>'; question += '{{ lang._('Set administrative state for all selected servers?') }} </br></br>';
stdDialogConfirm('{{ lang._('Confirmation Required') }}', stdDialogConfirm('{{ lang._('Confirmation Required') }}',
question, question,
@@ -389,7 +389,7 @@ POSSIBILITY OF SUCH DAMAGE.
question += '<div class="form-group" style="display: block;">'; question += '<div class="form-group" style="display: block;">';
question += '<input class="form-control" id="newBulkWeight" value="" type="text"/>'; question += '<input class="form-control" id="newBulkWeight" value="" type="text"/>';
question += '</div>'; question += '</div>';
question += '{{ lang._('Set weight for all selected server?') }} </br></br>'; question += '{{ lang._('Set weight for all selected servers?') }} </br></br>';
stdDialogConfirm('{{ lang._('Confirmation Required') }}', stdDialogConfirm('{{ lang._('Confirmation Required') }}',
question, question,
@@ -451,11 +451,11 @@ POSSIBILITY OF SUCH DAMAGE.
<thead> <thead>
<tr> <tr>
<th data-column-id="id" data-type="string" data-identifier="true" data-visible="false">{{ lang._('id') }}</th> <th data-column-id="id" data-type="string" data-identifier="true" data-visible="false">{{ lang._('id') }}</th>
<th data-column-id="pxname" data-type="string">{{ lang._('Proxy') }}</th> <th data-column-id="pxname" data-width="9em" data-type="string">{{ lang._('Virtual Service') }}</th>
<th data-column-id="svname" data-type="string">{{ lang._('Server') }}</th> <th data-column-id="svname" data-width="9em" data-type="string">{{ lang._('Real Server') }}</th>
<th data-column-id="addr" data-type="string">{{ lang._('Address') }}</th> <th data-column-id="addr" data-type="string">{{ lang._('Address') }}</th>
<th data-column-id="status" data-type="string">{{ lang._('Status') }}</th> <th data-column-id="status" data-type="string">{{ lang._('Status') }}</th>
<th data-column-id="check_status" data-type="string">{{ lang._('Check Status') }}</th> <th data-column-id="check_status" data-width="8em" data-type="string">{{ lang._('Check Status') }}</th>
<th data-column-id="weight" data-type="string">{{ lang._('Weight') }}</th> <th data-column-id="weight" data-type="string">{{ lang._('Weight') }}</th>
<th data-column-id="scur" data-type="string">{{ lang._('Sessions') }}</th> <th data-column-id="scur" data-type="string">{{ lang._('Sessions') }}</th>
<th data-column-id="bin" data-type="string">{{ lang._('Bytes in') }}</th> <th data-column-id="bin" data-type="string">{{ lang._('Bytes in') }}</th>
@@ -501,8 +501,8 @@ POSSIBILITY OF SUCH DAMAGE.
<tr> <tr>
<td></td> <td></td>
<td> <td>
<button data-action="showDiffBulk" title="{{ lang._('Show diff between configured ssl certificates and certificates from HAProxy memory for selected frontends.') }}" type="button" class="btn btn-xs btn-default"><span class="fa fa-info-circle"></span></button> <button data-action="showDiffBulk" title="{{ lang._('Show diff between configured SSL certificates and certificates from running HAProxy service for selected Public Services.') }}" type="button" class="btn btn-xs btn-default"><span class="fa fa-info-circle"></span></button>
<button data-action="applyDiffBulk" title="{{ lang._('Apply diff and sync certificates into HAProxy memory for selected frontends.') }}" type="button" class="btn btn-xs btn-default"><span class="fa fa-refresh"></span></button> <button data-action="applyDiffBulk" title="{{ lang._('Apply diff and sync certificates into running HAProxy service for selected Public Services.') }}" type="button" class="btn btn-xs btn-default"><span class="fa fa-refresh"></span></button>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
+1 -1
View File
@@ -113,7 +113,7 @@ command:configctl template reload OPNsense/HAProxy 2 > /dev/null; /usr/local/opn
parameters: parameters:
type:script_output type:script_output
message:Sync ssl certificates into HAProxy memory for all frontends message:Sync ssl certificates into HAProxy memory for all frontends
description:Sync ssl certificates changes into HAProxy memory description:Sync SSL certificate changes into running HAProxy service
[showconf] [showconf]
command:test -f /usr/local/etc/haproxy.conf.staging && cat /usr/local/etc/haproxy.conf.staging command:test -f /usr/local/etc/haproxy.conf.staging && cat /usr/local/etc/haproxy.conf.staging