From 990f2f37cfc57838f749908a694af2c7d34df32d Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Thu, 29 Mar 2012 16:31:10 +0200 Subject: [PATCH] Remove trailing whitespaces. --- software/erp5/instance-mariadb.cfg.in | 2 +- software/erp5/instance-tidstorage.cfg.in | 2 +- software/erp5/instance-zope.cfg.in | 2 +- software/erp5/software.cfg | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/software/erp5/instance-mariadb.cfg.in b/software/erp5/instance-mariadb.cfg.in index 0169470..56811bf 100644 --- a/software/erp5/instance-mariadb.cfg.in +++ b/software/erp5/instance-mariadb.cfg.in @@ -132,7 +132,7 @@ command = ${logrotate:wrapper} [binary-link] recipe = slapos.cookbook:symbolic.link target-directory = ${rootdirectory:bin} -link-binary = +link-binary = {{ coreutils_location }}/bin/basename {{ coreutils_location }}/bin/cat {{ coreutils_location }}/bin/cp diff --git a/software/erp5/instance-tidstorage.cfg.in b/software/erp5/instance-tidstorage.cfg.in index 580c723..8c08e90 100644 --- a/software/erp5/instance-tidstorage.cfg.in +++ b/software/erp5/instance-tidstorage.cfg.in @@ -142,7 +142,7 @@ logrotate-entries = ${rootdirectory:etc}/logrotate.d [binary-link] recipe = slapos.cookbook:symbolic.link target-directory = ${rootdirectory:bin} -link-binary = +link-binary = {{ parameter_dict['coreutils'] }}/bin/basename {{ parameter_dict['coreutils'] }}/bin/cat {{ parameter_dict['coreutils'] }}/bin/cp diff --git a/software/erp5/instance-zope.cfg.in b/software/erp5/instance-zope.cfg.in index 5df29b3..ebd8453 100644 --- a/software/erp5/instance-zope.cfg.in +++ b/software/erp5/instance-zope.cfg.in @@ -152,7 +152,7 @@ command = ${logrotate:wrapper} [binary-link] recipe = slapos.cookbook:symbolic.link target-directory = ${rootdirectory:bin} -link-binary = +link-binary = {{ coreutils_location }}/bin/basename {{ coreutils_location }}/bin/cat {{ coreutils_location }}/bin/cp diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index e7c6dc1..3e277a6 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -65,7 +65,7 @@ context = [template-mariadb] < = template-jinja2-base filename = instance-mariadb.cfg -md5sum = c6c7998cc3371c27d3bf633129117af0 +md5sum = 9808ad68782944148bef07215c52a4a1 extra-context = key coreutils_location coreutils:location key dcron_location dcron:location @@ -89,7 +89,7 @@ extra-context = [template-zope] < = template-jinja2-base filename = instance-zope.cfg -md5sum = 1c125b8e21355423e47a36dfd1359f00 +md5sum = 6c0474f14fc7cbc9d83a6a99d351982b extra-context = key apache_location apache:location key coreutils_location coreutils:location @@ -125,7 +125,7 @@ extra-context = [template-tidstorage] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/instance-tidstorage.cfg.in -md5sum = 5c3e834bf60819cf52995630e563227c +md5sum = 475c4cc741987afcace7f0db71b7cc41 [template-cloudooo] recipe = slapos.recipe.build:download -- 2.1.4