From b51249531dec4ddb197464d484f50e1a9e3f7f81 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 15 Sep 2019 22:27:35 +0200
Subject: [PATCH] net/haproxy: change order of frontend options

---
 .../OPNsense/HAProxy/forms/dialogFrontend.xml | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
index 3aa40fb28..32e200eb9 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
@@ -161,6 +161,38 @@
         <help><![CDATA[Select CRLs to use for client certificate authentication. <br/>To import additional CRLs, go to <a href="/system_crlmanager.php">CRL Manager</a>.]]></help>
         <hint>Type CRL name or choose from list.</hint>
     </field>
+    <field>
+        <label>HTTP(S) settings</label>
+        <type>header</type>
+        <style>mode_table table_http</style>
+    </field>
+    <field>
+        <id>frontend.http2Enabled</id>
+        <label>Enable HTTP/2</label>
+        <type>checkbox</type>
+        <help><![CDATA[Enable support for HTTP/2.]]></help>
+    </field>
+    <field>
+        <id>frontend.http2Enabled_nontls</id>
+        <label>HTTP/2 without TLS</label>
+        <type>checkbox</type>
+        <help><![CDATA[Enable support for HTTP/2 even if TLS (SSL offloading) is not enabled.]]></help>
+    </field>
+    <field>
+        <id>frontend.advertised_protocols</id>
+        <label>Advertise Protocols (ALPN)</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <sortable>true</sortable>
+        <help><![CDATA[When using the TLS ALPN extension, HAProxy advertises the specified protocol list as supported on top of ALPN. SSL offloading must be enabled.]]></help>
+    </field>
+    <field>
+        <id>frontend.forwardFor</id>
+        <label>X-Forwarded-For header</label>
+        <type>checkbox</type>
+        <help><![CDATA[Enable insertion of the X-Forwarded-For header to requests sent to servers.]]></help>
+    </field>
     <field>
         <label>Basic Authentication</label>
         <type>header</type>
@@ -264,38 +296,6 @@
         <help><![CDATA[Enable or disable collecting & providing separate statistics for each socket.]]></help>
         <advanced>true</advanced>
     </field>
-    <field>
-        <label>HTTP(S) settings</label>
-        <type>header</type>
-        <style>mode_table table_http</style>
-    </field>
-    <field>
-        <id>frontend.http2Enabled</id>
-        <label>Enable HTTP/2</label>
-        <type>checkbox</type>
-        <help><![CDATA[Enable support for HTTP/2.]]></help>
-    </field>
-    <field>
-        <id>frontend.http2Enabled_nontls</id>
-        <label>HTTP/2 without TLS</label>
-        <type>checkbox</type>
-        <help><![CDATA[Enable support for HTTP/2 even if TLS (SSL offloading) is not enabled.]]></help>
-    </field>
-    <field>
-        <id>frontend.advertised_protocols</id>
-        <label>Advertise Protocols (ALPN)</label>
-        <type>select_multiple</type>
-        <style>tokenize</style>
-        <allownew>true</allownew>
-        <sortable>true</sortable>
-        <help><![CDATA[When using the TLS ALPN extension, HAProxy advertises the specified protocol list as supported on top of ALPN. SSL offloading must be enabled.]]></help>
-    </field>
-    <field>
-        <id>frontend.forwardFor</id>
-        <label>X-Forwarded-For header</label>
-        <type>checkbox</type>
-        <help><![CDATA[Enable insertion of the X-Forwarded-For header to requests sent to servers.]]></help>
-    </field>
     <field>
         <label>Stickiness table</label>
         <type>header</type>