Merge branch 'master_upstream' into haproxy_cert_gui

Makefile

@@ -38,8 +38,8 @@ PLUGIN_DIRS+=	${_${CATEGORY}}
 
 list:
 .for PLUGIN_DIR in ${PLUGIN_DIRS}
-	@echo ${PLUGIN_DIR} -- $$(${MAKE} -C ${PLUGIN_DIR} -V PLUGIN_COMMENT) \
-	    $$(if [ -n "$$(${MAKE} -C ${PLUGIN_DIR} -V PLUGIN_DEVEL _PLUGIN_DEVEL=)" ]; then echo "(development only)"; fi)
+	@echo ${PLUGIN_DIR} -- $$(${MAKE} -C ${PLUGIN_DIR} -v PLUGIN_COMMENT) \
+	    $$(if [ -n "$$(${MAKE} -C ${PLUGIN_DIR} -v PLUGIN_DEVEL _PLUGIN_DEVEL=)" ]; then echo "(development only)"; fi)
 .endfor
 
 # shared targets that are sane to run from the root directory

Scripts/revbump.sh

@@ -8,7 +8,7 @@ if [ -z "${DIR}" ]; then
 	DIR=.
 fi
 
-REV=$(make -C ${DIR} -V PLUGIN_REVISION)
+REV=$(make -C ${DIR} -v PLUGIN_REVISION)
 REV=$(expr ${REV} \+ 1)
 
 grep -v ^PLUGIN_REVISION ${DIR}/Makefile > ${DIR}/Makefile.tmp

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') {

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

net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf

@@ -139,4 +139,3 @@ parameters:
 type:script_output
 description:Update HAProxy OCSP data
 message:update haproxy ocsp data
-

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
+sslCerts.yaml:/usr/local/etc/haproxy/sslCerts.yaml

net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml

@@ -58,4 +58,4 @@ frontends:
 {%  endfor %}
 {% else %}
 frontends: {}
-{% endif %}
+{% endif %}