rename several options.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37914 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/instance-profiles/sphinx.cfg

@@ -8,17 +8,17 @@ sphinx_port = 9312
 sphinx_sql_port = 9306
 
 # below are candidates to be removed from global configuration
-sphinx_data_dir = ${buildout:var-directory}/sphinx
-sphinx_log_dir = ${buildout:log-directory}
+sphinx_data_directory = ${buildout:var-directory}/sphinx
+sphinx_log_directory = ${buildout:log-directory}
 
 [sphinx-instance]
 depends =
   ${create-directories:command}
 recipe = erp5.recipe.sphinxserver
 sphinx_software_bin = ${software_definition:sphinx_software}/bin
-sphinx_bin_folder =  ${buildout:data-bin-directory}
-sphinx_data_dir = ${configuration:sphinx_data_dir}
-sphinx_log_dir = ${configuration:sphinx_log_dir}
+sphinx_bin_directory =  ${buildout:data-bin-directory}
+sphinx_data_directory = ${configuration:sphinx_data_directory}
+sphinx_log_directory = ${configuration:sphinx_log_directory}
 sphinx_conf_file = ${buildout:etc-directory}/sphinx.conf
 
 # template related

buildout/software-profiles/imagemagick.cfg

@@ -3,7 +3,8 @@ parts = imagemagick
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.nluug.nl/ImageMagick/ImageMagick-6.6.2-4.tar.gz
+url = http://ftp.nluug.nl/ImageMagick/ImageMagick-6.6.3-7.tar.gz
+md5sum = e68a8fdb9c47f21ea686f42923558bdf
 
 # workaround http://github.com/hexagonit/hexagonit.recipe.cmmi/issues#issue/1
 # in typical buildout run

buildout/software-profiles/varnish.cfg

@@ -3,8 +3,8 @@ parts = varnish
 
 [varnish]
 recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download
-md5sum = d91dc21c636db61c69b5e8f061c5bb95
+url = http://sourceforge.net/projects/varnish/files/varnish/2.1.3/varnish-2.1.3.tar.gz/download
+md5sum = 357d99a760de173d841ac37bf2052be8
 
 [requirements]
 binary =