From 26028c9652b1e161125af07c085b0d155a714602 Mon Sep 17 00:00:00 2001
From: Tube <7u83@mail.ru>
Date: Sat, 4 Nov 2023 22:08:02 +0100
Subject: [PATCH] Addptions for freebsd

---
 dovecot.cf | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/dovecot.cf b/dovecot.cf
index 3727f1b..2bd0806 100644
--- a/dovecot.cf
+++ b/dovecot.cf
@@ -9,14 +9,23 @@ classes:
 	"rspamd_scripts" expression => strcmp("$(cfg[rspamd_scripts])","true");
 
 vars:
+	"imap_key" string => "$(cfg_dir)/private/imap.key";
+	"imap_cert" string => "$(cfg_dir)/private/imap.crt";
+	"submission_key" string => "$(cfg_dir)/private/submission.key";
+	"submission_cert" string => "$(cfg_dir)/private/submission.crt";
+
+
+
 	freebsd::
 		"service_name" string => "dovecot";
 		"cfg_dir" string => "/usr/local/etc/dovecot";
 		"dovecot_conf" string => "$(cfg_dir)/dovecot.conf";
 
 		"pkgs" slist => {
-			"dovecot"
+			"dovecot",
+			"dovecot-pigeonhole"
 		};
+		"sievec_exe" string => "/usr/local/bin/sievec";
 	debian::
 		"cfg_dir" string => "/etc/dovecot";
 		"dovecot_conf" string => "$(cfg_dir)/dovecot.conf";
@@ -103,25 +112,25 @@ files:
 		"$(imap_cert)" 
 		handle => "dovecot_imap_cert_installed",
 		classes => if_repaired(dovecot_repaired),
-		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[imap_cert])","noshell" )),
+		copy_from => local_dcp( execresult(  "/usr/bin/readlink -fn $(cfg[imap_cert])","noshell" )),
 		perms => m("600");
 
 		"$(imap_key)" 
 		handle => "dovecot_imap_key_installed",
 		classes => if_repaired(dovecot_repaired),
-		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[imap_key])","noshell" )),
+		copy_from => local_dcp( execresult(  "/usr/bin/readlink -fn $(cfg[imap_key])","noshell" )),
 		perms => m("600");
 
 		"$(submission_cert)" 
 		handle => "dovecot_submission_cert_installed",
 		classes => if_repaired(dovecot_repaired),
-		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[submission_cert])","noshell" )),
+		copy_from => local_dcp( execresult(  "/usr/bin/readlink -fn $(cfg[submission_cert])","noshell" )),
 		perms => m("600");
 
 		"$(submission_key)" 
 		handle => "dovecot_submission_key_installed",
 		classes => if_repaired(dovecot_repaired),
-		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[submission_key])","noshell" )),
+		copy_from => local_dcp( execresult(  "/usr/bin/readlink -fn $(cfg[submission_key])","noshell" )),
 		perms => m("600");