Drop support for GeoIPv1 databases in rails installs

[chef.git] / cookbooks / exim / recipes / default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 7c9dc6887886f9f2589cb4f3fdef8184da2a2f1a..6234aa96412ab3034b1f5cbf3b0a6540efaef7a4 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: exim
+# Cookbook:: exim

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,13 +17,17 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "munin"

 include_recipe "networking"
 include_recipe "networking"

-include_recipe "ssl"

 
 

-package "exim4"
+package %w[
+  exim4
+  openssl
+  ssl-cert
+]

 
 

-if File.exist?("/var/run/clamav/clamd.ctl")
-  package "exim4-daemon-heavy"
+package "exim4-daemon-heavy" do
+  only_if { ::File.exist?("/var/run/clamav/clamd.ctl") }

 end
 
 group "ssl-cert" do
 end
 
 group "ssl-cert" do


@@ -32,24 +36,117 @@ group "ssl-cert" do
   append true
 end
 
   append true
 end
 

+if node[:exim][:certificate_names]
+  include_recipe "apache"
+
+  apache_site node[:exim][:certificate_names].first do
+    template "apache.erb"
+    variables :aliases => node[:exim][:certificate_names].drop(1)
+  end
+
+  ssl_certificate node[:exim][:certificate_names].first do
+    domains node[:exim][:certificate_names]
+    notifies :restart, "service[exim4]"
+  end
+else
+  openssl_x509_certificate "/etc/ssl/certs/exim.pem" do
+    key_file "/etc/ssl/private/exim.key"
+    owner "root"
+    group "ssl-cert"
+    mode "640"
+    org "OpenStreetMap"
+    email "postmaster@openstreetmap.org"
+    common_name node[:fqdn]
+    expire 3650
+    notifies :restart, "service[exim4]"
+  end
+end
+

 service "exim4" do
 service "exim4" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
   supports :status => true, :restart => true, :reload => true

-  subscribes :restart, resources(:cookbook_file => "/etc/ssl/certs/openstreetmap.pem")
-  subscribes :restart, resources(:file => "/etc/ssl/private/openstreetmap.key")

 end
 
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|
 end
 
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|

-  relay_to_domains = relay_to_domains | route[:domains]
+  relay_to_domains |= route[:domains] if route[:host]

 end
 
 relay_from_hosts = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]
   search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host|
 end
 
 relay_from_hosts = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]
   search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host|

-    relay_from_hosts = relay_from_hosts | host.ipaddresses(:role => :external)
+    relay_from_hosts |= host.ipaddresses(:role => :external)
+  end
+
+  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
+    owner "root"
+    group "root"
+    mode "755"
+  end
+
+  domains.each do |domain|
+    template "/srv/mta-sts.#{primary_domain}/#{domain}.txt" do
+      source "mta-sts.erb"
+      owner "root"
+      group "root"
+      mode "644"
+      variables :domain => domain
+    end
+  end
+
+  ssl_certificate "mta-sts.#{primary_domain}" do
+    domains domains.collect { |d| "mta-sts.#{d}" }
+    notifies :reload, "service[apache2]"
+  end
+
+  apache_site "mta-sts.#{primary_domain}" do
+    template "apache-mta-sts.erb"
+    directory "/srv/mta-sts.#{primary_domain}"
+    variables :domains => domains
+  end
+end
+
+file "/etc/exim4/blocked-senders" do
+  owner "root"
+  group "Debian-exim"
+  mode "644"
+end
+
+if node[:exim][:dkim_selectors]
+  keys = data_bag_item("exim", "dkim")
+
+  template "/etc/exim4/dkim-domains" do
+    owner "root"
+    source "dkim-domains.erb"
+    group "Debian-exim"
+    mode "644"
+  end
+
+  template "/etc/exim4/dkim-selectors" do
+    owner "root"
+    source "dkim-selectors.erb"
+    group "Debian-exim"
+    mode "644"
+  end
+
+  directory "/etc/exim4/dkim-keys" do
+    owner "root"
+    group "Debian-exim"
+    mode "755"
+  end
+
+  node[:exim][:dkim_selectors].each do |domain, _selector|
+    file "/etc/exim4/dkim-keys/#{domain}" do
+      content keys[domain].join("\n")
+      owner "root"
+      group "Debian-exim"
+      mode "640"
+    end

   end
 end
 
   end
 end
 


@@ -57,43 +154,51 @@ template "/etc/exim4/exim4.conf" do
   source "exim4.conf.erb"
   owner "root"
   group "Debian-exim"
   source "exim4.conf.erb"
   owner "root"
   group "Debian-exim"

-  mode 0644
+  mode "644"

   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort

-  notifies :restart, resources(:service => "exim4")
+  notifies :restart, "service[exim4]"

 end
 
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
 end
 
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 

-  if details[:status] and account["email"]
+  if details[:status] && account["email"]

     node.default[:exim][:aliases][name] = account["email"]
   end
 end
 
     node.default[:exim][:aliases][name] = account["email"]
   end
 end
 

+if node[:exim][:private_aliases]
+  aliases = data_bag_item("exim", "aliases")
+
+  aliases[node[:exim][:private_aliases]].each do |name, address|
+    node.default[:exim][:aliases][name] = address
+  end
+end
+

 template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
   group "root"
 template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

 end
 
 remote_directory "/etc/exim4/noreply" do
   source "noreply"
   owner "root"
   group "Debian-exim"
 end
 
 remote_directory "/etc/exim4/noreply" do
   source "noreply"
   owner "root"
   group "Debian-exim"

-  mode 0755
+  mode "755"

   files_owner "root"
   files_group "Debian-exim"
   files_owner "root"
   files_group "Debian-exim"

-  files_mode 0755
+  files_mode "755"

   purge true
 end
 
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 
   purge true
 end
 
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 

-if not relay_to_domains.empty? or not node[:exim][:local_domains].empty?
+if node[:exim][:smarthost_name]

   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept
   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept


@@ -104,6 +209,17 @@ if not relay_to_domains.empty? or not node[:exim][:local_domains].empty?
       source_ports "1024:"
     end
   end
       source_ports "1024:"
     end
   end

+else
+  node[:exim][:daemon_smtp_ports].each do |port|
+    firewall_rule "accept-inbound-smtp-#{port}" do
+      action :accept
+      source "bm:mail.openstreetmap.org"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports port
+      source_ports "1024:"
+    end
+  end

 end
 
 if node[:exim][:smarthost_via]
 end
 
 if node[:exim][:smarthost_via]