From 1adcf7268053ff87d61a47e53fc83fb91595e811 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Thu, 8 Jul 2021 20:09:08 +0200
Subject: [PATCH] wip

---
 bundles/bind/files/db                           | 2 +-
 bundles/dovecot/files/dovecot-sql.conf          | 2 +-
 bundles/roundcube/files/password.config.inc.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/bind/files/db b/bundles/bind/files/db
index 9f00adf..a3c4ecd 100644
--- a/bundles/bind/files/db
+++ b/bundles/bind/files/db
@@ -4,7 +4,7 @@ def column_width(column, table):
 %>\
 $TTL 600
 @   IN  SOA        ns.sublimity.de. admin.sublimity.de. (
-        ${serial} ;Serial
+        2021070820 ;Serial
         600        ;Refresh
         300        ;Retry
         1209600    ;Expire
diff --git a/bundles/dovecot/files/dovecot-sql.conf b/bundles/dovecot/files/dovecot-sql.conf
index 12f6707..62671c6 100644
--- a/bundles/dovecot/files/dovecot-sql.conf
+++ b/bundles/dovecot/files/dovecot-sql.conf
@@ -1,6 +1,6 @@
 connect = host=${host} dbname=${name} user=${user} password=${password}
 driver = pgsql
-default_pass_scheme = PLAIN-MD5
+default_pass_scheme = SHA512-CRYPT
 
 password_query = SELECT CONCAT(users.name, '@', domains.name) AS user, password\
   FROM users \
diff --git a/bundles/roundcube/files/password.config.inc.php b/bundles/roundcube/files/password.config.inc.php
index 4452b87..f4647b5 100644
--- a/bundles/roundcube/files/password.config.inc.php
+++ b/bundles/roundcube/files/password.config.inc.php
@@ -46,11 +46,11 @@ $config['password_force_new_user'] = false;
 // Possible options: des-crypt, ext-des-crypt, md5-crypt, blowfish-crypt,
 // sha256-crypt, sha512-crypt, md5, sha, smd5, ssha, ssha512, samba, ad, dovecot, clear.
 // For details see password::hash_password() method.
-$config['password_algorithm'] = 'md5';
+$config['password_algorithm'] = 'sha512-crypt';
 
 // Password prefix (e.g. {CRYPT}, {SHA}) for passwords generated
 // using password_algorithm above. Default: empty.
-$config['password_algorithm_prefix'] = '';
+$config['password_algorithm_prefix'] = '{SHA512-CRYPT}';
 
 // Path for dovecotpw/doveadm-pw (if not in the $PATH).
 // Used for password_algorithm = 'dovecot'.
@@ -135,7 +135,7 @@ $config['password_db_dsn'] = 'pgsql://mailserver:${mailserver_db_password}@local
 //      %q is replaced with the hashed password before the change
 // Escaping of macros is handled by this module.
 // Default: "SELECT update_passwd(%c, %u)"
-$config['password_query'] = "UPDATE users SET password=MD5(%p) FROM domains WHERE domains.id = domain_id AND domains.name = %d AND users.name = %l";
+$config['password_query'] = "UPDATE users SET password=%P FROM domains WHERE domains.id = domain_id AND domains.name = %d AND users.name = %l";
 
 // By default the crypt() function which is used to create the %c
 // parameter uses the md5 algorithm (deprecated, use %P).