Improving mailleur httpd configuration file

diff --git a/Makefile b/Makefile
index 816dd792dc95033fc0c8ce13b1f48266f870ddfc..3e57cc11dbcf3589e766fa4ba0bdbb2ddb42f0d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -223,6 +223,7 @@ install     :
           @ install -d $(DESTDIR)/$(EXECDIR)/$(APPN)/
           @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/mails
           @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/queue
+          @ install -d $(DESTDIR)/var/www/$(APPN)/
           @ cp -a                                      \
                bin-*/                                  \
                $(DESTDIR)/$(EXECDIR)/$(APPN)

diff --git a/mailleur.spec.in b/mailleur.spec.in
index 42ece7efdedb2d766f9298938ddeeecd6cdfd5c4..1a04e5cabd8d154aed5f08105dc9fe65e926e649 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -1,6 +1,7 @@
 #-----------------------------------------------------------------------------
 %{?!dist:       %define dist    @@DIST@@}
 %define         spooldir        %{_localstatedir}/spool/
+%define         wwwdir         %{_localstatedir}/www/
 %define                dovedir         %{_sysconfdir}/%{name}/dovecot
 #-----------------------------------------------------------------------------
 Name           :       @@APPN@@
@@ -67,9 +68,10 @@ search about email exchange within time and transaction context.
 %attr(0754,root,root) %config(noreplace) %{_libdir}/%{name}/support/do_dns_tlsa.sh
 %attr(0750,%{name},mail) %{_libdir}/%{name}/support/mailleur-reset-db.sh
 %attr(0750,%{name},mail) %{_libdir}/%{name}/support/mailleur-settest-db.sh
-%attr(0755,%{name},mail) %dir %{spooldir}/%{name}
+%attr(0755,%{name},mail) %dir %{spooldir}/%{name}/
 %attr(0755,%{name},mail) %dir %{spooldir}/%{name}/queue
 %attr(0750,%{name},mail) %dir %{spooldir}/%{name}/mails
+%attr(0750,%{name},apache) %dir %{wwwdir}/%{name}/
 %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

diff --git a/support/do_httpd.sh b/support/do_httpd.sh
index 5660f28d2d5ab170e889c9e95d62a3ed31cb4ae9..bccec60b0dc775a563fe52d84589706bda0f34b7 100755 (executable)
--- a/support/do_httpd.sh
+++ b/support/do_httpd.sh
@@ -44,13 +44,17 @@ cat >> /etc/httpd/conf.d/$APPNAME.conf <<!EOT
         RewriteCond            %{HTTP_HOST} ^$APPNAME\.$reldom         [OR]
        RewriteCond             %{HTTP_HOST} ^`hostname -s`\.$reldom
         RewriteRule            ^(.*)$ https://`hostname -s`.$domain    [R=301]
-        ErrorLog               logs/clemerr.log
-        TransferLog            logs/clemlog.log
+        ErrorLog               logs/mailerr.log
+        TransferLog            logs/maillog.log
 </VirtualHost>
 
 #-----------------------------------------------------------------
 #Listening on TLS port
 Listen  443
+
+SSLSessionCache        "shmcb:logs/ssl_scache(512000)"
+SSLSessionCacheTimeout  300
+
 #-----------------------------------------------------------------
 <VirtualHost *:443>
         ServerName             `hostname`
@@ -77,8 +81,8 @@ Listen  443
        SSLCompression          OFF
         SSLHonorCipherOrder    ON
        #----------------------------------------------
-        ErrorLog logs/clemerr-ssl.log
-        TransferLog logs/clemlog-ssl.log
+        ErrorLog logs/mailerr-ssl.log
+        TransferLog logs/maillog-ssl.log
 </VirtualHost>
 
 #$APPNAME STOP