Do some config cleanup in invirt-web.

svn path=/trunk/packages/invirt-web/; revision=2765

diff --git a/debian/changelog b/debian/changelog
index 52317d2..f33fb00 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-web (0.1.2) unstable; urgency=low
+
+  * Do some quick config cleanup.
+
+ -- Evan Broder <broder@mit.edu>  Mon, 21 Dec 2009 12:10:41 -0600
+

 invirt-web (0.1.1) unstable; urgency=low
 
   * Use a different Mako template cache for auth.fcgi and unauth.fcgi
 invirt-web (0.1.1) unstable; urgency=low
 
   * Use a different Mako template cache for auth.fcgi and unauth.fcgi

diff --git a/files/etc/apache2/conf.d/invirt-repository b/files/etc/apache2/conf.d/invirt-repository
index 1732f86..0375397 100644 (file)
--- a/files/etc/apache2/conf.d/invirt-repository
+++ b/files/etc/apache2/conf.d/invirt-repository
@@ -1,17 +1,8 @@
 Alias /invirt /srv/repository
 
 Alias /invirt /srv/repository
 

-Alias /debian/ /debian/
-

 <Directory /srv/repository>
                Options Indexes FollowSymLinks MultiViews
                AllowOverride None
                Order allow,deny
                allow from all
 </Directory>
 <Directory /srv/repository>
                Options Indexes FollowSymLinks MultiViews
                AllowOverride None
                Order allow,deny
                allow from all
 </Directory>

-
-<Directory /debian>
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride None
-               Order allow,deny
-               allow from all
-</Directory>

diff --git a/files/etc/apache2/sites-available/default.mako b/files/etc/apache2/sites-available/default.mako
index ac0cf4f..9a2943d 100644 (file)
--- a/files/etc/apache2/sites-available/default.mako
+++ b/files/etc/apache2/sites-available/default.mako
@@ -22,7 +22,6 @@ NameVirtualHost *:80
        RewriteRule ^/admin/static(.*) /static/$1 [L]
        RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
        RewriteRule ^/invirt - [L]
        RewriteRule ^/admin/static(.*) /static/$1 [L]
        RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
        RewriteRule ^/invirt - [L]

-       RewriteRule ^/kill.cgi - [L]

        RewriteRule ^/(.*) /var/www/invirt-web/unauth.fcgi/$1 [L]
 
        ErrorLog /var/log/apache2/error.log
        RewriteRule ^/(.*) /var/www/invirt-web/unauth.fcgi/$1 [L]
 
        ErrorLog /var/log/apache2/error.log

@@ -33,14 +32,4 @@ NameVirtualHost *:80
 
        CustomLog /var/log/apache2/access.log combined
        ServerSignature On
 
        CustomLog /var/log/apache2/access.log combined
        ServerSignature On

-
-    Alias /doc/ "/usr/share/doc/"
-    <Directory "/usr/share/doc/">
-        Options Indexes MultiViews FollowSymLinks
-        AllowOverride None
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.0/255.0.0.0 ::1/128
-    </Directory>
-

 </VirtualHost>
 </VirtualHost>

diff --git a/files/etc/apache2/sites-available/ssl.mako b/files/etc/apache2/sites-available/ssl.mako
index 372563f..526f52f 100644 (file)
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -25,7 +25,6 @@ ${caller.body()}
        RewriteRule ^/overlord/static(.*) /static/$1 [L]
        RewriteRule ^/admin/static(.*) /static/$1 [L]
        RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
        RewriteRule ^/overlord/static(.*) /static/$1 [L]
        RewriteRule ^/admin/static(.*) /static/$1 [L]
        RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]

-       RewriteRule ^/kill.cgi - [L]

        RewriteRule ^/(.*) /var/www/invirt-web/auth.fcgi/$1 [L]
 
        RewriteLog /var/log/apache2/rewrite.log
        RewriteRule ^/(.*) /var/www/invirt-web/auth.fcgi/$1 [L]
 
        RewriteLog /var/log/apache2/rewrite.log