Merge pull request #421 from fraenki/haproxy_23

net/haproxy: Release 2.3

net/haproxy/Makefile

@@ -1,5 +1,5 @@
 PLUGIN_NAME=		haproxy
-PLUGIN_VERSION=		2.2
+PLUGIN_VERSION=		2.3
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
 PLUGIN_DEPENDS=		haproxy
 PLUGIN_MAINTAINER=	opnsense@moov.de

net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php

@@ -28,6 +28,7 @@
  *
  */
 namespace OPNsense\HAProxy;
+use OPNsense\HAProxy\HAProxy;
 
 /**
  * Class IndexController
@@ -51,6 +52,9 @@ class IndexController extends \OPNsense\Base\IndexController
         $this->view->formDialogAcl = $this->getForm("dialogAcl");
         $this->view->formDialogLua = $this->getForm("dialogLua");
         $this->view->formDialogErrorfile = $this->getForm("dialogErrorfile");
+        // set additional view parameters
+        $mdlHAProxy = new \OPNsense\HAProxy\HAProxy();
+        $this->view->showIntro = (string)$mdlHAProxy->general->showIntro;
         // pick the template to serve
         $this->view->pick('OPNsense/HAProxy/index');
     }

net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml

@@ -13,6 +13,12 @@
                 <type>checkbox</type>
                 <help><![CDATA[Enable HAProxy's graceful stop mode. In this mode HAProxy will continue to process existing connections until they close. Note that this may severely slow down HAProxy's shutdown, depending on the configured timeout values. If graceful stop mode is not enabled, HAProxy will use the hard stop mode where it immediately quits and all established connections are closed. Hard stop mode is recommended.]]></help>
             </field>
+            <field>
+                <id>haproxy.general.showIntro</id>
+                <label>Show introduction pages</label>
+                <type>checkbox</type>
+                <help><![CDATA[Uncheck to hide all additional introduction pages. Requires a manual page reload for the change to take effect.]]></help>
+            </field>
         </subtab>
         <subtab id="haproxy-general-global" description="Global Parameters">
             <field>

net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml

@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/HAProxy</mount>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <description>
         the HAProxy load balancer
     </description>
@@ -14,6 +14,9 @@
                 <default>0</default>
                 <Required>Y</Required>
             </gracefulStop>
+            <showIntro type="BooleanField">
+                <default>1</default>
+            </showIntro>
             <tuning>
                 <root type="BooleanField">
                     <default>0</default>

net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt

@@ -381,10 +381,12 @@ POSSIBILITY OF SUCH DAMAGE.
         <a data-toggle="dropdown" href="#" class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" role="button">
             <b><span class="caret"></span></b>
         </a>
-        <a data-toggle="tab" onclick="$('#real-servers-introduction').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Real Servers') }}</b></a>
+        <a data-toggle="tab" onclick="$('#{% if showIntro|default('0')=='1' %}real-servers-introduction{% else %}servers-tab{% endif %}').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Real Servers') }}</b></a>
         <ul class="dropdown-menu" role="menu">
+            {% if showIntro|default('0')=='1' %}
             <li><a data-toggle="tab" id="real-servers-introduction" href="#subtab_haproxy-real-servers-introduction">{{ lang._('Introduction') }}</a></li>
-            <li><a data-toggle="tab" href="#servers">{{ lang._('Real Servers') }}</a></li>
+            {% endif %}
+            <li><a data-toggle="tab" id="servers-tab" href="#servers">{{ lang._('Real Servers') }}</a></li>
         </ul>
     </li>
 
@@ -392,10 +394,12 @@ POSSIBILITY OF SUCH DAMAGE.
         <a data-toggle="dropdown" href="#" class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" role="button">
             <b><span class="caret"></span></b>
         </a>
-        <a data-toggle="tab" onclick="$('#virtual-services-introduction').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Virtual Services') }}</b></a>
+        <a data-toggle="tab" onclick="$('#{% if showIntro|default('0')=='1' %}virtual-services-introduction{% else %}backends-tab{% endif %}').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Virtual Services') }}</b></a>
         <ul class="dropdown-menu" role="menu">
+            {% if showIntro|default('0')=='1' %}
             <li><a data-toggle="tab" id="virtual-services-introduction" href="#subtab_haproxy-virtual-services-introduction">{{ lang._('Introduction') }}</a></li>
-            <li><a data-toggle="tab" href="#backends">{{ lang._('Backend Pools') }}</a></li>
+            {% endif %}
+            <li><a data-toggle="tab" id="backends-tab" href="#backends">{{ lang._('Backend Pools') }}</a></li>
             <li><a data-toggle="tab" href="#frontends">{{ lang._('Public Services') }}</a></li>
         </ul>
     </li>
@@ -404,10 +408,12 @@ POSSIBILITY OF SUCH DAMAGE.
         <a data-toggle="dropdown" href="#" class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" role="button">
             <b><span class="caret"></span></b>
         </a>
-        <a data-toggle="tab" onclick="$('#rules-checks-introduction').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Rules & Checks') }}</b></a>
+        <a data-toggle="tab" onclick="$('#{% if showIntro|default('0')=='1' %}rules-checks-introduction{% else %}healthchecks-tab{% endif %}').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Rules & Checks') }}</b></a>
         <ul class="dropdown-menu" role="menu">
+            {% if showIntro|default('0')=='1' %}
             <li><a data-toggle="tab" id="rules-checks-introduction" href="#subtab_haproxy-rules-checks-introduction">{{ lang._('Introduction') }}</a></li>
-            <li><a data-toggle="tab" href="#healthchecks">{{ lang._('Health Monitors') }}</a></li>
+            {% endif %}
+            <li><a data-toggle="tab" id="healthchecks-tab" href="#healthchecks">{{ lang._('Health Monitors') }}</a></li>
             <li><a data-toggle="tab" href="#acls">{{ lang._('Conditions') }}</a></li>
             <li><a data-toggle="tab" href="#actions">{{ lang._('Rules') }}</a></li>
         </ul>
@@ -442,10 +448,12 @@ POSSIBILITY OF SUCH DAMAGE.
         <a data-toggle="dropdown" href="#" class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" role="button">
             <b><span class="caret"></span></b>
         </a>
-        <a data-toggle="tab" onclick="$('#advanced-introduction').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Advanced') }}</b></a>
+        <a data-toggle="tab" onclick="$('#{% if showIntro|default('0')=='1' %}advanced-introduction{% else %}errorfiles-tab{% endif %}').click();" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{ lang._('Advanced') }}</b></a>
         <ul class="dropdown-menu" role="menu">
-            <li><a data-toggle="tab" id="advanced-introduction" href="#subtab_haproxy-rules-checks-introduction">{{ lang._('Introduction') }}</a></li>
-            <li><a data-toggle="tab" href="#errorfiles">{{ lang._('Error Messages') }}</a></li>
+            {% if showIntro|default('0')=='1' %}
+            <li><a data-toggle="tab" id="advanced-introduction" href="#subtab_haproxy-advanced-introduction">{{ lang._('Introduction') }}</a></li>
+            {% endif %}
+            <li><a data-toggle="tab" id="errorfiles-tab" href="#errorfiles">{{ lang._('Error Messages') }}</a></li>
             <li><a data-toggle="tab" href="#luas">{{ lang._('Lua Scripts') }}</a></li>
         </ul>
     </li>