X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d1b835abf6c54e768ead54dd0056011554ba0b71..f6f2f9e52a1f7c2c13027779da1a3b7f49ff2763:/cookbooks/exim/recipes/default.rb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 6234aa964..8a1fd5efb 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -19,6 +19,7 @@ include_recipe "munin" include_recipe "networking" +include_recipe "prometheus" package %w[ exim4 @@ -76,6 +77,18 @@ 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 @@ -150,6 +163,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" @@ -198,6 +219,10 @@ end munin_plugin "exim_mailqueue" munin_plugin "exim_mailstats" +prometheus_exporter "exim" do + port 9636 +end + if node[:exim][:smarthost_name] node[:exim][:daemon_smtp_ports].each do |port| firewall_rule "accept-inbound-smtp-#{port}" do