sync sliced-bread

git-svn-id: svn://sql.mit.edu/sql@188 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/etc/lighttpd/lighttpd.conf b/etc/lighttpd/lighttpd.conf
index dd29d4e977734eb769d538de325636c77b9bbeb5..cd87d574a03faba45bfb34d54addb933f44c914b 100644 (file)
--- a/etc/lighttpd/lighttpd.conf
+++ b/etc/lighttpd/lighttpd.conf
@@ -16,7 +16,7 @@ $PHYSICAL["existing-path"] =~ "\.php$" {
     proxy-core.balancer = "round-robin"
     proxy-core.allow-x-sendfile = "enable"
     proxy-core.protocol = "fastcgi"
-    proxy-core.backends = ( "unix:/tmp/php-fastcgi.sock" )
+    proxy-core.backends = ( "unix:/tmp/php.sock" )
     proxy-core.max-pool-size = 4
 }
 
@@ -35,7 +35,7 @@ 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" {
-    server.document-root = "/srv/www/root/"
+#    server.document-root = "/srv/www/root/"
     ssl.engine = "enable"
     ssl.pemfile = "/etc/lighttpd/sql.mit.edu.pem"
     ssl.ca-file = "/etc/lighttpd/mitCAclient.pem"
@@ -43,7 +43,7 @@ $SERVER["socket"] == "0.0.0.0:443" {
     ssl.verifyclient.enforce    = "disable"
     ssl.verifyclient.depth      = 2
 
-    url.redirect += ( "^/$" => "/manage/" )
+#    url.redirect += ( "^/$" => "/manage/" )
     $HTTP["url"] =~ "^/manage(/|$)" {
         proxy-core.balancer = "round-robin"
         proxy-core.protocol = "fastcgi"

diff --git a/sbin/spawn_php b/sbin/spawn_php
deleted file mode 100755 (executable)
index f2565ed..0000000
--- a/sbin/spawn_php
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-_FCGI_PHP_SOCK="/tmp/php-fastcgi.sock"
-_FCGI_PHP_PID="/tmp/php-fastcgi.pid"
-
-export PHP_FCGI_CHILDREN=4
-export PHP_FCGI_MAX_REQUESTS=10000
-
-rm -f $_FCGI_PHP_SOCK $_FCGI_PHP_PID
-pkill -9 php-cgi
-
-rm -f /var/lib/php/session/*
-chmod 770 /var/lib/php/session
-chown -R root:sql /var/lib/php/session
-
-/usr/bin/spawn-fcgi -s $_FCGI_PHP_SOCK -f /usr/bin/php-cgi -u sql -g sql -P $_FCGI_PHP_PID -C 4
-chmod 777 $_FCGI_PHP_SOCK

diff --git a/www/root/css/style.css b/www/root/css/style.css
index b825662e29b6c8d66180f03815b559d3b386ad19..74a411fa06b8a89d4098e8e722f6a9b13999dd19 100644 (file)
--- a/www/root/css/style.css
+++ b/www/root/css/style.css
@@ -1,12 +1,10 @@
-html,body,div,span,form,h1,h2,h3,h4,p,blockquote{margin:0;padding:0;border:0;outline:0;}
+html,body,div,span,form,h1,h2,h3,h4,p,blockquote,ul,ol,li,a{margin:0;padding:0;border:0;outline:0;}
 
 /* -------  Layout CSS (Centered Fixed Width) ------ */
 
 body {
   font-family: Verdana, sans-serif;
   font-size: 12px;
-  margin: 0;
-  padding: 0;
   text-align: center; /* IE 5.5 hack */
 }
 #farouter {
@@ -21,11 +19,9 @@ body {
 #content { float: left; width: 490px; }
 #content_wide { padding: 1em 2em; }
 #content_home { float: left; width: 490px; padding-top: 0px; }
-#menu { float: right; width: 175px; margin-right: 10px; border-left: 1px dashed #2050A0; }
-#nav { padding-left: 10px; }
 #logo { padding-top: 25px; padding-left: 12px; }
 #hmenu { height: 30px; }
-#hnav { margin: 0; padding: 0; }
+#hnav { margin: 0; padding: 5px 0; }
 #clearer { clear: both; margin: 0; padding: 0; }
 #footer { margin: 8px 8px 8px 8px; }
 
@@ -67,36 +63,23 @@ p { line-height: 175%; }
 
 #hnav ul {
        text-align: center;
-       padding-bottom: 5px;
-       padding-top: 5px;
-       padding-left: 0;
-       margin-top: 0;
-       /* cancels gap caused by top padding in Opera 7.54 */
-       margin-left: 0;
        background-color: #2050A0;
        color: #F2EEEC;
        width: 100%;
-       line-height: 18px;
        /* fixes Firefox 0.9.3 */
 }
 
 #hnav ul li {
        display: inline;
-       padding-left: 0;
-       padding-right: 0;
-       padding-bottom: 5px;
+       padding: 5px 0;
        /* matches link padding except for left and right */
-       padding-top: 5px;
+       border-left: 1px solid #F2EEEC;
 }
 
 #hnav ul li a {
-       padding-left: 10px;
-       padding-right: 10px;
-       padding-bottom: 5px;
-       padding-top: 5px;
+       padding: 5px 10px;
        color: #F2EEEC;
        text-decoration: none;
-       border-right: 1px solid #F2EEEC;
 }
 
 #hnav ul li.menu_last a {
@@ -107,6 +90,3 @@ p { line-height: 175%; }
        background: #F2EEEC;
        color: #3A291F;
 }
-
-#hnav #active { border-left: 1px solid #F2EEEC; }
-