k-s: uncommitted changes

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

diff --git a/etc/kitchen-sink/my.cnf b/etc/kitchen-sink/my.cnf
index 310fa313a1c97419685d7209b2ff739c3d651c76..334d6bd72fa59d6feb8fd50e7d0ddbb97b77072c 100644 (file)
--- a/etc/kitchen-sink/my.cnf
+++ b/etc/kitchen-sink/my.cnf
@@ -9,10 +9,10 @@ ssl_ca=/etc/pki/tls/certs/ca.pem
 datadir=/srv/mysql
 log_slow_queries
 long_query_time=4
-max_connections=256
+max_connections=512
 max_connect_errors=0
-wait_timeout=300
-interactive_timeout=300
+wait_timeout=60
+interactive_timeout=60
 connect_timeout=10
 local_infile=0
 ft_min_word_len=3

diff --git a/etc/lighttpd/lighttpd.conf b/etc/lighttpd/lighttpd.conf
index 82b4d891238147d9aa8f5447836e9a081898d65d..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_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"

diff --git a/web/phpMyAdmin_config.inc.php b/web/phpMyAdmin_config.inc.php
index 857558e7446164926c9cec47ecb33338bc8cf674..7a4936a1a6ef0fa86e3607fb8669d82a7bb28cff 100755 (executable)
--- a/web/phpMyAdmin_config.inc.php
+++ b/web/phpMyAdmin_config.inc.php
@@ -45,8 +45,6 @@ $cfg['ThemeDefault'] = 'original';
 $cfg['LoginCookieRecall'] = false;
 $cfg['OBGzip'] = 'auto';
 $cfg['PropertiesIconic'] = false;
-$cfg['lang'] = 'en-iso-8859-1';
-$cfg['Lang'] = 'en-iso-8859-1';
 $cfg['ShowHttpHostTitle'] = false;
 //$cfg['SetHttpHostTitle'] = 'sql.mit.edu';
 $cfg['LeftBgColor'] = '#2050A0';