upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set backend.tuning_defaultserver as advanced

Browse source 
Add no port support in backend server
Add port to check in server
This commit is contained in:
Manus Freedom 2016-06-07 22:37:58 +02:00
parent 9478304411
commit 6b9cadab8e
4 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
View file

@ -135,6 +135,14 @@
<label>Default for server</label>
<type>text</type>
<help><![CDATA[Default option for all server entries.]]></help>
<advanced>true</advanced>
</field>
<field>
<id>backend.tuning_noport</id>
<label>Don't use port on server</label>
<type>checkbox</type>
<help><![CDATA[Don't use port on server, use the same port as frontend receive. If check enable, require port check in server.]]></help>
<advanced>true</advanced>
</field>
<field>
<label>Actions (ACLs)</label>

7
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogServer.xml
View file

@ -51,4 +51,11 @@
<help><![CDATA[Sets the interval (in milliseconds) for running health checks on the server.]]></help>
<advanced>true</advanced>
</field>
<field>
<id>server.checkport</id>
<label>Port to check</label>
<type>text</type>
<help><![CDATA[Provide the TCP communication port to use during check, i.e. 80 or 443.]]></help>
<advanced>true</advanced>
</field>
</form>

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

@ -479,6 +479,10 @@
<tuning_defaultserver type="TextField">
<Required>N</Required>
</tuning_defaultserver>
<tuning_noport type="BooleanField">
<default>0</default>
<Required>Y</Required>
</tuning_noport>
<linkedActions type="ModelRelationField">
<Model>
<template>
@ -529,6 +533,13 @@
<ValidationMessage>Please specify a value between 1 and 65535.</ValidationMessage>
<Required>Y</Required>
</port>
<checkport type="IntegerField">
<default>80</default>
<MinimumValue>1</MinimumValue>
<MaximumValue>65535</MaximumValue>
<ValidationMessage>Please specify a value between 1 and 65535.</ValidationMessage>
<Required>N</Required>
</checkport>
<mode type="OptionField">
<Required>Y</Required>
<default>active</default>

2
net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
View file

@ -768,7 +768,7 @@ backend {{backend.name}}
{% do server_options.append('weight ' ~ server_data.weight) if server_data.weight|default("") != "" %}
{# # server role/mode #}
{% do server_options.append(server_data.mode) if server_data.mode|default("") != "active" %}
server {{server_data.name}} {{server_data.address}}:{{server_data.port}} {{server_options|join(' ')}}
server {{server_data.name}} {{server_data.address}}:{% if backend.tuning_noport != '1' %}{{server_data.port}}{% endif %}{% if server_data.checkport|default("") != "" %} port {{server_data.checkport}}{% endif %} {{server_options|join(' ')}}
{% endfor %}
{% else %}