updating software and instance according changes of slapos

software/phpmyfaq/instance.cfg

@@ -7,14 +7,14 @@ parts = instance
 [instance]
 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
-delete = install
-table_name = admin
-constraint = `admin_id`>0
+
+delete = install/update.php
+table_name = faquserlogin
+constraint = `login`='anonymous'

software/phpmyfaq/software.cfg

@@ -13,27 +13,16 @@ 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
+recipe = slapos.recipe.build
 url = http://www.phpmyfaq.de/download/phpmyfaq-2.7.0.zip
-#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/phpmyfaq/template/database.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 = database.php
-
+md5sum = 2a19da49afe32c92f207339ff66d673a
+script =
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
+  workdir = guessworkdir(extract_dir)
+  self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
+  
 [instance-recipe]
 egg = slapos.cookbook
 module = lamp.simple
@@ -42,6 +31,7 @@ module = lamp.simple
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
+#${:_profile_base_location_}/instance.cfg
 #md5sum = Student shall put md5 of instance.cfg here
 output = ${buildout:directory}/template.cfg
 mode = 0644
@@ -49,11 +39,15 @@ mode = 0644
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
-eggs = ${instance-recipe:egg}
+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
@@ -66,4 +60,3 @@ download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
 stop-on-error = True
-