Merge branch 'master' of https://github.com/theonlydoo/configz

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

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

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 }}';

roles/mail/templates/smtpd.conf

@@ -0,0 +1,2 @@
+pwcheck_method: saslauthd
+mech_list: PLAIN LOGIN

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;