X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/99f72e0ddbd36942cffa1b67c989505886412754..5f20611f74a1dd1f099790d8f29ed284ff40d39c:/cookbooks/exim/recipes/default.rb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 8489bc2d1..e0fd75de3 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "munin" include_recipe "networking" package %w[ @@ -77,7 +78,7 @@ if node[:exim][:smarthost_name] relay_from_hosts |= host.ipaddresses(:role => :external) end - domains = node[:exim][:local_domains].reject { |d| ["localhost", "@", "noreply.openstreetmap.org"].any?(d) } + domains = node[:exim][:certificate_names].select { |c| c =~ /^a\.mx\./ }.collect { |c| c.sub(/^a\.mx./, "") } primary_domain = domains.first directory "/srv/mta-sts.#{primary_domain}" do