From 94939e1dfe8ccddc24db836f63571f498cd398c8 Mon Sep 17 00:00:00 2001 From: theonlydoo Date: Mon, 10 Nov 2014 18:27:58 +0100 Subject: [PATCH 1/4] config OK --- roles/mail/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml index 368d9ff..989c63e 100644 --- a/roles/mail/tasks/main.yml +++ b/roles/mail/tasks/main.yml @@ -100,7 +100,7 @@ command: openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 -subj "/C=FR/ST=RA/L=Somewhere/O=Overtherainbow/CN={{ domain }}" -keyout /etc/ssl/mail.key -out /etc/ssl/mail.crt - name: ca_bundle - gettint it from startssl - get_url: url=http://www.startssl.com/certs/ca-bundle.crt mode=0644 + get_url: url=http://www.startssl.com/certs/ca-bundle.crt dest=/etc/ssl/ca-bundle.crt mode=0644 - name: Create database for postfix shell: mysql < /etc/postfix/root-postfix.sql From e058eed1dbe386eda7f3b0494b45134cc72bfebb Mon Sep 17 00:00:00 2001 From: theonlydoo Date: Tue, 11 Nov 2014 12:39:49 +0100 Subject: [PATCH 2/4] smtpd.conf missing on the original config file --- roles/mail/templates/smtpd.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 roles/mail/templates/smtpd.conf diff --git a/roles/mail/templates/smtpd.conf b/roles/mail/templates/smtpd.conf new file mode 100644 index 0000000..33c1f23 --- /dev/null +++ b/roles/mail/templates/smtpd.conf @@ -0,0 +1,2 @@ +pwcheck_method: saslauthd +mech_list: PLAIN LOGIN From f2427dccff50e55a0c767e729b500f4749dbe894 Mon Sep 17 00:00:00 2001 From: theonlydoo Date: Tue, 11 Nov 2014 12:47:45 +0100 Subject: [PATCH 3/4] typo in owncloud template config --- roles/owncloud/templates/etc-nginx-sites-enabled-owncloud.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/owncloud/templates/etc-nginx-sites-enabled-owncloud.j2 b/roles/owncloud/templates/etc-nginx-sites-enabled-owncloud.j2 index afabc5b..0140d92 100644 --- a/roles/owncloud/templates/etc-nginx-sites-enabled-owncloud.j2 +++ b/roles/owncloud/templates/etc-nginx-sites-enabled-owncloud.j2 @@ -6,7 +6,7 @@ server { server { listen 443 ssl; - server_name owncloud.{{ instance_name }}; + server_name owncloud.{{ domain }}; keepalive_timeout 70; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers AES128-SHA:AES256-SHA:RC4-SHA:DES-CBC3-SHA:RC4-MD5; From 8bfd5e1494e7696d491552bf31a279cfe16a11e0 Mon Sep 17 00:00:00 2001 From: theonlydoo Date: Tue, 11 Nov 2014 13:17:54 +0100 Subject: [PATCH 4/4] managesieve typo, here's what happens when you don't unit test your files ... --- roles/mail/templates/dovecot.conf | 6 +++--- roles/mail/templates/root-postfix.sql | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/mail/templates/dovecot.conf b/roles/mail/templates/dovecot.conf index c64a9ff..9892248 100644 --- a/roles/mail/templates/dovecot.conf +++ b/roles/mail/templates/dovecot.conf @@ -26,9 +26,6 @@ service auth { } } service managesieve-login { - executable = /usr/lib/dovecot/managesieve-login -} -service managesieve { inet_listener sieve { port = 4190 } @@ -37,6 +34,9 @@ service managesieve { vsz_limit = 64 M executable = /usr/lib/dovecot/managesieve-login } +service managesieve { + executable = /usr/lib/dovecot/managesieve +} userdb { args = /etc/dovecot/dovecot-mysql.conf driver = sql diff --git a/roles/mail/templates/root-postfix.sql b/roles/mail/templates/root-postfix.sql index ff4bafa..24642a4 100644 --- a/roles/mail/templates/root-postfix.sql +++ b/roles/mail/templates/root-postfix.sql @@ -1,5 +1,4 @@ DROP DATABASE IF EXISTS postfix; -DROP USER 'postfix'@'%'; CREATE DATABASE postfix; GRANT ALL PRIVILEGES ON postfix.* TO 'postfix'@'%' IDENTIFIED BY '{{ dbpassword.stdout }}'; GRANT SELECT ON postfix.* TO 'postfix'@'%' IDENTIFIED BY '{{ dbpassword.stdout }}';