Ignore:
Timestamp:
Mar 20, 2006, 10:24:29 PM (13 years ago)
Author:
bcornec
Message:

merge -r435:447 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/website/mondorescue.org.conf

    r394 r448  
    22# Apache Virtual Host Configuration File
    33#
    4 NameVirtualHost *:80
     4NameVirtualHost *
    55
    6 <VirtualHost *:80>
     6<VirtualHost *>
    77    ServerName www.mondorescue.org
     8    #ServerAlias mondorescue.org
    89    ServerAdmin webmaster@mondorescue.org
    910    DocumentRoot /mondo/www/html/mondo
    1011    CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
    1112    Errorlog /var/log/httpd/www.mondorescue.org/error_log
     13    RewriteEngine On
     14    RewriteRule     ^/index\.html$  /index.shtml
     15    RewriteRule     ^/$  /index.shtml
    1216    <Directory "/mondo/www/html/mondo">
     17    DirectoryIndex index.shtml
    1318        Options -Indexes MultiViews FollowSymLinks +Includes
    1419        AllowOverride None
     
    1823</VirtualHost>
    1924
    20 <VirtualHost *:80>
     25<VirtualHost *>
     26    ServerName oldwww.mondorescue.org
     27    ServerAdmin webmaster@mondorescue.org
     28    DocumentRoot /mondo/www/html/oldwww
     29    CustomLog /var/log/httpd/oldwww.mondorescue.org/access_log combined
     30    Errorlog /var/log/httpd/oldwww.mondorescue.org/error_log
     31    <Directory "/mondo/www/html/oldwww">
     32        Options -Indexes MultiViews FollowSymLinks +Includes
     33        AllowOverride None
     34        Order allow,deny
     35        Allow from all
     36    </Directory>
     37</VirtualHost>
     38
     39<VirtualHost *>
    2140    ServerName www1.mondorescue.org
    2241    ServerAdmin webmaster@mondorescue.org
     
    3150    </Directory>
    3251</VirtualHost>
     52
     53<VirtualHost *>
     54    ServerName www.mondorescue.com
     55    ServerAdmin webmaster@mondorescue.com
     56    DocumentRoot /mondo/www/html/mondo
     57    CustomLog /var/log/httpd/www.mondorescue.com/access_log combined
     58    Errorlog /var/log/httpd/www.mondorescue.com/error_log
     59    <Directory "/mondo/www/html/mondo">
     60    DirectoryIndex index.shtml
     61        Options -Indexes MultiViews FollowSymLinks +Includes
     62        AllowOverride None
     63        Order allow,deny
     64        Allow from all
     65    </Directory>
     66</VirtualHost>
Note: See TracChangeset for help on using the changeset viewer.