diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php index 5a3cd58f9..dbf6ed915 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php @@ -68,7 +68,7 @@ class ExportController extends ApiControllerBase * @return array|mixed */ public function downloadAction($type) - { + { $backend = new Backend(); if ($type == 'config') { diff --git a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/tests/test_cmds.py b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/tests/test_cmds.py index 18a175aee..327787163 100755 --- a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/tests/test_cmds.py +++ b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/lib/haproxy/tests/test_cmds.py @@ -48,7 +48,7 @@ class TestCommands(unittest.TestCase): pKmFJ2e2VSnTZIBJvD58HMR+WNAEp7tHffHk2z/mPPtdRdxW5Zieoe5+6+HDtwgG +VCAIWMkC36Dvg== -----END CERTIFICATE----- - + -----BEGIN RSA PRIVATE KEY----- MIIJKgIBAAKCAgEAvsNKU59F2gpl1fzbk7hD64Q3zk1hH9Im1IsN9ppF5tqdsPPG n3Q8QgcKpnJ/SrtnPl4Xqp3bJyV20lJWTxuVU7ImM8g4tStQB4XojTtv8A4E7/wN @@ -100,8 +100,7 @@ class TestCommands(unittest.TestCase): 9WYZS7hlKyqVBESJuonR15biy7Xov5ELl6A821cskZO3vTwtlBSeCDiqaeVLpKR3 aYwf5YZo7v+N8KBSLEdLNjoKK4PfXUdczD7uOUllbd4/MRgCn4EmFvmpljGiEQ== -----END RSA PRIVATE KEY----- - - + -----BEGIN CERTIFICATE----- MIIEqzCCApOgAwIBAgIRAIvhKg5ZRO08VGQx8JdhT+UwDQYJKoZIhvcNAQELBQAw GjEYMBYGA1UEAwwPRmFrZSBMRSBSb290IFgxMB4XDTE2MDUyMzIyMDc1OVoXDTM2 diff --git a/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf b/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf index 1e45bc954..fcd742c0c 100644 --- a/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf +++ b/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf @@ -127,4 +127,3 @@ parameters: type:script_output description:Update HAProxy OCSP data message:update haproxy ocsp data - diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS index 389191f4d..b42f343eb 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/+TARGETS @@ -1,3 +1,3 @@ haproxy.conf:/usr/local/etc/haproxy.conf.staging rc.conf.d:/etc/rc.conf.d/haproxy -sslCerts.yaml:/usr/local/etc/haproxy/sslCerts.yaml \ No newline at end of file +sslCerts.yaml:/usr/local/etc/haproxy/sslCerts.yaml diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml index 56fed4573..fd766e002 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml @@ -58,4 +58,4 @@ frontends: {% endfor %} {% else %} frontends: {} -{% endif %} \ No newline at end of file +{% endif %}