Merge branch 'Ray76-master'

debops · Feb 7, 2017 · d13afb7 · d13afb7
2 parents 50ef38a + b87386a
commit d13afb7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -152,7 +152,7 @@ ferm__filter_syn_limit: '40/second'
 # .. envvar:: ferm__filter_syn_burst [[[
 #
 # Burst limit when filtering TCP SYN segments.
-ferm__filter_syn_burst: '20'
+ferm__filter_syn_burst: '40'
 
                                                                    # ]]]
 # .. envvar:: ferm__filter_syn_expire [[[

diff --git a/templates/etc/ferm/ferm.d/accept.conf.j2 b/templates/etc/ferm/ferm.d/accept.conf.j2
@@ -280,6 +280,9 @@
 {%     endif %}
 {%   endif %}
 {% endif %}
+{% if ferm__tpl_daddr %}
+{%   set _= ferm__tpl_arguments.append("daddr (" + ferm__tpl_daddr | join(" ") +")") %}
+{% endif %}
 {% if ferm__tpl_state %}
 {%   if ferm__tpl_state | length == 1 %}
 {%     set _ = ferm__tpl_arguments.append("mod state state " +  ferm__tpl_state | join(" ")) %}