Adapting xaraya to use new slapos.cookbook version 0.32 to make available delete action

software/xaraya/instance.cfg

@@ -9,9 +9,14 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
+lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
 mysqld_binary = ${mariadb:location}/libexec/mysqld
+
+table_name = *_rolemembers
+constraint = `xar_uid`=6
+delete = xaraya-1.2.3/html/install.php

software/xaraya/software.cfg

@@ -13,8 +13,6 @@ extends =
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
 
-allow-hosts += alastairs-place.net
-
 [application]
 recipe = hexagonit.recipe.download
 url = http://freefr.dl.sourceforge.net/project/xaraya/Core%20plus%20Modules/Xaraya%201.2.3%20Core%20Plus/xaraya-1.2.3-full.tar.gz
@@ -24,7 +22,7 @@ url = http://freefr.dl.sourceforge.net/project/xaraya/Core%20plus%20Modules/Xara
 
 [application-template]
 recipe = slapos.recipe.download
-url = https://gitorious.org/~mayoro/slapos/mayoro-slapos/blobs/raw/master/software/xaraya/template/config.system.php.in
+url = https://gitorious.org/~mayoro/slapos/yoro-slapos/blobs/raw/master/software/xaraya/template/config.system.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 download-only = True
 filename = template.in
@@ -49,15 +47,15 @@ mode = 0644
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
-eggs = ${instance-recipe:egg}
-
-[lxml-python]
-find-links += http://pypi.python.org/pypi/lxml/2.3.1
+eggs =
+    ${mysql-python:egg}
+    ${instance-recipe:egg}
+    slapos.toolbox[lampconfigure]
 
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.31
+slapos.cookbook = 0.32
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

software/xaraya/software.cfg~

+[buildout]
+versions = versions
+
+parts =
+  template
+  apache-php
+  mariadb
+  eggs
+  instance-recipe-egg
+  downloadcache-workaround
+
+extends =
+  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
+  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
+
+[application]
+recipe = hexagonit.recipe.download
+url = http://freefr.dl.sourceforge.net/project/xaraya/Core%20plus%20Modules/Xaraya%201.2.3%20Core%20Plus/xaraya-1.2.3-full.tar.gz
+#md5sum = Student may put here md5sum of this file, this is good idea
+#If provided tarball does not contain top directory, option shall be changed to false
+#strip-top-level-dir = true
+
+[application-template]
+recipe = slapos.recipe.download
+url = https://gitorious.org/~mayoro/slapos/yoro-slapos/blobs/raw/master/software/xaraya/template/config.system.php.in
+#md5sum = Student may put here md5sum of this file, this is good idea
+download-only = True
+filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[application-configuration]
+location = html/var/config.system.php
+
+[instance-recipe]
+egg = slapos.cookbook
+module = lamp.simple
+
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+#md5sum = Student shall put md5 of instance.cfg here
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+    ${mysql-python:egg}
+    ${instance-recipe:egg}
+    slapos.toolbox[lampconfigure]
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-010
+slapos.cookbook = 0.32
+
+[downloadcache-workaround]
+# workaround irritating problem of hexagonit.recipe.cmmi which automatically
+# creates download cache, which in turn switches builout to "semi-offline" mode
+recipe = plone.recipe.command
+# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
+# to ${buildout:directory}/downloads but this variable is available late, that's
+# why it is hardcoded only for required case
+download-cache = ${buildout:directory}/downloads
+command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
+update-command = ${:command}
+stop-on-error = True