From 5d383badcc4aaadffc831188b0db26dabceae0f7 Mon Sep 17 00:00:00 2001
From: Tube <7u83@mail.ru>
Date: Fri, 3 Nov 2023 20:11:18 +0100
Subject: [PATCH] Moved iSQL auth before pam

---
 mailserver.cf | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mailserver.cf b/mailserver.cf
index 1515224..3cc242c 100644
--- a/mailserver.cf
+++ b/mailserver.cf
@@ -37,32 +37,32 @@ vars:
 
 	"dbs" string => string_mustache('
 		"userdbs":[
-			{{#cfg.pam_auth}}
-			{
-				"driver":"passwd",
-				"args":""
-			},
-			{{/cfg.pam_auth}}
 			{{#fg.vimb_auth}}
 			{
 				"driver":"sql",
 				"args":"$(dovecot_vimbadmin_sql.cfg_file)"
 			},
 			{{/cfg.vimb_auth}}
-		],
-		"passdbs":[
 			{{#cfg.pam_auth}}
 			{
-				"driver":"pam",
-				"args":"dovecot"
-			}, 
+				"driver":"passwd",
+				"args":""
+			},
 			{{/cfg.pam_auth}}
+		],
+		"passdbs":[
 			{{#cfg.vimb_auth}}
 			{
 				"driver":"sql",
 				"args":"$(dovecot_vimbadmin_sql.cfg_file)"
 			} ,
 			{{/cfg.vimb_auth}}
+			{{#cfg.pam_auth}}
+			{
+				"driver":"pam",
+				"args":"dovecot"
+			}, 
+			{{/cfg.pam_auth}}
 		],',
 	bundlestate("$(this.bundle)"));
 	
@@ -185,6 +185,6 @@ methods:
 	"any" usebundle => dovecot(@(dovecot_cfg));
 	"any" usebundle => postfix(@(postfix_cfg));
 reports:
-	"DCP: $(dovecot_protos)";
-	"DBS: $(dbs)";
+#	"DCP: $(dovecot_protos)";
+#	"DBS: $(dbs)";
 }