Be sure to listen on both port 443 and 446

[invirt/packages/invirt-web.git] / files / etc / apache2 / sites-available / default

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index dc99744..672526c 100644 (file)
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default
@@ -2,27 +2,25 @@ NameVirtualHost *:80
 <VirtualHost *:80>
        ServerAdmin webmaster@localhost
        
 <VirtualHost *:80>
        ServerAdmin webmaster@localhost
        

-       DocumentRoot /var/www/
-       <Directory /var/www/>
+       DocumentRoot /var/www/sipb-xen-www
+       <Directory /var/www/sipb-xen-www>

                Options Indexes FollowSymLinks MultiViews ExecCGI
                AllowOverride None
                Order allow,deny
                allow from all
                Options Indexes FollowSymLinks MultiViews ExecCGI
                AllowOverride None
                Order allow,deny
                allow from all

-               # This directive allows us to have apache2's default start page
-                # in /apache2-default/, but still have / go to the right place
-                #RedirectMatch ^/$ /apache2-default/
-               #Redirect / https://sipb-xen-dev.mit.edu/
-               #RedirectMatch ^/(!?trac) https://sipb-xen-dev.mit.edu/

        </Directory>
 
        RewriteEngine On
        </Directory>
 
        RewriteEngine On

-       #RewriteRule ^/trac - [L]
+       RewriteRule ^/static(.*) - [L]
+       RewriteRule ^/admin/static(.*) /static/$1 [L]

         RewriteRule ^/trac.fcgi(.*) - [L]
         RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]
         RewriteRule ^/trac.fcgi(.*) - [L]
         RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]

-       RewriteRule ^/trac/login(.*) https://sipb-xen-dev.mit.edu/trac/login$1 [L]
+       RewriteRule ^/trac/login(.*) https://xvm.mit.edu/trac/login$1 [L]

         RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
        RewriteRule ^/sipb-xen - [L]
         RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
        RewriteRule ^/sipb-xen - [L]

-       RewriteRule ^(.*) https://sipb-xen-dev.mit.edu$1
+       RewriteRule ^/kill.cgi - [L]
+       RewriteRule ^/~ - [L]
+       RewriteRule ^/(.*) /var/www/sipb-xen-www/main.fcgi/$1 [L]

 
        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
        <Directory "/usr/lib/cgi-bin">
 
        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
        <Directory "/usr/lib/cgi-bin">

@@ -30,7 +28,6 @@ NameVirtualHost *:80
                Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
                Order allow,deny
                Allow from all
                Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
                Order allow,deny
                Allow from all

-               #Redirect / https://sipb-xen-dev.mit.edu/

        </Directory>
 
        ErrorLog /var/log/apache2/error.log
        </Directory>
 
        ErrorLog /var/log/apache2/error.log