From 4f81644399b62c57f8cf7cd9f9ff830651a7dd8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 6 May 2011 14:50:07 +0200 Subject: [PATCH] Revert "Store full location to xtrabackup_51_binary." This reverts commit d64008dd220adf512b4439ed891af70f0295bc52. Unfortunately innobackupex manual page lied about possibility to pass directly path of backup agent, so it is required to rely on PATH manipulation. --- slapos/instance.cfg | 2 +- slapos/software.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slapos/instance.cfg b/slapos/instance.cfg index a7ca24ec6d..3e4cf63641 100644 --- a/slapos/instance.cfg +++ b/slapos/instance.cfg @@ -28,7 +28,6 @@ runzeo_binary = ${buildout:bin-directory}/runzeo runzope_binary = ${buildout:bin-directory}/runzope tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo tidstoraged_binary = ${buildout:bin-directory}/tidstoraged -xtrabackup_51_binary = ${xtrabackup:location}/bin/xtrabackup_51 zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent # cloudooo specific configuration @@ -46,6 +45,7 @@ link_binary_list = ${w3m:location}/bin/w3m ${xpdf:location}/bin/pdfinfo ${xpdf:location}/bin/pdftotext + ${xtrabackup:location}/bin/xtrabackup_51 # XXX: products won't be needed as soon as all ERP5 (and products-deps) # products will be eggified so then it will be possible to use them thanks to diff --git a/slapos/software.cfg b/slapos/software.cfg index 07c79afec2..5e1537dc5c 100644 --- a/slapos/software.cfg +++ b/slapos/software.cfg @@ -126,7 +126,7 @@ section = python2.7 # Default template for erp5 instance. recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = 494fd0955b55bcd2e4ef94293083e90e +md5sum = e728ad0200c3e78546549ac95cf41ced output = ${buildout:directory}/template.cfg mode = 0644 -- 2.30.9