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: assorted optimizations, update copyright information

Browse Source
This commit is contained in:
Frank Wall
2021-03-02 16:33:07 +01:00
parent 0a65d44c05
commit b9e25ac40b
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
-1
View File
@@ -45,7 +45,6 @@ class ServiceController extends ApiMutableServiceControllerBase
protected static $internalServiceTemplate = 'OPNsense/HAProxy';
protected static $internalServiceEnabled = 'general.enabled';
protected static $internalServiceName = 'haproxy';
protected static $internalModelUseSafeDelete = true;
/**
* run syntax check for haproxy configuration
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (C) 2016 Frank Wall
* Copyright (C) 2016-2021 Frank Wall
* Copyright (C) 2015 Deciso B.V.
*
* All rights reserved.
net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
+1 -1
View File
@@ -1,6 +1,6 @@
{#
Copyright (C) 2016-2017 Frank Wall
Copyright (C) 2016-2021 Frank Wall
OPNsense® is Copyright © 2014 – 2015 by Deciso B.V.
All rights reserved.
net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php
+1 -1
View File
@@ -2,7 +2,7 @@
<?php
/*
* Copyright (C) 2016-2018 Frank Wall
* Copyright (C) 2016-2021 Frank Wall
* Copyright (C) 2015 Deciso B.V.
* All rights reserved.
*
net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+6 -2
View File
@@ -1627,11 +1627,15 @@ backend {{backend.name}}
{% if backend.linkedResolver|default("") != "" %}
{# # prefer backend configuration #}
{% set resolver_id = backend.linkedResolver %}
{% set resolver_opts = backend.resolverOpts %}
{% if backend.resolverOpts|default("") != "" %}
{% set resolver_opts = backend.resolverOpts %}
{% endif %}
{% elif server_data.linkedResolver|default("") != "" and server_data.type|default("") == 'template' %}
{# # use resolver for server template #}
{% set resolver_id = server_data.linkedResolver %}
{% set resolver_opts = server_data.resolverOpts %}
{% if server_data.resolverOpts|default("") != "" %}
{% set resolver_opts = server_data.resolverOpts %}
{% endif %}
{% endif %}
{% if resolver_id != '' %}
{% set resolver_data = helpers.getUUID(resolver_id) %}