Merge remote-tracking branch 'github/pull/451'

[chef.git] / cookbooks / rsyncd / templates / default / rsyncd.conf.erb

diff --git a/cookbooks/rsyncd/templates/default/rsyncd.conf.erb b/cookbooks/rsyncd/templates/default/rsyncd.conf.erb
index 5e169129cf7c1d090fb8ed9b29ca2da9ab6700ce..73b6dbe4d342f9b6178df56d42846d1fdbc75fb5 100644 (file)
--- a/cookbooks/rsyncd/templates/default/rsyncd.conf.erb
+++ b/cookbooks/rsyncd/templates/default/rsyncd.conf.erb
@@ -34,10 +34,10 @@
      refuse options = <%= details[:refuse_options].join(" ") %>
 <% end -%>
 <% unless @hosts_allow[name].empty? -%>
      refuse options = <%= details[:refuse_options].join(" ") %>
 <% end -%>
 <% unless @hosts_allow[name].empty? -%>

-     hosts allow = <%= @hosts_allow[name].join(",") %>
+     hosts allow = <%= @hosts_allow[name].sort.join(",") %>

 <% end -%>
 <% unless @hosts_deny[name].empty? -%>
 <% end -%>
 <% unless @hosts_deny[name].empty? -%>

-     hosts deny = <%= @hosts_deny[name].join(",") %>
+     hosts deny = <%= @hosts_deny[name].sort.join(",") %>

 <% end -%>
 <% end -%>

-     dont compress = *.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz *.7z
+     dont compress = *.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz *.7z *.xz *.pbf

 <% end -%>
 <% end -%>