Update php application and remove useless parts

software/net2ftp/configure.py

@@ -3,7 +3,7 @@ import os
 import MySQLdb
 
 def setup(args):
-    base_url, htdocs, renamed, mysql_user, mysql_password, mysql_database, mysql_host = args
+    mysql_port, mysql_host, mysql_user, mysql_password, mysql_database, base_url, htdocs = args
     
     sql_file = os.path.join(htdocs, "create_tables.sql")
     try:

software/net2ftp/instance.cfg

@@ -9,6 +9,7 @@ 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

software/net2ftp/software.cfg

@@ -58,7 +58,10 @@ 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

software/prestashop/instance.cfg

@@ -7,8 +7,7 @@ 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
@@ -16,7 +15,7 @@ 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, CHANGELOG.txt, readme_de.txt, readme_en.txt, readme_fr.txt, readme_it.txt, readme_es.txt
+delete = install
 rename = admin
 #file_token = name of file who will be created at the end of installation
 table_name = configuration

software/prestashop/software.cfg

@@ -15,22 +15,10 @@ extends =
 
 [application]
 recipe = hexagonit.recipe.download
-url = http://www.prestashop.com/download/prestashop_1.4.4.1.zip
-md5sum = 08206798517ea22c0122640b05c7df73
+url = http://www.prestashop.com/download/prestashop_1.4.5.1.zip
+md5sum = 3d19305d728f7e8a19f81f9f326b9383
 #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 = ${:_profile_base_location_}/template/prestashop.inc.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 = config.inc.php
+strip-top-level-dir = true
   
 [instance-recipe]
 egg = slapos.cookbook
@@ -48,7 +36,10 @@ 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

software/zencart/configure.py

@@ -3,10 +3,9 @@ import os
 import fileinput
 
 def setup(args):
-    base_url, htdocs, renamed, mysql_user, mysql_password, mysql_database, mysql_host = args
+    mysql_port, mysql_host, mysql_user, mysql_password, mysql_database, base_url, htdocs = args
     
-    rename = renamed.split(", ")
-    admin_dir = rename[0].split("=>")[1].strip()
+    admin_dir = "admin-" + mysql_user
     admin_include_file = os.path.join(htdocs, admin_dir + "/includes/configure.php")
     searchPattern = "/admin"
     replacePattern =  "/" + admin_dir

software/zencart/instance.cfg

@@ -7,8 +7,7 @@ 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

software/zencart/software.cfg

@@ -19,8 +19,7 @@ recipe = hexagonit.recipe.download
 url = http://heanet.dl.sourceforge.net/project/zencart/CURRENT_%20Zen%20Cart%201.3.x%20Series/Zen%20Cart%20v1.3.9%20-%20Full%20Release/zen-cart-v1.3.9h-full-fileset-10262010.zip
 md5sum = e0a5fb39078321ced7f5a9c193f30927
 #If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+strip-top-level-dir = true
 
 [configure-script]
 recipe = hexagonit.recipe.download
@@ -29,18 +28,6 @@ url = ${:_profile_base_location_}/configure.py
 filename = configure.py
 download-only = True
   
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/zencart.inc.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 = config.inc.php
-  
 [instance-recipe]
 egg = slapos.cookbook
 module = lamp.simple
@@ -56,7 +43,10 @@ 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