From b9e25ac40b2e0264e378c116fd2fb94c0c01b1c7 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 2 Mar 2021 12:19:26 +0100
Subject: [PATCH] net/haproxy: assorted optimizations, update copyright
 information

---
 .../OPNsense/HAProxy/Api/ServiceController.php            | 1 -
 .../OPNsense/HAProxy/Api/SettingsController.php           | 2 +-
 .../opnsense/mvc/app/views/OPNsense/HAProxy/index.volt    | 2 +-
 .../src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php | 2 +-
 .../service/templates/OPNsense/HAProxy/haproxy.conf       | 8 ++++++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
index 6c97f4132..524597aef 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
@@ -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
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
index 1b1d79b9e..44ccd006c 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
@@ -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.
diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
index 63ff12973..51f40d96a 100644
--- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
+++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
@@ -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.
 
diff --git a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php
index 7bfa26819..b28a84ecd 100755
--- a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php
+++ b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/exportCerts.php
@@ -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.
  *
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index 2a41875e1..a530b0a7a 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -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) %}