email relay configuration

Antonio Terceiro
1 parent 4216f9fb
Showing 12 changed files with 156 additions and 12 deletions Show diff stats
config/roles/email_server.rb
config/roles/server.rb
config/roles/social_server.rb
cookbooks/email/recipes/client.rb
cookbooks/email/recipes/default.rb
cookbooks/email/recipes/relay.rb
cookbooks/mailman/recipes/default.rb
nodes.yaml
test/bin/clear-email-queue
test/bin/curl-host
test/bin/wait-for-email-to
test/mail_relay_test.sh
-name 'database_server'
+name 'email_server'
 description 'E-mail server'
-run_list 'recipe[postfix]'
+run_list 'recipe[email::relay]'
 name 'server'
 description 'Common configuration for all servers'
-run_list 'recipe[basics]'
+run_list 'recipe[basics]', 'recipe[email::client]'
 name 'database_server'
 description 'Social networking server'
-run_list 'recipe[noosfero]'
+#run_list 'recipe[noosfero]'
@@ -0,0 +1,9 @@
+include_recipe 'email'
+
+execute 'postfix:configrelay' do
+  command "postconf relayhost=[#{node['peers']['email']}]"
+  notifies :reload, 'service[postfix]'
+
+  # not on the relay host itself
+  not_if { node.hostname == 'email' }
+end
@@ -0,0 +1,9 @@
+include_recipe 'email'
+
+package 'postfix'
+package 'mailx' # for testing, etc
+
+service 'postfix' do
+  action [:enable, :start]
+  supports :reload => true
+end
@@ -0,0 +1,48 @@
+include_recipe 'email'
+
+# smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
+# smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
+
+postfix_config = {
+
+  myhostname: node['config']['relay_hostname'],
+
+  relay_domains: [
+    node['config']['lists_hostname'],
+    node['config']['external_hostname'],
+  ].join(', '),
+
+  transport_maps: 'hash:/etc/postfix/transport',
+
+  mynetworks: '127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 ' + node['peers'].values.sort.join(' '),
+
+}
+
+execute 'postfix:relay:config' do
+  command postfix_config.map { |k,v| "postconf #{k}='#{v}'" }.join(' ; ')
+  notifies :reload, 'service[postfix]'
+end
+
+execute 'postfix:interfaces:all' do
+  command "postconf inet_interfaces=all"
+  notifies :restart, 'service[postfix]'
+  not_if { system('grep -q "inet_interfaces\s*=\s*all" /etc/postfix/main.cf') }
+end
+
+transport = {
+  node['config']['lists_hostname'] => node['peers']['integration'],
+  node['config']['external_hostname'] => node['peers']['integration'],
+}
+
+file '/etc/postfix/transport' do
+  owner 'root'
+  group 'root'
+  mode 0644
+  content transport.map { |domain,ip| "#{domain}\tsmtp:[#{ip}]\n" }.join
+  notifies :run, 'execute[transport:postmap]'
+end
+
+execute 'transport:postmap' do
+  command "postmap /etc/postfix/transport"
+  action :nothing
+end
@@ -22,15 +22,17 @@ service &#39;mailman&#39; do
   supports :restart => true
 end
-package 'postfix'
-package 'mailx' # for testing, etc
-
-execute 'postfix-config' do
+execute 'postfix:config' do
   command [
     "postconf relay_domains=#{node['config']['lists_hostname']}",
     "postconf transport_maps=hash:/etc/postfix/transport",
   ].join(' && ')
-  only_if { !system('grep', node['config']['lists_hostname'], '/etc/postfix/main.cf') }
+  notifies :reload, 'service[postfix]'
+end
+
+execute 'postfix:interfaces' do
+  command "postconf inet_interfaces=\"$(cat /etc/hostname), localhost\""
+  not_if { system('postconf inet_interfaces | grep -q \'=\s*localhost\s*$\'') }
   notifies :restart, 'service[postfix]'
 end
