config fixes

[sql.git] / etc / my.cnf

diff --git a/etc/my.cnf b/etc/my.cnf
index 6df5596162b5349dad3481d384e5ef6c1468841f..905549d34ad8752ea57b7aab35461bbcb021f509 100644 (file)
--- a/etc/my.cnf
+++ b/etc/my.cnf
@@ -1,5 +1,6 @@
 [client]
 socket=/srv/mysql/mysql.sock
+ssl-ca=/etc/pki/tls/certs/ca.pem
 
 [mysql]
 socket=/srv/mysql/mysql.sock
@@ -7,50 +8,64 @@ socket=/srv/mysql/mysql.sock
 [mysqld]
 datadir=/srv/mysql
 log_slow_queries
-long_query_time=2
-max_connections=5000
-#max_connect_errors=10
-wait_timeout=600
-interactive_timeout=600
+long_query_time=4
+max_connections=256
+max_connect_errors=0
+wait_timeout=300
+interactive_timeout=300
 connect_timeout=10
+local_infile=0
+ft_min_word_len=3
+expire_logs_days=7
+
+# Bump the max open files (*grumble* esp)
+# 2008-09-24 -- quentin
+open_files_limit=8192
 
 log-bin=sql-bin
 log-bin-index=sql-bin.index
 relay-log=kitchen-sink-relay-bin
 relay-log-index=kitchen-sink-relay-bin.index
 
-skip-locking
-#skip-external-locking
-
 query_cache_limit=1M
 query_cache_size=128M
 query_cache_type=1
 thread_cache_size=8
-table_cache=1024
-key_buffer=400M
+table_cache=512
+key_buffer=384M
 join_buffer=1M
 record_buffer=1M
 max_allowed_packet=16M
 sort_buffer_size=2M
 read_buffer_size=2M
 read_rnd_buffer_size=8M
-tmp_table_size=35M
+tmp_table_size=32M
 thread_concurrency=4
-myisam_sort_buffer_size=8M
+myisam_sort_buffer_size=64M
 
 innodb_buffer_pool_size=512M
 innodb_additional_mem_pool_size=20M
-innodb_log_file_size=200M
-innodb_log_buffer_size=2M
-#innodb_lock_wait_timeout=50
-
+innodb_log_file_size=256M
+innodb_log_buffer_size=8M
+innodb_lock_wait_timeout=50
+innodb_thread_concurrency=4
+innodb_log_group_home_dir=/srv/zebra/
 innodb_file_per_table
 
 old_passwords=1
 server-id=1
 
+ssl_ca=/etc/pki/tls/certs/ca.pem
+ssl_cert=/etc/pki/tls/certs/sql.pem
+ssl_key=/etc/pki/tls/private/sql.pem
+
 skip-bdb
-#skip-networking
+skip-merge
+skip-name-resolve
+
+# Disable the "data directory" option:
+# <quentin> 2008-07-14
+skip-symbolic-links
 
 [mysqldump]
 quick