X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d0404b4ed36e373b85fd27b033634b896a73354c..b53cbecada759e3169a483989fc50d9e2a5c25c0:/cookbooks/exim/recipes/default.rb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index b250045d2..9aebb3d9f 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -77,7 +77,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 @@ -103,6 +103,7 @@ if node[:exim][:smarthost_name] apache_site "mta-sts.#{primary_domain}" do template "apache-mta-sts.erb" + directory "/srv/mta-sts.#{primary_domain}" variables :domains => domains end end