* scripts/mir-setup/conf: updated to use tomcat5.5

[mir.git] / scripts / mir-setup / conf / site-httpd.conf

diff --git a/scripts/mir-setup/conf/site-httpd.conf b/scripts/mir-setup/conf/site-httpd.conf
index 87f0921..2ccd9da 100755 (executable)
--- a/scripts/mir-setup/conf/site-httpd.conf
+++ b/scripts/mir-setup/conf/site-httpd.conf
@@ -4,16 +4,15 @@
   ServerAdmin $USER@$FQDN
   DocumentRoot $PRODUCTIONDIR
   ServerName $FQDN
+  ServerAlias $MIRRORFQDN
   ServerAlias $ALIAS
 
-  CustomLog /var/log/apache2/$SITE.log combined
+  CustomLog /var/log/apache2/$SITE.log anon
 
 # Back end should only be accessed via SSL; bounce to enforce this
   Redirect /$SITE/servlet/Mir https://$SECUREFQDN/$SITE/servlet/Mir
-  
-  <Location /$SITE>
-    JkUriSet worker ajp13:localhost:8009
-  </Location>
+
+  JkMount /$SITE/*  ajp13_worker
   <Directory $PRODUCTIONDIR>
     Options Indexes IncludesNoExec FollowSymLinks MultiViews
     IndexOptions +SuppressHTMLPreamble +SuppressDescription
@@ -42,3 +41,5 @@
     Header append Vary User-Agent env=!dont-vary
   </Location>
 </VirtualHost>
+
+Include /etc/apache2/mir-sites/ssl-dedicated/$SITE.conf