From 22348deef415f45909c0832dba5932f9a561dd62 Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Thu, 10 Oct 2019 19:44:21 +0100 Subject: [PATCH 1/1] ud-generate: generate mail-default-options globally It's most likely to be useful on the mail relays, where most users won't have local accounts Signed-off-by: Adam D. Barratt --- ud-generate | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ud-generate b/ud-generate index c1fe54e..97d003e 100755 --- a/ud-generate +++ b/ud-generate @@ -1210,6 +1210,8 @@ def generate_all(global_dir, ldap_conn): GenDBM(accounts, global_dir + "mail-forward.db", 'emailForward') GenCDB(accounts, global_dir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction') GenDBM(accounts, global_dir + "mail-contentinspectionaction.db", 'mailContentInspectionAction') + GenCDB(accounts, global_dir + "default-mail-options.cdb", 'mailDefaultOptions') + GenDBM(accounts, global_dir + "default-mail-options.db", 'mailDefaultOptions') GenPrivate(accounts, global_dir + "debian-private") GenSSHKnown(host_attrs, global_dir+"authorized_keys", 'authorized_keys', global_dir+'ud-generate.lock') GenMailBool(accounts, global_dir + "mail-greylist", "mailGreylisting") @@ -1302,12 +1304,12 @@ def generate_host(host, global_dir, all_accounts, all_hosts, ssh_userkeys): DoLink(global_dir, OutDir, "mail-rhsbl") DoLink(global_dir, OutDir, "mail-whitelist") DoLink(global_dir, OutDir, "all-accounts.json") + DoLink(global_dir, Outdir, "default-mail-options.cdb") + DoLink(global_dir, Outdir, "default-mail-options.db") GenCDB(accounts, OutDir + "user-forward.cdb", 'emailForward') GenDBM(accounts, OutDir + "user-forward.db", 'emailForward') GenCDB(accounts, OutDir + "batv-tokens.cdb", 'bATVToken') GenDBM(accounts, OutDir + "batv-tokens.db", 'bATVToken') - GenCDB(accounts, OutDir + "default-mail-options.cdb", 'mailDefaultOptions') - GenDBM(accounts, OutDir + "default-mail-options.db", 'mailDefaultOptions') # Compatibility. DoLink(global_dir, OutDir, "forward-alias") -- 2.20.1