X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a8942b825af38bee6da538a5a64dcce91c42341a..215373326fae6ef0fa85eeeb40f5d17943e3d533:/cookbooks/exim/recipes/default.rb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 1bbd084ee..2aabb40ff 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -23,9 +23,7 @@ package "exim4" package "openssl" package "ssl-cert" -if File.exist?("/var/run/clamav/clamd.ctl") - package "exim4-daemon-heavy" -end +package "exim4-daemon-heavy" if File.exist?("/var/run/clamav/clamd.ctl") group "ssl-cert" do action :modify @@ -37,7 +35,7 @@ template "/tmp/exim.ssl.cnf" do source "ssl.cnf.erb" owner "root" group "root" - mode 0644 + mode 0o644 not_if do File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key") end @@ -76,7 +74,7 @@ template "/etc/exim4/exim4.conf" do source "exim4.conf.erb" owner "root" group "Debian-exim" - mode 0644 + mode 0o644 variables :relay_to_domains => relay_to_domains.sort, :relay_from_hosts => relay_from_hosts.sort notifies :restart, "service[exim4]" @@ -103,17 +101,17 @@ template "/etc/aliases" do source "aliases.erb" owner "root" group "root" - mode 0644 + mode 0o644 end remote_directory "/etc/exim4/noreply" do source "noreply" owner "root" group "Debian-exim" - mode 0755 + mode 0o755 files_owner "root" files_group "Debian-exim" - files_mode 0755 + files_mode 0o755 purge true end