Merge branch 'master' of https://lab.nexedi.com/donkey-hotei/slapos

software/helloworld/instance.cfg.in

@@ -7,7 +7,7 @@
 parts =
   directory
   publish-connection-parameter
-
+# 
 # Define egg directories to be the one from Software Release
 # (/opt/slapgrid/...)
 # Always the same.
@@ -36,6 +36,7 @@ cert = ${slap_connection:cert_file}
 # All possible parameters should have a default.
 # In our use case, we are expecting from the user to specify one (optional) parameter: "name". We put the default value here if he doesn't specify it, so that it doesn't crash.
 configuration.name = John Doe
+configuration.title = Galaxy
 # If our use case requires that the user can specify a mail address so that his instance can mail to him (for example), we can do:
 # configuration.mail-address =
 # If the user doesn't specify it, it won't break and the recipe can handle it (i.e don't send any mail for example).
@@ -85,7 +86,6 @@ command-line =
 # exits/crashes, it will trigger a "bang" and cause a re-run of the instance.
 wrapper-path = ${directory:service}/helloweb-${:kind}
 
-
 # promise, that checks that helloweb service is alive
 [helloweb-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -128,6 +128,7 @@ parts +=
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish
 name = Hello ${instance-parameter:configuration.name}!
+title = $${instance-parameter:configuration.title}
 {%- for kind in service_list %}
 url.{{ kind }} = ${helloweb-{{ kind }}:url}
 {%- endfor %}

software/helloworld/software.cfg

@@ -10,6 +10,10 @@ extends =
 # ../../component/component1/buildout.cfg
 # ../../component/component2/buildout.cfg
   ../../component/helloweb/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/gzip/buildout.cfg
  
 parts =
 # Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
@@ -18,11 +22,13 @@ parts =
 # Call creation of instance.cfg file that will be called for deployment of
 # instance
   instance-profile
-
 # build helloweb programs
   helloweb-python
   helloweb-ruby
   helloweb-go
+# additional parts for practice
+  dcron
+  logrotate
 
 
 # Download instance.cfg.in (buildout profile used to deployment of instance),
@@ -33,7 +39,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
 rendered = ${buildout:directory}/instance.cfg
 # MD5 checksum can be skipped for development (easier to develop), but must be filled for production
-md5sum = 6567f8dedb5cdd93542dc29e96edb547
+# md5sum = 6567f8dedb5cdd93542dc29e96edb547
 mode = 0644
 extensions = jinja2.ext.do
 context =