recommit for updates in build 137

doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html

@@ -223,8 +223,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
         <span class='type'>(<tt>string</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
-      
       
         &mdash;
         <div class='inline'>
@@ -241,8 +239,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
         <span class='type'>(<tt>string</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;020&#39;</tt>)</em>
-      
       
         &mdash;
         <div class='inline'>
@@ -325,6 +321,32 @@ instance configuration.</p>
       
     </li>
   
+    <li>
+      
+        <span class='name'>acl_rule_front</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>acl_rule_back</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
+      
+      
+    </li>
+  
 </ul>
 
 
@@ -372,14 +394,7 @@ instance configuration.</p>
 74
 75
 76
-77
+77</pre>
-78
-79
-80
-81
-82
-83
-84</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 41</span>
@@ -392,8 +407,8 @@ $frontend_mode    = undef,
 $fe_use_backend   = &#39;&#39;,
 $fe_bind_mode     = undef,
 $frontend_order   = &#39;010&#39;,
-$acl_rule         = &#39;&#39;,
+$acl_rule_front   = &#39;&#39;,
-$acl_order        = &#39;020&#39;,
+$acl_rule_back    = &#39;&#39;,
 $backend_name     = undef,
 $backend_order    = &#39;030&#39;,
 $fe_maxconn       = undef,
@@ -414,13 +429,6 @@ $hy_acl_rule      = &#39;cd_haproxy/haproxy_acl_rule.erb&#39;
     order   =&gt;  $frontend_order,
   }
 
-  # create acl section
-  concat::fragment { &quot;acl_${name}&quot;:
-    target  =&gt;  $hy_main_config,
-    content =&gt;  template($hy_acl_rule),
-    order   =&gt;  $acl_order,
-  }
-
   # create backend section
   concat::fragment { &quot;backend_${name}&quot;:
     target  =&gt;  $hy_main_config,