From 17e06b4a6c172d51133079186cc35f5520b3fdc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Tue, 26 Jan 2010 13:08:58 +0000
Subject: [PATCH]  - put configuration of all services in common
 [configuration] part

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31973 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/development.cfg                        | 2 +-
 buildout/mysql-instance/buildout.cfg            | 8 +++-----
 buildout/mysql-instance/templates/mysql.in      | 2 +-
 buildout/mysql-instance/templates/mysqladmin.in | 2 +-
 buildout/mysql-instance/templates/mysqld.in     | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/buildout/development.cfg b/buildout/development.cfg
index 57c8e85270..8a16c59c66 100644
--- a/buildout/development.cfg
+++ b/buildout/development.cfg
@@ -28,7 +28,7 @@ products += ${products-development:location}
 # 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
diff --git a/buildout/mysql-instance/buildout.cfg b/buildout/mysql-instance/buildout.cfg
index d36783b0dc..c772523474 100644
--- a/buildout/mysql-instance/buildout.cfg
+++ b/buildout/mysql-instance/buildout.cfg
@@ -10,11 +10,9 @@ parts =
     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
diff --git a/buildout/mysql-instance/templates/mysql.in b/buildout/mysql-instance/templates/mysql.in
index a3b6355664..812a8aae20 100755
--- a/buildout/mysql-instance/templates/mysql.in
+++ b/buildout/mysql-instance/templates/mysql.in
@@ -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} $@
diff --git a/buildout/mysql-instance/templates/mysqladmin.in b/buildout/mysql-instance/templates/mysqladmin.in
index 0062f587f2..57cd1eb873 100755
--- a/buildout/mysql-instance/templates/mysqladmin.in
+++ b/buildout/mysql-instance/templates/mysqladmin.in
@@ -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} $@
diff --git a/buildout/mysql-instance/templates/mysqld.in b/buildout/mysql-instance/templates/mysqld.in
index 84173a736f..61d4859286 100755
--- a/buildout/mysql-instance/templates/mysqld.in
+++ b/buildout/mysql-instance/templates/mysqld.in
@@ -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}
-- 
2.30.9