add tutorial modifications

software/html5as-base/buildout.hash.cfg

+# To learn more about how to generate this file read 
+# ../../README.update-hash.rst
+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+
+[template-cfg]
+filename = instance.cfg.in
+md5sum = a954a0a398d6d9b2661439727f37542c
+
+[instance_html5as]
+_update_hash_filename_ = instance_html5as.cfg.in
+md5sum = 5e2114488b7170c7a68b406ae83d23fe
+
+[template_nginx_conf]
+_update_hash_filename_ = templates/nginx_conf.in
+md5sum = 61dc4c82bf48563228ce4dea6c5c6319
+
+[template_launcher]
+_update_hash_filename_ = templates/launcher.in
+md5sum = 6cb0d64905ae7fc67277c1bf76b86875
+
+[template_mime_types]
+_update_hash_filename_ = templates/mime_types.in
+md5sum = 4ef94a7b458d885cd79ba0b930a5727e
+
+[template_index_html]
+_update_hash_filename_ = templates/index.html.in
+md5sum = ee5864eb5e79589a169b1866c8c54572
+
+[template_graceful]
+_update_hash_filename_ = templates/graceful.in
+md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2
+
+[template_instance_replicate]
+_update_hash_filename_ = instance_replicate.cfg.in
+md5sum = 6a898517af7019afb299b46b9c961777

software/html5as-base/instance.cfg.in

@@ -9,9 +9,16 @@ offline = true
 [profile-common]
 nginx_location = {{ nginx_location }}
 dash_location = {{ dash_location }}
+tar_location = {{ tar_location }}
+curl_location = {{ curl_location }}
 template_nginx_conf = {{ template_nginx_conf_target }}
 template_mime_types = {{ template_mime_types_target }} 
 template_launcher = {{ template_launcher_target }} 
+template_index_html = {{ template_index_html_target }}
+template_graceful = {{ template_graceful_target }}
+template_monitor = {{ template_monitor }}
+
+# Test for auto-hashing
 
 [instance-html5as]
 recipe = slapos.recipe.template:jinja2
@@ -22,6 +29,26 @@ context =
   section buildout buildout
   section parameter_list profile-common
 
+[instance-replicate]
+recipe = slapos.recipe.template:jinja2
+template = {{ template_instance_replicate }}
+rendered = ${buildout:directory}/${:filename}
+filename = instance-replicate-html5as.cfg
+context =
+  section buildout buildout
+  section parameter_list profile-common
+  key slapparameter_dict slap-parameters:configuration
+
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${instance-html5as:rendered}
+replicate = ${instance-replicate:rendered}
+
+# Section  needed to be added manually here to retrieve parameters
+[slap-parameters]
+recipe = slapos.cookbook:slapconfiguration
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}

software/html5as-base/instance_html5as.cfg.in

@@ -9,6 +9,9 @@ parts =
     downloader
     mime_types
     launcher
+    nginx-graceful
+    port-listening-promise
+    logrotate-entry-nginx
     publish-connection-information
 
 # Define egg directories to be the one from Software Release
@@ -18,6 +21,8 @@ eggs-directory = {{ buildout['eggs-directory'] }}
 develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
 offline = true
 
+extends = {{ parameter_list['template_monitor'] }}
+
 # partition tree
 # /
 # |- etc/
@@ -71,7 +76,7 @@ nb_workers = 2
 
 # Network
 ip = ${slap-network-information:global-ipv6}
-port = 8081
+port = ${slap-parameter:port}
 access_url = http://[${:ip}]:${:port}
 
 # Paths
@@ -89,9 +94,11 @@ path_nginx_conf = ${directory:etc}/nginx.conf
 path_mime_types = ${directory:etc}/mime_types
 # Binaries
 path_shell = {{ parameter_list['dash_location'] }}/bin/dash
+curl-binary = {{ parameter_list['curl_location'] }}/bin/curl
+tar-binary = {{ parameter_list['tar_location'] }}/bin/tar
 
 # Executables
