Download template files using software release.

component/nginx/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../pcre/buildout.cfg
   ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
 
 parts = nginx
 
@@ -10,6 +11,7 @@ recipe = hexagonit.recipe.cmmi
 url = http://nginx.org/download/nginx-1.0.14.tar.gz
 configure-options=
   --with-ipv6
-  --with-ld-opt="-L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include"
+  --with-http_ssl_module
+  --with-ld-opt="-L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include"
 

software/html5as/instance.cfg

@@ -4,6 +4,7 @@ parts =
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype

software/html5as/instance_html5as.cfg

@@ -2,13 +2,11 @@
 parts =
     nginx_conf
     html5as_bin
-    website_download
     publish-connection-information
 
-offline = true
-
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
 # partition tree
 # /
@@ -67,27 +65,22 @@ bin_html5as = $${basedirectory:services}/html5as
 
 # Utils
 path_shell = ${dash:location}/bin/dash
-
-[website_download]
-recipe = hexagonit.recipe.download
-# Website tarball
-url = $${slap-parameter:download_url}
-destination = $${html5as:docroot}
+path_curl = ${curl:location}/bin/curl
 
 [nginx_conf]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/templates/nginx_conf.in
+template = ${template_nginx_conf:location}/${template_nginx_conf:filename}
 rendered = $${html5as:path_nginx_conf}
-md5sum = 6338abecda61f4414392b6f4c1d09e8a
 context = section param_html5as html5as
 
 [html5as_bin]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/templates/html5as_bin.in
+template = ${template_html5as_bin:location}/${template_html5as_bin:filename}
 rendered = $${html5as:bin_html5as}
-md5sum = 0ddb3dfbd963819a1666ca47aa37bbc5
-context = section param_html5as html5as
 mode = 700
+context = 
+    section param_html5as html5as
+    key download_url slap-parameter:download_url
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish

software/html5as/software.cfg

@@ -5,6 +5,7 @@ extensions = buildout-versions
 extends =
   ../../stack/slapos.cfg
   ../../component/nginx/buildout.cfg
+  ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
 
 allow-hosts =
@@ -19,9 +20,12 @@ allow-hosts =
 
 parts =
     dash
+    curl
     nginx
     eggs
     template
+    template_nginx_conf
+    template_html5as_bin
     instance_html5as
 
 [eggs]
@@ -32,16 +36,32 @@ eggs = slapos.cookbook
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
-md5sum = 1910981522ff0b3202530733b5e5129e
+md5sum = 918e0d6513e4d1c92051431d83261dab
 mode = 0644
 
 [instance_html5as]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance_html5as.cfg
 output = ${buildout:directory}/template_html5as.cfg
-md5sum = 6bb8248e367bd8cb8fdaa4dc00af14f9
+md5sum = a5f27834bce33d6c188b0d24b1455ad0
 mode = 0644
 
+[template_nginx_conf]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/nginx_conf.in
+md5sum = 6338abecda61f4414392b6f4c1d09e8a
+filename = nginx_conf.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template_html5as_bin]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/html5as_bin.in
+md5sum = 397c17efdadc0b226f1f08879ffcc295
+filename = html5as_bin.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
 [versions]
 zc.buildout = 1.6.0-dev-SlapOS-006
 Jinja2 = 2.6

software/html5as/templates/html5as_bin.in

@@ -2,4 +2,8 @@
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
 
+# Download website tarball
+exec {{ param_html5as['path_curl'] }} -sO {{ download_url }}
+
+# Run nginx
 exec {{ param_html5as['bin_nginx'] }} -c {{ param_html5as['path_nginx_conf'] }}