[Erp5-report] r32437 luke - in /erp5/trunk/buildout: ./ mysql-instance/ mysql-instance/temp...

[nobody at svn.erp5.org]

Author: luke
Date: Thu Feb 11 17:20:50 2010
New Revision: 32437

URL: http://svn.erp5.org?rev=32437&view=rev
Log:
 - start implementation of more separated data part of buildout
 - create initial my.cnf template

Added:
    erp5/trunk/buildout/mysql-instance/templates/my.cnf.in
Modified:
    erp5/trunk/buildout/mysql-instance/buildout.cfg
    erp5/trunk/buildout/official.cfg

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=32437&r1=32436&r2=32437&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Thu Feb 11 17:20:50 2010
@@ -4,11 +4,8 @@
 
 [buildout]
 parts =
-    mysql-bin
-    mysql-admin
-    mysqld-bin
+    mycnf
     mysql-instance
-    start-mysql-instance
 
 [configuration]
 mysql_port = 10002
@@ -33,6 +30,12 @@
 input = ${buildout:directory}/mysql-instance/templates/mysqld.in
 output = ${buildout:directory}/bin/mysqld
 
+[mysql-cnf]
+depends = ${etc-directory:command}
+recipe = collective.recipe.template
+input = ${buildout:directory}/mysql-instance/templates/my.cnf.in
+output = ${buildout:directory}/var/etc/my.cnf
+
 [mysql-instance]
 recipe = plone.recipe.command
 command = 

Added: erp5/trunk/buildout/mysql-instance/templates/my.cnf.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/my.cnf.in?rev=32437&view=auto
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/my.cnf.in (added)
+++ erp5/trunk/buildout/mysql-instance/templates/my.cnf.in [utf8] Thu Feb 11 17:20:50 2010
@@ -1,0 +1,66 @@
+# ERP5 buildout my.cnf template based on my-huge.cnf shipped with mysql
+# The following options will be passed to all MySQL clients
+[client]
+user = 
+port = ${configuration:mysql_port}
+socket = ${configuration:mysql_sock}
+
+# The MySQL server
+[mysqld]
+port = ${configuration:mysql_port}
+socket = ${configuration:mysql_sock}
+skip-locking
+key_buffer = 384M
+max_allowed_packet = 1M
+table_cache = 512
+sort_buffer_size = 2M
+read_buffer_size = 2M
+read_rnd_buffer_size = 8M
+myisam_sort_buffer_size = 64M
+thread_cache_size = 8
+query_cache_size = 32M
+# Try number of CPU's*2 for thread_concurrency
+thread_concurrency = 8
+
+# Disable Federated by default
+skip-federated
+
+# Replication Master Server (default)
+# binary logging is required for replication
+log-bin=mysql-bin
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
+server-id	= 1
+
+# Force utf8 usage
+collation_server = utf8_unicode_ci
+character_set_server = utf8
+default-character-set = utf8
+skip-character-set-client-handshake
+
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer = 256M
+sort_buffer_size = 256M
+read_buffer = 2M
+write_buffer = 2M
+
+[myisamchk]
+key_buffer = 256M
+sort_buffer_size = 256M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout

Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=32437&r1=32436&r2=32437&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Thu Feb 11 17:20:50 2010
@@ -53,6 +53,14 @@
   echo "Required header files: ${requirements:development}"
 update-command = ${:command}
 
+[etc-directory]
+recipe = plone.recipe.command
+command = mkdir -p ${buildout:directory}/var/etc
+
+[log-directory]
+recipe = plone.recipe.command
+command = mkdir -p ${buildout:directory}/var/log
+
 [software_definition]
 mysql_software = ${mysql-tritonn-5.0:location}
 zope_software = ${zope-2.8:location}