diff --git a/group_vars/horde.yml b/group_vars/horde.yml index 3b624d16..f6b1d708 100644 --- a/group_vars/horde.yml +++ b/group_vars/horde.yml @@ -2,16 +2,9 @@ glob_horde: secret: '{{ vault.horde.secret }}' imap: imap.adm.crans.org - smtp: smtp.adm.crans.org maildomain: crans.org db: pgsql.adm.crans.org - admins: - - "'paulon'" - - "'vulcain'" - - "'graillot'" - - "'bombar'" - - "'pa'" - - "'erdnaxe'" + admins: "{{ vault.horde.admins }}" redirection: https://wiki.crans.org/VieCrans/PagesDeDeconnexion/ERR_CHOOSE_WEBMAIL src_hostname: horde.crans.org dest_hostname: webmail.crans.org @@ -21,3 +14,5 @@ glob_horde: zone_ipv6: fd00:0:0:10::/64 ipv4: "{{ query('ldap', 'ip4', ansible_hostname, 'adm') }}" ipv6: "{{ query('ldap', 'ip6', ansible_hostname, 'adm') }}" + mailer: + host: redisdead.adm.crans.org diff --git a/roles/horde/templates/horde/horde/conf.php.j2 b/roles/horde/templates/horde/horde/conf.php.j2 index 1c6c5018..70c01f61 100644 --- a/roles/horde/templates/horde/horde/conf.php.j2 +++ b/roles/horde/templates/horde/horde/conf.php.j2 @@ -88,9 +88,12 @@ $conf['history']['params']['driverconfig'] = 'horde'; $conf['history']['driver'] = 'Sql'; $conf['davstorage']['params']['driverconfig'] = 'horde'; $conf['davstorage']['driver'] = 'Sql'; -$conf['mailer']['params']['sendmail_path'] = '/usr/lib/sendmail'; -$conf['mailer']['params']['sendmail_args'] = '-oi'; -$conf['mailer']['type'] = 'sendmail'; +$conf['mailer']['type'] = 'smtp'; +$conf['mailer']['params']['host'] = '{{ horde.mailer.host }}'; +$conf['mailer']['params']['port'] = 587; +$conf['mailer']['params']['auth'] = true; +$conf['mailer']['params']['username_auth'] = true; +$conf['mailer']['params']['password_auth'] = true; $conf['vfs']['params']['driverconfig'] = 'horde'; $conf['vfs']['type'] = 'Sql'; $conf['sessionhandler']['type'] = 'Builtin'; diff --git a/roles/horde/templates/horde/imp/backends.php.j2 b/roles/horde/templates/horde/imp/backends.php.j2 index cac5f915..c61d2ab3 100644 --- a/roles/horde/templates/horde/imp/backends.php.j2 +++ b/roles/horde/templates/horde/imp/backends.php.j2 @@ -1,6 +1,6 @@ {{ ansible_header | comment(decoration='// ') }} false, 'name' => 'IMAP Cr@ns', @@ -11,8 +11,10 @@ $servers['imp'] = array( 'secure' => 'tls', 'maildomain' => '{{ horde.maildomain }}', 'smtp' => array( - 'host' => '{{ horde.smtp }}', - 'port' => 25, + 'auth' => true, + 'horde_auth' => true, + 'host' => '{{ horde.mailer.host }}', + 'port' => 587, ), 'cache' => false, );