浏览代码

dovecot: change dict declarations for before scripts

DerLinkman 3 周之前
父节点
当前提交
73f0c61a0e
共有 1 个文件被更改,包括 10 次插入8 次删除
  1. 10 8
      data/Dockerfiles/dovecot/docker-entrypoint.sh

+ 10 - 8
data/Dockerfiles/dovecot/docker-entrypoint.sh

@@ -82,7 +82,10 @@ dict_map priv/sieve/name/\$script_name {
   sql_table = sieve_before
   sql_table = sieve_before
   username_field = username
   username_field = username
   value_field id {
   value_field id {
+    type = uuid
   }
   }
+
+  # The script name field in the table to query
   key_field script_name {
   key_field script_name {
     value = \$script_name
     value = \$script_name
   }
   }
@@ -91,14 +94,12 @@ dict_map priv/sieve/name/\$script_name {
 dict_map priv/sieve/data/\$id {
 dict_map priv/sieve/data/\$id {
   sql_table = sieve_before
   sql_table = sieve_before
   username_field = username
   username_field = username
-  key_field script_data {
-    value = \$script_data
+  value_field script_data {
   }
   }
-  value_field id {
+  key_field id {
+    value = \$id
   }
   }
 }
 }
-
-
 EOF
 EOF
 
 
 cat <<EOF > /etc/dovecot/sql/dovecot-dict-sql-sieve_after.conf
 cat <<EOF > /etc/dovecot/sql/dovecot-dict-sql-sieve_after.conf
@@ -108,6 +109,7 @@ dict_map priv/sieve/name/\$script_name {
   sql_table = sieve_after
   sql_table = sieve_after
   username_field = username
   username_field = username
   value_field id {
   value_field id {
+    type = uuid
   }
   }
   key_field script_name {
   key_field script_name {
     value = \$script_name
     value = \$script_name
@@ -117,10 +119,10 @@ dict_map priv/sieve/name/\$script_name {
 dict_map priv/sieve/data/\$id {
 dict_map priv/sieve/data/\$id {
   sql_table = sieve_after
   sql_table = sieve_after
   username_field = username
   username_field = username
-  key_field script_name {
-    value = \$script_data
+  value_field script_data {
   }
   }
-  value_field id {
+  key_field id {
+    value = \$id
   }
   }
 }
 }
 EOF
 EOF