@@ -69,6 +71,3 @@ ruby_block &#39;configure-mailman-transport&#39; do
   only_if { !system('grep', '^mailman', '/etc/postfix/master.cf')}
 end
-service 'postfix' do
-  action [:enable, :reload]
-end
@@ -14,6 +14,7 @@ vagrant@integration:
     email_subject_prefix: '[spb]'
     lists_hostname: listas.softwarepublico.dev
     lists_admin: paulo@softwarelivre.org
+    relay_hostname: relay.softwarepublico.dev
   peers: &PEERS
     integration:  10.10.10.2
     email:        10.10.10.3
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+sudo postsuper -d ALL >/dev/null 2>&1
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -eu
+
+host="$1"
+shift
+
+$(dirname $0)/curl --header "Host: $host" "$@"
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -eu
+
+to="$1"
+
+waited=0
+
+while [ $waited -lt 10 ]; do
+  if (sudo postqueue -p | grep -q "$to"); then
+    sudo postqueue -p | grep -c "$to"
+    exit
+  fi
+  sleep 1
+  waited=$(($waited + 1))
+done
+
+echo "E: no message for $to arrived at the mail realy" >&2
+echo 0
+exit 1
+
@@ -0,0 +1,44 @@
+. $(dirname $0)/test_helper.sh
+
+test_inbound_mail() {
+  run_on integration create-list mylist foo@example.com
+
+  # sending FROM EMAIL RELAY HOST
+  run_on email send-email foo@example.com mylist@listas.softwarepublico.dev
+
+  messages=$(run_on integration wait-for-messages mylist)
+
+  run_on integration remove-list mylist
+
+  assertEquals 'Message arrives at the mailing list' '1' "$messages"
+}
+
+_test_outbound_email() {
+  machine="$1"
+
+  run_on email clear-email-queue
+
+  run_on $machine send-email sender@example.com receiver@example.com
+
+  messages=$(run_on email wait-for-email-to receiver@example.com)
+
+  run_on email clear-email-queue
+
+  assertEquals 'Message delivered through relay' 1 "$messages"
+}
+
+test_outbound_email_integration() {
+  _test_outbound_email integration
+}
+test_outbound_email_database() {
+  _test_outbound_email database
+}
+test_outbound_email_social() {
+  _test_outbound_email social
+}
+test_outbound_email_reverseproxy() {
+  _test_outbound_email reverseproxy
+}
+
+. shunit2
+
1	-name 'database_server'	1	+name 'email_server'
2	description 'E-mail server'	2	description 'E-mail server'
3	-run_list 'recipe[postfix]'	3	+run_list 'recipe[email::relay]'
1	name 'server'	1	name 'server'
2	description 'Common configuration for all servers'	2	description 'Common configuration for all servers'
3	-run_list 'recipe[basics]'	3	+run_list 'recipe[basics]', 'recipe[email::client]'
1	name 'database_server'	1	name 'database_server'
2	description 'Social networking server'	2	description 'Social networking server'
3	-run_list 'recipe[noosfero]'	3	+#run_list 'recipe[noosfero]'
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+include_recipe 'email'
	2	+
	3	+execute 'postfix:configrelay' do
	4	+ command "postconf relayhost=[#{node['peers']['email']}]"
	5	+ notifies :reload, 'service[postfix]'
	6	+
	7	+ # not on the relay host itself
	8	+ not_if { node.hostname == 'email' }
	9	+end
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+include_recipe 'email'
	2	+
	3	+# smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
	4	+# smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
	5	+
	6	+postfix_config = {
	7	+
	8	+ myhostname: node['config']['relay_hostname'],
	9	+
	10	+ relay_domains: [
	11	+ node['config']['lists_hostname'],
	12	+ node['config']['external_hostname'],
	13	+ ].join(', '),
	14	+
	15	+ transport_maps: 'hash:/etc/postfix/transport',
	16	+
	17	+ mynetworks: '127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 ' + node['peers'].values.sort.join(' '),
	18	+
	19	+}
	20	+
	21	+execute 'postfix:relay:config' do
	22	+ command postfix_config.map { \|k,v\| "postconf #{k}='#{v}'" }.join(' ; ')
	23	+ notifies :reload, 'service[postfix]'
	24	+end
	25	+
	26	+execute 'postfix:interfaces:all' do
	27	+ command "postconf inet_interfaces=all"
	28	+ notifies :restart, 'service[postfix]'
	29	+ not_if { system('grep -q "inet_interfaces\s=\sall" /etc/postfix/main.cf') }
	30	+end
	31	+
	32	+transport = {
	33	+ node['config']['lists_hostname'] => node['peers']['integration'],
	34	+ node['config']['external_hostname'] => node['peers']['integration'],
	35	+}
	36	+
	37	+file '/etc/postfix/transport' do
	38	+ owner 'root'
	39	+ group 'root'
	40	+ mode 0644
	41	+ content transport.map { \|domain,ip\| "#{domain}\tsmtp:[#{ip}]\n" }.join
	42	+ notifies :run, 'execute[transport:postmap]'
	43	+end
	44	+
	45	+execute 'transport:postmap' do
	46	+ command "postmap /etc/postfix/transport"
	47	+ action :nothing
	48	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+#!/bin/sh
	2	+
	3	+set -e
	4	+
	5	+sudo postsuper -d ALL >/dev/null 2>&1
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+#!/bin/sh
	2	+
	3	+set -eu
	4	+
	5	+host="$1"
	6	+shift
	7	+
	8	+$(dirname $0)/curl --header "Host: $host" "$@"
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+#!/bin/sh
	2	+
	3	+set -eu
	4	+
	5	+to="$1"
	6	+
	7	+waited=0
	8	+
	9	+while [ $waited -lt 10 ]; do
	10	+ if (sudo postqueue -p \| grep -q "$to"); then
	11	+ sudo postqueue -p \| grep -c "$to"
	12	+ exit
	13	+ fi
	14	+ sleep 1
	15	+ waited=$(($waited + 1))
	16	+done
	17	+
	18	+echo "E: no message for $to arrived at the mail realy" >&2
	19	+echo 0
	20	+exit 1
	21	+
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+. $(dirname $0)/test_helper.sh
	2	+
	3	+test_inbound_mail() {
	4	+ run_on integration create-list mylist foo@example.com
	5	+
	6	+ # sending FROM EMAIL RELAY HOST
	7	+ run_on email send-email foo@example.com mylist@listas.softwarepublico.dev
	8	+
	9	+ messages=$(run_on integration wait-for-messages mylist)
	10	+
	11	+ run_on integration remove-list mylist
	12	+
	13	+ assertEquals 'Message arrives at the mailing list' '1' "$messages"
	14	+}
	15	+
	16	+_test_outbound_email() {
	17	+ machine="$1"
	18	+
	19	+ run_on email clear-email-queue
	20	+
	21	+ run_on $machine send-email sender@example.com receiver@example.com
	22	+
	23	+ messages=$(run_on email wait-for-email-to receiver@example.com)
	24	+
	25	+ run_on email clear-email-queue
	26	+
	27	+ assertEquals 'Message delivered through relay' 1 "$messages"
	28	+}
	29	+
	30	+test_outbound_email_integration() {
	31	+ _test_outbound_email integration
	32	+}
	33	+test_outbound_email_database() {
	34	+ _test_outbound_email database
	35	+}
	36	+test_outbound_email_social() {
	37	+ _test_outbound_email social
	38	+}
	39	+test_outbound_email_reverseproxy() {
	40	+ _test_outbound_email reverseproxy
	41	+}
	42	+
	43	+. shunit2
	44	+