-bin_launcher = ${basedirectory:script}/launcher
+bin_launcher = ${basedirectory:service}/launcher
 
 # Utils
 path_nginx = {{ parameter_list['nginx_location'] }}/sbin/nginx
@@ -120,12 +127,80 @@ mode = 700
 context = 
     section param_html5as html5as
 
-# Simple command to put content in the docroot
+# Command to put content in the docroot
 [downloader]
 recipe = plone.recipe.command
-command = rm -r ${html5as:docroot}/*; echo "Hello World!" >  ${html5as:docroot}/index.html
+stop-on-error = true
+command =
+  rm -rf ${html5as:docroot}/*;
+  URL="${slap-parameter:download_url}";
+  if [ -n "$URL" ];
+  then
+    ${html5as:curl-binary} -Lks $URL | ${html5as:tar-binary} xzv -C ${html5as:docroot} --strip-components 1;
+  else
+    cp ${default_index_html:rendered} ${html5as:docroot}/;
+  fi
+
+[default_index_html]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_list['template_index_html'] }}
+rendered = ${directory:srv}/index.html
+context =
+  key title slap-parameter:title
+
+[nginx-graceful]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_list['template_graceful'] }}
+rendered = ${basedirectory:script}/nginx-graceful
+mode = 0700
+context =
+  section param_html5as html5as
+
+# Port listening checking promise
+[port-listening-promise]
+<= monitor-promise-base
+module = check_port_listening
+name = nginx-port-listening.py
+config-hostname = ${html5as:ip}
+config-port = ${html5as:port}
+
+[monitor-instance-parameter]
+monitor-httpd-port = 8197
+
+# Note that the screenshot on the logrotate page is wrong here, I think
+[logrotate-entry-nginx]
+<= logrotate-entry-base
+name = nginx
+log = ${html5as:path_access_log} ${html5as:path_error_log}
+post = kill -USR1 $(cat ${html5as:path_pid})
 
 # Publish nginx address
 [publish-connection-information]
 recipe = slapos.cookbook:publish
+<= monitor-publish
 server_url = ${html5as:access_url}
+title = Title ${slap-parameter:title}
+server-cdn-url = ${html5as-frontend-promise:url}
+
+[html5as-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = HTML5AS frontend
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config-url = ${html5as:access_url}
+config-https-only = true
+return = domain secure_access
+
+[html5as-frontend-promise]
+<= monitor-promise-base
+module = check_url_available
+name = html5as-http-frontend.py
+url = ${html5as-frontend:connection-secure_access}
+config-url = ${:url}
+config-check-secure = 1
+
+[slap-parameter]
+title = foobar
+download_url =
+port = 8081

software/html5as-base/instance_replicate.cfg.in

+{% set replicate_quantity = slapparameter_dict.pop('replicate-quantity', '1') | int %}
+[buildout]
+parts =
+    publish-connection-information
+
+eggs-directory = {{ buildout['eggs-directory'] }}
+develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
+offline = true
+
+################################
+# Sections to Request instances
+################################
+
+# Macro section sharing request parameters
+[instance-request-base]
+<= slap-connection
+recipe = slapos.cookbook:request
+# It is the same software as the current one
+software-url = ${slap-connection:software-release-url}
+# We want the default behaviour
+software-type = default
+# What parameter are neede to be retrieved
+return = server_url server-cdn-url monitor-setup-url
+# Provided parameters
+config-title = ${slap-parameter:title}
+config-download_url = ${slap-parameter:download_url}
+
+# Create request section in a loop.
+{% for i in range(1, replicate_quantity + 1) %}
+# Request a normal html5as instance
+[instance-{{ i }}]
+<= instance-request-base
+# Name of the instance
+name = instance-html5as-{{ i }}
+config-port = ${slap-parameter:port-{{ i }}}
+config-title = ${slap-parameter:title-{{ i }}}
+{%   if "sla-%s-computer-guid" % i in slapparameter_dict -%}
+sla-computer_guid = {{ slapparameter_dict["sla-%s-computer-guid" % i] }}
+{%   endif -%}
+{% endfor %}
+
+[slap-parameter]
+download_url =
+{% for i in range(1, replicate_quantity + 1) %}
+title-{{ i }} =
+port-{{ i }} = 808{{ i }}
+{% endfor %}
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+{% for i in range(1, replicate_quantity + 1) %}
+instance-{{ i }}-server_url = ${instance-{{ i }}:connection-server_url}
+instance-{{ i }}-server-cdn-url = ${instance-{{ i }}:connection-server-cdn-url}
+instance-{{ i }}-server-monitor-setup-url = ${instance-{{ i }}:connection-monitor-setup-url}
+{% endfor %}

software/html5as-base/software.cfg

 [buildout]
 extends =
+# Use buildout.hash.cfg for automaton hash calculation, by calling update-hash.
+  buildout.hash.cfg
 # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
 # Releases
   ../../stack/slapos.cfg
+# Extend monitor stack
+  ../../stack/monitor/buildout.cfg
 # Extend here component profiles, like openssl, apache, mariadb, curl...
 # Or/and extend a stack (lamp, tomcat) that does most of the work for you
 # In this example we extend needed components for html5as.
   ../../component/nginx/buildout.cfg
   ../../component/dash/buildout.cfg
+  ../../component/tar/buildout.cfg
+  ../../component/curl/buildout.cfg
 
 parts =
 # Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
@@ -27,45 +33,50 @@ recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/${:filename}
 filename = instance.cfg.in
-md5sum = 5a6ebc126bcad3cdff1b51fb51f82a35
 mode = 0644
 context =
   section buildout buildout
   key nginx_location nginx:location
   key dash_location dash:location
+  key curl_location curl:location
+  key tar_location tar:location
   key template_nginx_conf_target template_nginx_conf:target
   key template_mime_types_target template_mime_types:target
   key template_launcher_target template_launcher:target
   key template_instance_html5as_target instance_html5as:target
+  key template_index_html_target template_index_html:target
+  key template_graceful_target template_graceful:target
+  key template_instance_replicate template_instance_replicate:target
+# Monitor stack
+  key template_monitor monitor2-template:rendered
 
-# Download instance_html5as.cfg.in
-[instance_html5as]
+# Shared section across download templates
+[download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-_update_hash_filename_ = instance_html5as.cfg.in
-md5sum = 4a8c98cc5ca141f78f14fb9cec203cb8
 mode = 0644
 
+# Download instance_html5as.cfg.in
+[instance_html5as]
+<= download-base
+
 [template_nginx_conf]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/${:_update_hash_filename_}
-_update_hash_filename_ = templates/nginx_conf.in
-md5sum = 61dc4c82bf48563228ce4dea6c5c6319
-mode = 0644
+<= download-base
 
 [template_launcher]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/${:_update_hash_filename_}
-_update_hash_filename_ = templates/launcher.in
-md5sum = 6cb0d64905ae7fc67277c1bf76b86875
-mode = 0644
+<= download-base
 
 [template_mime_types]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/${:_update_hash_filename_}
-_update_hash_filename_ = templates/mime_types.in
-md5sum = 4ef94a7b458d885cd79ba0b930a5727e
-mode = 0644
+<= download-base
+
+[template_index_html]
+<= download-base
+
+[template_graceful]
+<= download-base
+
+[template_instance_replicate]
+<= download-base
 
 [extra-eggs]
 recipe  = zc.recipe.egg

software/html5as-base/templates/graceful.in

+#! {{ param_html5as['path_shell'] }}
+# BEWARE: This file is operated by slapos node
+# BEWARE: It will be overwritten automatically
+
+# Run graceful
+exec kill -s SIGHUP $(cat {{ param_html5as['path_pid'] }})

software/html5as-base/templates/index.html.in

+{% if title %}
+<h1>{{ title }}</h1>
+{% endif %}
+<p>Hello, world!</p>