- back to /home/services

- remove Mail/Maildir from skel
- webmail starting, restarting (post, preun)

Changed files:
    courier.spec -> 1.52

diff --git a/courier.spec b/courier.spec
index 726275dbfbd2b7e404efa574b1809dd778a201f8..5f028e15b81ff4bcbb0dda19d273dd653114feb3 100644 (file)
--- a/courier.spec
+++ b/courier.spec
@@ -39,7 +39,7 @@ Requires(post):       openssl-tools >= 0.9.7c
 Provides:      smtpdaemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                apachedir       /srv/httpd
+%define                apachedir       /home/services/httpd
 %define                _prefix         /usr/lib/courier
 %define                _mandir         /usr/share/man
 %define                _localstatedir  /var/spool/courier
@@ -452,9 +452,6 @@ install -d $RPM_BUILD_ROOT/usr/lib
 ln -sf %{_bindir}/sendmail $RPM_BUILD_ROOT/usr/sbin/sendmail
 ln -sf %{_bindir}/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail
 
-# default maildir folder in /etc/skel
-install -d $RPM_BUILD_ROOT/etc/skel/Mail/Maildir/{new,cur,tmp}
-
 # This link by default is missing
 ln -sf %{_datadir}/esmtpd-ssl $RPM_BUILD_ROOT%{_sbindir}/esmtpd-ssl
 
@@ -526,6 +523,16 @@ if [ "$1" = "0" ]; then
        %{_sbindir}/pop3d stop
 fi
 
+%post webmail
+if ps -A |grep -q authdaemond; then
+    %{_prefix}/lib/courier/sqwebmaild start
+fi
+
+%preun webmail
+if ps -A |grep -q sqwebmaild; then
+    %{_prefix}/lib/courier/sqwebmaild stop
+fi
+
 %post smtpauth
 %{_sbindir}/esmtpd stop
 %{_sbindir}/esmtpd start
@@ -803,13 +810,6 @@ fi
 /usr/lib/sendmail
 /usr/sbin/sendmail
 
-# default folder - Maildir/                                                     
-%attr(700,root,root) %dir /etc/skel/Mail
-%attr(700,root,root) %dir /etc/skel/Mail/Maildir
-%attr(700,root,root) %dir /etc/skel/Mail/Maildir/cur
-%attr(700,root,root) %dir /etc/skel/Mail/Maildir/new
-%attr(700,root,root) %dir /etc/skel/Mail/Maildir/tmp
-
 %files pop3d
 %defattr(644,root,root,755)
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/pop3