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

[nobody at svn.erp5.org]

Author: luke
Date: Tue Jan 26 14:08:58 2010
New Revision: 31973

URL: http://svn.erp5.org?rev=31973&view=rev
Log:
 - put configuration of all services in common [configuration] part

Modified:
    erp5/trunk/buildout/development.cfg
    erp5/trunk/buildout/mysql-instance/buildout.cfg
    erp5/trunk/buildout/mysql-instance/templates/mysql.in
    erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
    erp5/trunk/buildout/mysql-instance/templates/mysqld.in

Modified: erp5/trunk/buildout/development.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/development.cfg?rev=31973&r1=31972&r2=31973&view=diff
==============================================================================
--- erp5/trunk/buildout/development.cfg [utf8] (original)
+++ erp5/trunk/buildout/development.cfg [utf8] Tue Jan 26 14:08:58 2010
@@ -28,7 +28,7 @@
 # Format:
 #     database[@host[:port]] [user [password [unix_socket]]]
 #   e.g "erp5db erp5user somepassword" or "erp5db erp5user"
-erp5_sql_connection_string =  test@${hosts:mysql}:${ports:mysql} root
+erp5_sql_connection_string =  test@${configuration:mysql_host}:${configuration:mysql_port} root
 bt5 =
    erp5_base
    erp5_forge

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=31973&r1=31972&r2=31973&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Tue Jan 26 14:08:58 2010
@@ -10,11 +10,9 @@
     mysql-instance
     start-mysql-instance
 
-[ports]
-mysql = 10002
-
-[hosts]
-mysql = 127.0.0.1
+[configuration]
+mysql_port = 10002
+mysql_host = 127.0.0.1
 
 [mysql-bin]
 recipe = collective.recipe.template

Modified: erp5/trunk/buildout/mysql-instance/templates/mysql.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysql.in?rev=31973&r1=31972&r2=31973&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] Tue Jan 26 14:08:58 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysql --no-defaults --protocol=tcp --host=${hosts:mysql} --port=${ports:mysql} $@
+${software_definition:mysql_software}/bin/mysql --no-defaults --protocol=tcp --host=${configuration:mysql_host} --port=${configuration:mysql_port} $@

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in?rev=31973&r1=31972&r2=31973&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] Tue Jan 26 14:08:58 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqladmin --no-defaults --protocol=tcp --host=${hosts:mysql} --port=${ports:mysql} $@
+${software_definition:mysql_software}/bin/mysqladmin --no-defaults --protocol=tcp --host=${configuration:mysql_host} --port=${configuration:mysql_port} $@

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqld.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld.in?rev=31973&r1=31972&r2=31973&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] Tue Jan 26 14:08:58 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${ports:mysql} --pid-file=${mycnf:pid} --log-error=${mycnf:err} --basedir=${mycnf:basedir} --datadir=${mycnf:datadir} --socket=${mycnf:sock}
+${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${configuration:mysql_port} --pid-file=${mycnf:pid} --log-error=${mycnf:err} --basedir=${mycnf:basedir} --datadir=${mycnf:datadir} --socket=${mycnf:sock}