Working out reading email for dovecot

diff --git a/Makefile b/Makefile
index 88fbbbba222c8efdd693afa5e954eb7c16934665..26f503e684ff07f6b79260b1fa2b5389278ac4d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,20 +195,24 @@ install   :
           @ # Creating all needed system directory
           @ install -d $(DESTDIR)/$(DATADIR)/$(APPN)/
           @ install -d $(DESTDIR)/$(ETCDIR)/$(APPN)/
+          @ install -d $(DESTDIR)/$(ETCDIR)/$(APPN)/dovecot
           @ install -d $(DESTDIR)/$(ETCDIR)/pki/$(APPN)/
           @ install -d $(DESTDIR)/$(ETCDIR)/sysconfig/
           @ install -d $(DESTDIR)/$(LIBDIR)/$(APPN)/
           @ install -d $(DESTDIR)/$(SBINDIR)/
-          @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/queue
           @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/in-logs
+          @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/mails
+          @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/queue
           @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/out-logs
           @ cp -a                                      \
                bin/*                                   \
                $(DESTDIR)/$(SBINDIR)/
           @ cp -a                                      \
                conf/$(APPN).conf                       \
-               conf/passfile                           \
                $(DESTDIR)/$(ETCDIR)/$(APPN)
+          @ cp -a                                      \
+               conf/dovecot                            \
+               $(DESTDIR)/$(ETCDIR)/$(APPN)/
           @ cp -a                                      \
                certs/root-safe_CA.pem                  \
                $(DESTDIR)/$(ETCDIR)/pki/$(APPN)

diff --git a/Makefile.dist b/Makefile.dist
index a0810144472ace655ad1f59d9791793356ddcd90..54b92af4ed3b17280418872fb3d45ef92654a353 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -47,7 +47,7 @@ tarfile       : clean
                $(APLV)/certs/
          @ cp -a                                               \
                conf/*.conf                                     \
-               conf/passfile                                   \
+               conf/dovecot                                    \
                $(APLV)/conf/
          @ cp -a lib/{*.c,*.h} $(APLV)/lib/
          @ cp -a linux/*       $(APLV)/linux/

diff --git a/conf/passfile b/conf/dovecot/passfile
similarity index 100%
rename from conf/passfile
rename to conf/dovecot/passfile

diff --git a/mailleur.spec.in b/mailleur.spec.in
index ba1f4ebcf42cc9b8bc42226249cfab9f2293f311..d6adb2373943b1e65c992b3ac11cad3d6729d96f 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -31,12 +31,12 @@ search about email exchange within time and transaction context.
 #-----------------------------------------------------------------------------
 %files                 
 %defattr(-,root,root,-)
-%attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%attr(0640,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/passfile
 %attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/receiver
 %attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/sorter
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/pki/%{name}/*
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%{_sysconfdir}/%{name}/dovecot/passfile
 %{_sbindir}/chkspf
 %{_sbindir}/feeder
 %attr(0755,%{name},mail) %{_sbindir}/receiver
@@ -47,7 +47,7 @@ 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(0755,%{name},mail) %dir %{spooldir}/%{name}/{queue,in-logs,out-logs}
+%attr(0755,%{name},mail) %dir %{spooldir}/%{name}/{in-logs,mails,queue,out-logs}
 #-----------------------------------------------------------------------------
 
 %preun