k-s: uncommitted changes

[sql.git] / etc / lighttpd / lighttpd.conf

diff --git a/etc/lighttpd/lighttpd.conf b/etc/lighttpd/lighttpd.conf
index 4c5523ee446a1f72ed898466bbce0b05f6efba81..ff497cb67dd239d554ae829117f388845c5c5c6f 100644 (file)
--- a/etc/lighttpd/lighttpd.conf
+++ b/etc/lighttpd/lighttpd.conf
@@ -1,9 +1,10 @@
-server.modules              = ( "mod_rewrite", "mod_alias", "mod_access", "mod_fastcgi", "mod_accesslog" )
+server.modules              = ( "mod_rewrite", "mod_alias", "mod_access", "mod_fastcgi", "mod_redirect", "mod_accesslog" )
 server.errorlog             = "/var/log/lighttpd/error_log"
-accesslog.filename          = "/var/log/lighttpd/access_log"
+$HTTP["useragent"] !~ "^check_http" {
+    accesslog.filename          = "/var/log/lighttpd/access_log"
+}
 etag.use-inode              = "disable"
 index-file.names            = ( "index.php", "index.html" )
-server.tag                  = ""
 url.access-deny             = ( "~", ".inc", ".svn", "CVS" )
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 static-file.etags           = "enable"
@@ -28,21 +29,22 @@ fastcgi.server              = ( ".php" =>
                                 ))
                               )
 
-server.document-root = "/srv/sql/web/home/"
-alias.url = ( "/~sql/" => "/srv/sql/web/" )
-alias.url += ( "/main/" => "/srv/sql/web/main/" )
-alias.url += ( "/dev/" => "/srv/sql/web/dev/" )
-alias.url += ( "/tools/" => "/srv/sql/web/tools/" )
-alias.url += ( "/" => "/srv/sql/web/home/" )
+server.document-root = "/srv/web/home/"
+alias.url = ( "/~sql" => "/srv/web" )
+alias.url += ( "/main" => "/srv/web/main" )
+alias.url += ( "/dev" => "/srv/web/dev" )
+alias.url += ( "/tools" => "/srv/web/tools" )
+#alias.url += ( "/" => "/srv/web/home" )
 url.rewrite-once = ( "^/tools/([^\?]+)(\??.*)" => "/tools/$1.php$2" )
 url.rewrite-once += ( "^/~sql/main/do/([^\?]+)(\??.*)" => "/~sql/main/$1.php$2" )
 url.rewrite-once += ( "^/~sql/dev/do/([^\?]+)(\??.*)" => "/~sql/dev/$1.php$2" )
 url.rewrite-once += ( "^/main/do/([^\?]+)(\??.*)" => "/main/$1.php$2" )
 url.rewrite-once += ( "^/dev/do/([^\?]+)(\??.*)" => "/dev/$1.php$2" )
+url.redirect = ( "^/phpMyAdmin(.*)" => "http://scripts.mit.edu/~sql/phpMyAdmin$1" )
 ssl.verifyclient.username  = "SSL_CLIENT_S_DN_emailAddress"
 $SERVER["socket"] == "0.0.0.0:443" {
     ssl.engine = "enable"
-    ssl.pemfile = "/etc/lighttpd/sql-mit-edu.pem"
+    ssl.pemfile = "/etc/lighttpd/sql.mit.edu.pem"
     ssl.ca-file = "/etc/lighttpd/mitCAclient.pem"
     ssl.verifyclient.activate   = "enable"
     ssl.verifyclient.enforce    = "disable"