From fbfdfd783d4c908f2bf4d4a4765bd24148c8c0fd Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 26 Apr 2012 09:28:14 +0200
Subject: [PATCH] move acl dict file to /etc/dovecot

---
 createlinks                                                     | 2 +-
 root/etc/e-smith/templates/etc/dovecot/dovecot.conf/65pluginAcl | 2 +-
 smeserver-dovecot.spec                                          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/createlinks b/createlinks
index 9f344c6..af01611 100644
--- a/createlinks
+++ b/createlinks
@@ -23,4 +23,4 @@ event_link("adjust-dovecot", "bootstrap-console-save", "02");
 event_link("dovecot-acl", "email-update", "85");
 event_link("dovecot-acl", "user-create", "85");
 
-safe_touch("root/var/lib/dovecot/sharedmailbox/dict.db");
+safe_touch("root/etc/dovecot/sharedmailbox/dict.db");
diff --git a/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/65pluginAcl b/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/65pluginAcl
index 7f86fea..d9eff1e 100644
--- a/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/65pluginAcl
+++ b/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/65pluginAcl
@@ -50,7 +50,7 @@ namespace {
 }
 
 plugin {
-  acl_shared_dict = file:/var/lib/dovecot/sharedmailbox/dict.db
+  acl_shared_dict = file:/etc/dovecot/sharedmailbox/dict.db
 }
 
 plugin {
diff --git a/smeserver-dovecot.spec b/smeserver-dovecot.spec
index ab6d00e..7fb4f2c 100644
--- a/smeserver-dovecot.spec
+++ b/smeserver-dovecot.spec
@@ -1,5 +1,5 @@
 %define version 0.1
-%define release 0.beta28
+%define release 0.beta30
 %define name smeserver-dovecot
 
 
@@ -49,8 +49,8 @@ perl createlinks
    --file /var/service/dovecot/log/run 'attr(0755,root,root)' \
    --file /var/service/dovecot/control/1 'attr(0755,root,root)' \
    --dir /var/log/dovecot 'attr(0750,smelog,smelog)' \
-   --dir /var/lib/dovecot/sharedmailbox 'attr(2770,root,sharedmailbox)' \
-   --file /var/lib/dovecot/sharedmailbox/dict.db 'attr(0660,root,sharedmailbox) %config(noreplace)' \
+   --dir /etc/dovecot/sharedmailbox/ 'attr(2770,root,sharedmailbox)' \
+   --file /etc/dovecot/sharedmailbox/dict.db 'attr(0660,root,sharedmailbox) %config(noreplace)' \
    --file /usr/bin/imap-postlogin 'attr(0755,root,root)' \
   > %{name}-%{version}-filelist