X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19ca76c7c5e79cbb4e497b937376bffcb42d85fc..22bfa5e6f8152e492f21ae2c972a164474cfdd61:/cookbooks/exim/recipes/default.rb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 6af07c8e1..a9f6472e6 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -26,7 +26,9 @@ package %w[ ssl-cert ] -package "exim4-daemon-heavy" if File.exist?("/var/run/clamav/clamd.ctl") +package "exim4-daemon-heavy" do + only_if { ::File.exist?("/var/run/clamav/clamd.ctl") } +end group "ssl-cert" do action :modify @@ -118,6 +120,13 @@ end if node[:exim][:dkim_selectors] keys = data_bag_item("exim", "dkim") + template "/etc/exim4/dkim-domains" do + owner "root" + source "dkim-domains.erb" + group "Debian-exim" + mode 0o644 + end + template "/etc/exim4/dkim-selectors" do owner "root" source "dkim-selectors.erb" @@ -131,7 +140,7 @@ if node[:exim][:dkim_selectors] mode 0o755 end - node[:exim][:dkim_selectors].each do |domain, selector| + node[:exim][:dkim_selectors].each do |domain, _selector| file "/etc/exim4/dkim-keys/#{domain}" do content keys[domain].join("\n") owner "root"