spec file ready for dovecot SQL config

diff --git a/conf/dovecot/dovecot-2.0-auth-ldap.conf b/conf/dovecot/dovecot-2.0-auth-ldap.conf
index ba70a42b08d72d097e48d2dfc1d29e76bb7fedfc..c63a1ff949ad29f1ebcce80e08e05712be2c4cd0 100644 (file)
--- a/conf/dovecot/dovecot-2.0-auth-ldap.conf
+++ b/conf/dovecot/dovecot-2.0-auth-ldap.conf
@@ -2,10 +2,10 @@
 
 passdb {
   driver = ldap
-  args = /etc/clement/dovecot-ldap.conf
+  args = /etc/mailleur/dovecot/dovecot-ldap.conf
 }
 
 userdb {
   driver = ldap
-  args = /etc/clement/dovecot-ldap.conf
+  args = /etc/mailleur/dovecot/dovecot-ldap.conf
 }

diff --git a/conf/dovecot/dovecot-2.0.conf.res b/conf/dovecot/dovecot-2.0.conf.res
deleted file mode 100644 (file)
index 7fff29b..0000000
--- a/conf/dovecot/dovecot-2.0.conf.res
+++ /dev/null
@@ -1,93 +0,0 @@
-#done by JMP Jul 25 2011 for dovecot 2.0
-#----------------------------------
-ssl_cert = /etc/pki/clement-2.5/clement.pem
-ssl_keye = /etc/pki/clement-2.5/clement.pem
-
-protocols = imap pop3
-
-#to delay scanner site
-auth_failure_delay = 4
-
-service imap-login {
-  process_min_avail = 3
-  service_count = 1
-}
-
-service imap {
-   executable = /usr/libexec/dovecot/imap
-  #mail_executable = /usr/bin/pibsmtp /usr/libexec/dovecot/imap
-}
-
-service pop3-login {
-  process_min_avail = 3
-  service_count = 1
-}
-
-service pop3 {
-   executable = /usr/libexec/dovecot/pop3
-  #executable = /usr/bin/pibsmtp /usr/libexec/dovecot/pop3
-}
-mbox_write_locks = fcntl
-
-##
-## IMAP specific settings
-##
-
-protocol imap {
-       imap_client_workarounds =
-       }
-  
-##
-## POP3 specific settings
-##
-
-protocol pop3 {
-       pop3_uidl_format = %08Xu%08Xv
-       pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
-       #mail_executable = /usr/bin/pibsmtp /usr/libexec/dovecot/pop3
-       mail_executable = /usr/libexec/dovecot/pop3
-       }
-
-auth default {
-       mechanisms = plain
-       user = clement
-
-       passdb sql {
-               args=/etc/clement-2.5/dovecot-sql.conf
-               }
-
-       userdb static {
-               args = uid=clement gid=mail home=/var/spool/clement-2.5/mails/%d/%n mail=maildir:~/dovecot
-               }
-
-       socket listen {
-               master {
-                       path = /var/run/dovecot/auth-master
-                       mode = 0600
-                       user = clement
-                       }
-               }
-       }
-
-protocol lda {
-       postmaster_address =  postmaster
-       mail_plugins = sieve
-       }
-
-protocol sieve {
-       mail_debug=yes
-       }
-
-plugin {
-       sieve = ~/.dovecot.sieve
-       sieve_dir=~/sieve
-       }
-
-mail_debug = no
-auth_debug = no
-auth_verbose = no
-auth_debug_passwords = no
-
-mbox_write_locks = fcntl
-
-log_path = /var/log/clem-dovecot.log

diff --git a/mailleur.spec.in b/mailleur.spec.in
index b01b3e5ae0280f5f24cf5d6cb4d4790b275b8156..82010a332008a5cba7d1a224720edfb0dd19a10b 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -40,6 +40,7 @@ search about email exchange within time and transaction context.
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %attr(0644,root,root) %config(noreplace) %{dovedir}/dovecot.conf
+%{dovedir}/dovecot-2.0*
 %attr(0640,%{name},dovecot) %config(noreplace) %{dovedir}/passfile
 %{_sbindir}/chkspf
 %{_sbindir}/feeder
@@ -49,8 +50,9 @@ search about email exchange within time and transaction context.
 %attr(0754,root,root) %{_libdir}/%{name}/support/crdb.sh
 %attr(0754,root,root) %{_libdir}/%{name}/support/dummy-cert.sh
 %attr(0754,root,root) %{_libdir}/%{name}/support/starting.sh
-%attr(0750,%{name},mail) %{_libdir}/%{name}/support/resetdb.sh
-%attr(0755,%{name},mail) %dir %{spooldir}/%{name}/{in-logs,mails,queue,out-logs}
+%attr(0750,%{name},mail) %{_libdir}/%{name}/support/mailleur-reset-db.sh
+%attr(0755,%{name},mail) %dir %{spooldir}/%{name}/{in-logs,queue,out-logs}
+%attr(0750,%{name},mail) %dir %{spooldir}/%{name}/mails
 %attr(0640,root,root) %{_datadir}/%{name}/sql/Makefile
 %attr(0644,root,root) %{_datadir}/%{name}/sql/datatest.def
 %attr(0644,root,root) %{_datadir}/%{name}/sql/*.sql