From 9f86a3d544e64540b1d9e8af0ac2650cdb1291cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Fri, 3 Jun 2011 23:07:51 +0200 Subject: [PATCH] MySQL : Update other variation of mysql software releases --- software/mariadb/instance.cfg | 4 ++- software/mariadb/software.cfg | 37 ++++++++++--------------- software/mysql-tritonn-5.0/instance.cfg | 4 ++- software/mysql-tritonn-5.0/software.cfg | 37 ++++++++++--------------- 4 files changed, 36 insertions(+), 46 deletions(-) diff --git a/software/mariadb/instance.cfg b/software/mariadb/instance.cfg index 0a4c5f367..d336c1068 100644 --- a/software/mariadb/instance.cfg +++ b/software/mariadb/instance.cfg @@ -8,8 +8,10 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} [instance] recipe = ${instance-recipe:egg}:${instance-recipe:module} dcrond_binary = ${dcron:location}/sbin/crond +innobackupex_binary = ${xtrabackup:location}/bin/innobackupex logrotate_binary = ${logrotate:location}/usr/sbin/logrotate mysql_binary = ${mariadb:location}/bin/mysql mysql_install_binary = ${mariadb:location}/bin/mysql_install_db mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade -mysqld_binary = ${mariadb:location}/libexec/mysqld \ No newline at end of file +mysqld_binary = ${mariadb:location}/libexec/mysqld +perl_binary = ${perl:location}/bin/perl \ No newline at end of file diff --git a/software/mariadb/software.cfg b/software/mariadb/software.cfg index 0910e04c1..7880da33e 100644 --- a/software/mariadb/software.cfg +++ b/software/mariadb/software.cfg @@ -1,12 +1,13 @@ [buildout] -slaposcookbook_location = ${:parts-directory}/slaposcookbook -develop = ${:slaposcookbook_location} +sources = sources +auto-checkout = mysql extensions = slapos.tool.networkcache slapos.zcbworkarounds -#slapos.rebootstrap + slapos.rebootstrap + mr.developer find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/ @@ -16,13 +17,15 @@ extends = ../../component/mariadb/buildout.cfg ../../component/dcron/buildout.cfg ../../component/logrotate/buildout.cfg + ../../component/python-2.7/buildout.cfg + ../../component/perl/buildout.cfg + ../../component/xtrabackup/buildout.cfg -#mysql-tritonn-5.0 -#mariadb versions = versions parts += # Create instance template +#TODO : list here all parts. template instance-recipe-egg @@ -31,30 +34,20 @@ parts += # development / fast switching environment for whole software unzip = true -#[rebootstrap] -# Default first version of rebootstrapped python -#version = 2 -#section = python2.7 +[sources] +# Include information related to official mysql source code. +mysql = git http://git.erp5.org/repos/slapos.git branch=mysql -[slaposcookbook] -recipe = plone.recipe.command -git_param =--quiet -b mysql -git = ${git:location}/bin/git -location = ${buildout:parts-directory}/${:_buildout_section_name_} -stop-on-error = true -command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1; -update-command = cd ${:location} && ${git:location}/bin/git pull --quiet +[rebootstrap] +# Default first version of rebootstrapped python +version = 2 +section = python2.7 [instance-recipe] egg = slapos.cookbook module = mysql [instance-recipe-egg] -# Just so buildout executes [slaposcookbook] before [eggs], as -# - [eggs] references [slaposcookbook] -# - [instance-recipe] needs [slaposcookbook] to be finished -# - we cannot rely on anything else being executed before [instance-recipe] -slaposcookbook_dummy = ${slaposcookbook:location} recipe = zc.recipe.egg #python = python2.6 eggs = ${instance-recipe:egg} diff --git a/software/mysql-tritonn-5.0/instance.cfg b/software/mysql-tritonn-5.0/instance.cfg index a926ca6e8..9310e3ef4 100644 --- a/software/mysql-tritonn-5.0/instance.cfg +++ b/software/mysql-tritonn-5.0/instance.cfg @@ -8,8 +8,10 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} [instance] recipe = ${instance-recipe:egg}:${instance-recipe:module} dcrond_binary = ${dcron:location}/sbin/crond +innobackupex_binary = ${xtrabackup:location}/bin/innobackupex logrotate_binary = ${logrotate:location}/usr/sbin/logrotate mysql_binary = ${mysql-tritonn-5.0:location}/bin/mysql mysql_install_binary = ${mysql-tritonn-5.0:location}/bin/mysql_install_db mysql_upgrade_binary = ${mysql-tritonn-5.0:location}/bin/mysql_upgrade -mysqld_binary = ${mysql-tritonn-5.0:location}/libexec/mysqld \ No newline at end of file +mysqld_binary = ${mysql-tritonn-5.0:location}/libexec/mysqld +perl_binary = ${perl:location}/bin/perl \ No newline at end of file diff --git a/software/mysql-tritonn-5.0/software.cfg b/software/mysql-tritonn-5.0/software.cfg index 4f771184c..5f1bf8406 100644 --- a/software/mysql-tritonn-5.0/software.cfg +++ b/software/mysql-tritonn-5.0/software.cfg @@ -1,12 +1,13 @@ [buildout] -slaposcookbook_location = ${:parts-directory}/slaposcookbook -develop = ${:slaposcookbook_location} +sources = sources +auto-checkout = mysql extensions = slapos.tool.networkcache slapos.zcbworkarounds -#slapos.rebootstrap + slapos.rebootstrap + mr.developer find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/ @@ -16,13 +17,15 @@ extends = ../../component/mysql-tritonn-5.0/buildout.cfg ../../component/dcron/buildout.cfg ../../component/logrotate/buildout.cfg + ../../component/python-2.7/buildout.cfg + ../../component/perl/buildout.cfg + ../../component/xtrabackup/buildout.cfg -#mysql-tritonn-5.0 -#mariadb versions = versions parts += # Create instance template +#TODO : list here all parts. template instance-recipe-egg @@ -31,30 +34,20 @@ parts += # development / fast switching environment for whole software unzip = true -#[rebootstrap] -# Default first version of rebootstrapped python -#version = 2 -#section = python2.7 +[sources] +# Include information related to official mysql source code. +mysql = git http://git.erp5.org/repos/slapos.git branch=mysql -[slaposcookbook] -recipe = plone.recipe.command -git_param =--quiet -b mysql -git = ${git:location}/bin/git -location = ${buildout:parts-directory}/${:_buildout_section_name_} -stop-on-error = true -command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1; -update-command = cd ${:location} && ${git:location}/bin/git pull --quiet +[rebootstrap] +# Default first version of rebootstrapped python +version = 2 +section = python2.7 [instance-recipe] egg = slapos.cookbook module = mysql [instance-recipe-egg] -# Just so buildout executes [slaposcookbook] before [eggs], as -# - [eggs] references [slaposcookbook] -# - [instance-recipe] needs [slaposcookbook] to be finished -# - we cannot rely on anything else being executed before [instance-recipe] -slaposcookbook_dummy = ${slaposcookbook:location} recipe = zc.recipe.egg #python = python2.6 eggs = ${instance-recipe:egg} -- 2.30.9