From 5801b7a8ffa5eb94967328ae5e6a5c0d89cb3c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 11 Mar 2011 09:04:31 +0000 Subject: [PATCH] - revert 44168, it need correct design git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44169 20353a03-c40f-0410-a6d1-a30d3c3de9de --- 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 c582413e2e..f70b67d9e7 100644 --- a/slapos/instance.cfg +++ b/slapos/instance.cfg @@ -16,6 +16,7 @@ memcached_binary = ${memcached:location}/bin/memcached mysql_binary = ${mariadb:location}/bin/mysql mysql_install_binary = ${mariadb:location}/bin/mysql_install_db mysqld_binary = ${mariadb:location}/libexec/mysqld +openssl_binary = ${openssl:location}/bin/openssl runUnitTest_binary = ${buildout:bin-directory}/runUnitTest runzeo_binary = ${buildout:bin-directory}/runzeo runzope_binary = ${buildout:bin-directory}/runzope @@ -39,7 +40,6 @@ link_binary_list = ${w3m:location}/bin/w3m ${xpdf:location}/bin/pdfinfo ${xpdf:location}/bin/pdftotext - ${openssl:location}/bin/openssl # 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 1b9222c0b7..70e45c99fb 100644 --- a/slapos/software.cfg +++ b/slapos/software.cfg @@ -117,7 +117,7 @@ section = python2.7 [template] recipe = slapos.recipe.template url = https://svn.erp5.org/repos/public/erp5/trunk/software_release/erp5/instance.cfg -md5sum = 1b3b2ba14fabaa4604fd7b9ad3aff753 +md5sum = e2fae7508e10719cf798e0ddc023bc2b output = ${buildout:directory}/template.cfg mode = 0644 -- 2.30.9