X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/900be9a12bfe74cfb4c96e00b892d350a18eb635..4f918e18a1eb0fc2dc7518d74ed5f3b7017ae3d9:/cookbooks/exim/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 25ff1c1b8..94133183a 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: exim +# Cookbook:: exim # 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 # -# 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, @@ -19,12 +19,13 @@ include_recipe "networking" -package "exim4" -package "openssl" +package %w[ + exim4 + openssl + ssl-cert +] -if File.exist?("/var/run/clamav/clamd.ctl") - package "exim4-daemon-heavy" -end +package "exim4-daemon-heavy" if File.exist?("/var/run/clamav/clamd.ctl") group "ssl-cert" do action :modify @@ -32,50 +33,72 @@ group "ssl-cert" do append true end -execute "/etc/ssl/certs/exim.pem" do - command "openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/private/exim.key -out /etc/ssl/certs/exim.pem -days 3650 -nodes -subj='/O=OpenStreetMap/CN=#{node[:name]}'" - user "root" - group "ssl-cert" - not_if do - File.exists?("/etc/ssl/certs/exim.pem") && File.exists?("/etc/ssl/private/exim.key") +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 0o640 + org "OpenStreetMap" + email "postmaster@openstreetmap.org" + common_name node[:fqdn] + expire 3650 + notifies :restart, "service[exim4]" end end service "exim4" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true - subscribes :restart, "execute[/etc/ssl/certs/exim.pem]" 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| - relay_from_hosts = relay_from_hosts | host.ipaddresses(:role => :external) + relay_from_hosts |= host.ipaddresses(:role => :external) end end +file "/etc/exim4/blocked-senders" do + owner "root" + group "Debian-exim" + mode 0o644 +end + template "/etc/exim4/exim4.conf" do source "exim4.conf.erb" owner "root" group "Debian-exim" - mode 0644 + mode 0o644 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] || {} - if details[:status] and account["email"] + if details[:status] && account["email"] node.default[:exim][:aliases][name] = account["email"] end end @@ -83,7 +106,7 @@ end if node[:exim][:private_aliases] aliases = data_bag_item("exim", "aliases") - aliases[node[:exim][:private_aliases]].each do |name,address| + aliases[node[:exim][:private_aliases]].each do |name, address| node.default[:exim][:aliases][name] = address end end @@ -92,24 +115,24 @@ template "/etc/aliases" do source "aliases.erb" owner "root" group "root" - mode 0644 + mode 0o644 end remote_directory "/etc/exim4/noreply" do source "noreply" owner "root" group "Debian-exim" - mode 0755 + mode 0o755 files_owner "root" files_group "Debian-exim" - files_mode 0755 + files_mode 0o755 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 @@ -120,6 +143,17 @@ if not relay_to_domains.empty? or not node[:exim][:local_domains].empty? 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]