From e962cffd74e97f25eebc8fb04b8efb7526f121df Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Sun, 8 Oct 2017 10:41:59 +0200
Subject: [PATCH] set password algorithm

---
 Dockerfile                                              | 3 ++-
 rootfs/etc/confd/templates/password-config.inc.php.tmpl | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 882d349..438b908 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,8 @@ RUN apk add --no-cache \
     php7-zip \
     php7-ldap \
     php7-pspell \
-    php7-apcu
+    php7-apcu \
+    dovecot
 
 RUN mkdir /var/lib/roundcube
 RUN wget -qO- https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz | tar xz -C /var/lib/roundcube --strip 1
diff --git a/rootfs/etc/confd/templates/password-config.inc.php.tmpl b/rootfs/etc/confd/templates/password-config.inc.php.tmpl
index 04b8595..eec613d 100644
--- a/rootfs/etc/confd/templates/password-config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/password-config.inc.php.tmpl
@@ -6,8 +6,10 @@ $config['password_require_nonalpha'] = false;
 $config['password_hosts'] = null;
 $config['password_force_save'] = true;
 
-$config['password_algorithm'] = 'sha512-crypt';
-$config['password_algorithm_prefix'] = '{CRYPT}';
+$config['password_algorithm'] = 'dovecot';
+$config['password_dovecotpw'] = '/usr/bin/doveadm pw';
+$config['password_algorithm_prefix'] = '{PBKDF2}';
+$config['password_dovecotpw_method'] = 'PBKDF2';
 
 $config['password_ldap_host'] = '{{getenv "LDAP_HOST"}}';
 $config['password_ldap_port'] = '{{getenv "LDAP_CONNECTION_PORT" "389"}}';
@@ -17,6 +19,6 @@ $config['password_ldap_basedn'] = '{{getenv "LDAP_BASE_DN"}}';
 $config['password_ldap_method'] = 'user';
 $config['password_ldap_userDN_mask'] = '{{getenv "LDAP_USER_DN_MASK"}}';
 
-$config['password_ldap_encodage'] = 'crypt';
+$config['password_ldap_encodage'] = 'default';
 $config['password_ldap_pwattr'] = '{{getenv "LDAP_PASSWORD_ATTRIBUTE" "userPassword"}}';
 $config['password_ldap_force_replace'] = true;