Commit 704ce2a7 authored by Marco Mariani's avatar Marco Mariani

renamed directories; mkdir jdk-download inside section

parent a753a107
...@@ -51,12 +51,13 @@ slapos.cookbook = ...@@ -51,12 +51,13 @@ slapos.cookbook =
[jdk-download] [jdk-download]
# hack to download java bypassing javascript requirement # hack to download java bypassing javascript requirement
recipe = plone.recipe.command recipe = plone.recipe.command
location = ${directories:jdk_download} location = ${buildout:parts-directory}/${:_buildout_section_name_}
web-dirname = 7u13-b20 web-dirname = 7u13-b20
filename = jdk-7u13-linux-x64.tar.gz filename = jdk-7u13-linux-x64.tar.gz
stop-on-error = True stop-on-error = True
update = true update = true
command = command =
mkdir -p ${:location}
wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" \ wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" \
"http://download.oracle.com/otn-pub/java/jdk/${:web-dirname}/${:filename}" \ "http://download.oracle.com/otn-pub/java/jdk/${:web-dirname}/${:filename}" \
-O ${:location}/${:filename} -O ${:location}/${:filename}
...@@ -95,7 +96,7 @@ stop-on-error = True ...@@ -95,7 +96,7 @@ stop-on-error = True
[environment] [environment]
recipe = slapos.cookbook:environment recipe = slapos.cookbook:environment
ZIMBRA_HOME = ${directories:zimbra_home} ZIMBRA_HOME = ${directories:zimbra-home}
JAVA_HOME = ${jdk:location} JAVA_HOME = ${jdk:location}
ANT_HOME = ${ant:location} ANT_HOME = ${ant:location}
PATH = /usr/local/bin:/usr/bin:/bin:${:JAVA_HOME}/bin:${:ANT_HOME}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:${unzip:location}/bin:${cmake:location}/bin:${ncurses:location}/bin:${m4:location}/bin:${bzip2:location}/bin:${pcre:location}/bin PATH = /usr/local/bin:/usr/bin:/bin:${:JAVA_HOME}/bin:${:ANT_HOME}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:${unzip:location}/bin:${cmake:location}/bin:${ncurses:location}/bin:${m4:location}/bin:${bzip2:location}/bin:${pcre:location}/bin
...@@ -109,8 +110,7 @@ PCRE_PREFIX = ${pcre:location} ...@@ -109,8 +110,7 @@ PCRE_PREFIX = ${pcre:location}
[directories] [directories]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
zimbra_home = ${buildout:directory}/zimbra_home zimbra-home = ${buildout:directory}/zimbra-home
jdk_download = ${buildout:directory}/parts/jdk_download
# mysql FAILED. (issue with ncurses) # mysql FAILED. (issue with ncurses)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment