From cb6ab68906404c4f9c6a19108de1850009447857 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Sat, 22 Jan 2022 20:26:16 +0100
Subject: [PATCH] correct username format

---
 README.md                                    | 21 --------------------
 rootfs/etc/confd/templates/10-auth.conf.tmpl |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/README.md b/README.md
index dcda64f..4f4855e 100644
--- a/README.md
+++ b/README.md
@@ -3,27 +3,6 @@
 Uses [SSMTP](https://packages.debian.org/stable/mail/ssmtp) to send mails (for example if you have a redirect sieve rule).
 
 
-```
-create table if not exists virtual_domains (
-	id serial primary key, 
-	name text not null
-);
-
-create table if not exists virtual_users (
-	id serial primary key, 
-	domain_id integer not null references virtual_domains(id),
-	email text not null
-);
-
-
-create table if not exists virtual_aliases (
-	id serial primary key, 
-	domain_id integer not null references virtual_domains(id),
-	source text not null,
-	destination text not null
-);
-```
-
 # Volumes
 - `/var/lib/vmail/mail`
 
diff --git a/rootfs/etc/confd/templates/10-auth.conf.tmpl b/rootfs/etc/confd/templates/10-auth.conf.tmpl
index 8559320..da3ef39 100644
--- a/rootfs/etc/confd/templates/10-auth.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-auth.conf.tmpl
@@ -1,4 +1,4 @@
 auth_username_chars = {{getenv "ALLOWED_USERNAME_CHARS" "äöüabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@"}}
-auth_username_format = %n
+auth_username_format ="%Ld_%Ln"
 auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain login oauthbearer xoauth2"}}
 !include auth-oauth2.conf.ext