X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5965ce211517c8fb9aa7805c443c088dd4b83e93..de170d3f58a86d561097a6afc28f3ec65a7b7f43:/cookbooks/exim/recipes/default.rb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index f1c9ddf22..f8a50f9c9 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -77,18 +77,6 @@ end relay_from_hosts = node[:exim][:relay_from_hosts] if node[:exim][:smarthost_name] - search(:node, "roles:gateway") do |gateway| - allowed_ips = gateway.interfaces(:role => :internal).map do |interface| - "#{interface[:network]}/#{interface[:prefix]}" - end - - node.default[:networking][:wireguard][:peers] << { - :public_key => gateway[:networking][:wireguard][:public_key], - :allowed_ips => allowed_ips, - :endpoint => "#{gateway.name}:51820" - } - end - search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host| relay_from_hosts |= host.ipaddresses(:role => :external) end @@ -163,6 +151,14 @@ if node[:exim][:dkim_selectors] end end +template "/etc/default/exim4" do + source "default.erb" + owner "root" + group "root" + mode "044" + notifies :restart, "service[exim4]" +end + template "/etc/exim4/exim4.conf" do source "exim4.conf.erb" owner "root"