X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..ce136e365e7258d85a27d44eb2817f881d78d25f:/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 adc04a899..73b6dbe4d 100644 --- a/cookbooks/rsyncd/templates/default/rsyncd.conf.erb +++ b/cookbooks/rsyncd/templates/default/rsyncd.conf.erb @@ -1,5 +1,5 @@ # DO NOT EDIT - This file is being maintained by Chef -<% node[:rsyncd][:modules].each do |name,details| -%> +<% node[:rsyncd][:modules].sort.each do |name,details| -%> [<%= name %>] comment = <%= details[:comment] %> @@ -33,11 +33,11 @@ <% if details[:refuse_options] -%> refuse options = <%= details[:refuse_options].join(" ") %> <% end -%> -<% if details[:hosts_allow] -%> - hosts allow = <%= details[:hosts_allow].join(",") %> +<% unless @hosts_allow[name].empty? -%> + hosts allow = <%= @hosts_allow[name].sort.join(",") %> <% end -%> -<% if details[:hosts_deny] -%> - hosts deny = <%= details[:hosts_deny].join(",") %> +<% unless @hosts_deny[name].empty? -%> + hosts deny = <%= @hosts_deny[name].sort.join(",") %> <% 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 -%>